Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix recipes #59

Merged
merged 2 commits into from
Nov 13, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/run_edps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
pyesorex metis_lm_img_flat "${SOF_DIR}/metis_lm_img_flat.lamp.sof"
cat "${SOF_DIR}/metis_lm_img_basic_reduce.sof"
# TODO: This recipe name is incorrect and should be renamed
#pyesorex metis_lm_basic_reduce "${SOF_DIR}/metis_lm_img_basic_reduce.sof"
pyesorex metis_lm_basic_reduce "${SOF_DIR}/metis_lm_img_basic_reduce.sof"
- name: Run EDPS
run: |
# . metispipe/bin/activate
Expand Down
4 changes: 2 additions & 2 deletions metisp/pymetis/src/pymetis/prefabricates/flat.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Product(PipelineProduct):

@property
def category(self) -> str:
return fr"MASTER_IMAGE_FLAT_LAMP_{self.band}"
return fr"MASTER_IMG_FLAT_LAMP_{self.band}"

@property
def output_file_name(self) -> str:
Expand Down Expand Up @@ -80,4 +80,4 @@ def process_images(self) -> Dict[str, PipelineProduct]:
self.products = {
self.name.upper(): self.Product(self, header, combined_image),
}
return self.products
return self.products
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Raw(RawInput):

# Also one master flat is required. We use a prefabricated class
class MasterFlat(MasterFlatInput):
_tags = ["MASTER_IMAGE_FLAT_LAMP_LM", "MASTER_IMG_FLAT_TWILIGHT_LM"]
_tags = ["MASTER_IMG_FLAT_LAMP_LM", "MASTER_IMG_FLAT_TWILIGHT_LM"]

# We could define the master dark explicitly too, but we can use a prefabricated class instead.
# That already has its tags defined (for master darks it's always "MASTER_DARK_{det}"), so we just define
Expand All @@ -58,7 +58,7 @@ class MasterFlat(MasterFlatInput):
def __init__(self, frameset: cpl.ui.FrameSet):
super().__init__(frameset)
self.master_flat = self.MasterFlat(frameset,
tags=["MASTER_IMAGE_FLAT_LAMP_{band}", "MASTER_IMG_FLAT_TWILIGHT_{band}"],
tags=["MASTER_IMG_FLAT_LAMP_{band}", "MASTER_IMG_FLAT_TWILIGHT_{band}"],
band="LM", det=self.detector)
self.linearity = LinearityInput(frameset, det=self.detector)
self.persistence = PersistenceMapInput(frameset, required=False)
Expand Down
2 changes: 1 addition & 1 deletion metisp/pymetis/src/pymetis/recipes/metis_det_dark.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class MetisDetDarkImpl(RawImageProcessor):
class InputSet(Detector2rgMixin, PipelineInputSet):
class RawDarkInput(Detector2rgMixin, RawInput):
_tags = ["DARK_2RG_RAW"]
_tags = ["DARK_{det}_RAW"]

class LinearityInput(LinearityInput):
_tags = ["LINEARITY_{det}"]
Expand Down