Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions metisp/pymetis/src/pymetis/dataitems/hci/hci.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ class LmRavcSciCentred(BandLmMixin, CgrphAppMixin, SciCentred):
pass


class LmRavcCentroidTab(BandLmMixin, CgrphAppMixin, CentroidTab):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is exactly the same as the next class; did you mean

Suggested change
class LmRavcCentroidTab(BandLmMixin, CgrphAppMixin, CentroidTab):
class LmAppCentroidTab(BandLmMixin, CgrphAppMixin, CentroidTab):

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hciApp.py was redundant; I temporarily forgot I had defined all the imaging data classes with the first HCI workflow. I have removed it.

pass

class LmRavcCentroidTab(BandLmMixin, CgrphAppMixin, CentroidTab):
pass

Expand Down Expand Up @@ -459,3 +462,67 @@ class NCvcSciSnr(BandLmMixin, CgrphAppMixin, SciSnr):

class NCvcPsfMedian(BandLmMixin, CgrphAppMixin, PsfMedian):
pass


###


class LmAppSciCentred(BandLmMixin, CgrphAppMixin, SciCentred):
_name_template = r"{band}_APP_SCI_CENTRED"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is indeed something that can be parameterized by cgrph, the name template should most likely read r'{band}_{cgrph}_SCI_CENTRED

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't yet fully understand how the abstraction works, so I might misunderstand.

The CgrphAppMixin implies that the class is partially specialized and thus that cgrph part of the template name is correctly substituted with (by?) APP.

But then I would expect the same with the band: the BandLmMixin is used, and the class is called LmAppSciCentred, so I think the template name should be LM_APP_SCI_CENTRED.




class LmAppCentroidTab(BandLmMixin, CgrphAppMixin, CentroidTab):
_name_template = r"{band}_APP_SCI_CENTROID_TAB"


class LmAppSciSpeckle(BandLmMixin, CgrphAppMixin, SciSpeckle):
_name_template = r"{band}_APP_SCI_SPECKLE"



class LmAppSciHifilt(BandLmMixin, CgrphAppMixin, SciHifilt):
_name_template = r"{band}_APP_SCI_HIFILT"



class LmAppSciDerotatedPsfsub(BandLmMixin, CgrphAppMixin, SciDerotatedPsfsub):
_name_template = r"{band}_APP_SCI_DEROTATED_PSFSUB"



class LmAppSciDerotated(BandLmMixin, CgrphAppMixin, SciDerotated):
_name_template = r"{band}_APP_SCI_DEROTATED"



class LmAppSciContrastRadprof(BandLmMixin, CgrphAppMixin, SciContrastRadprof):
_name_template = r"{band}_APP_SCI_RADPROF"



class LmAppSciContrastAdi(BandLmMixin, CgrphAppMixin, SciContrastAdi):
_name_template = r"{band}_APP_SCI_CONTRAST_ADI"



class LmAppSciThroughput(BandLmMixin, CgrphAppMixin, SciThroughput):
_name_template = r"{band}_APP_SCI_SCI_THROUGHPUT"



class LmAppSciCoverage(BandLmMixin, CgrphAppMixin, SciCoverage):
_name_template = r"{band}_APP_SCI_COVERAGE"



class LmAppSciSnr(BandLmMixin, CgrphAppMixin, SciSnr):
_name_template = r"{band}_APP_SCI_SNR"



class LmAppPsfMedian(BandLmMixin, CgrphAppMixin, PsfMedian):
_name_template = r"{band}_APP_SCI_PSF_MEDIAN"



Loading