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.

Sign up for GitHub

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

Add more recipes #58

Merged
merged 9 commits into from
Nov 13, 2024
Merged

Add more recipes #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
631bff6
Use updated sofs
hugobuddel Nov 13, 2024
e194c41
Run four recipes in a row
hugobuddel Nov 13, 2024
f3c27b9
Use hb/addmorerecipes branch of METIS_Pipeline_Test_Data which has fa…
hugobuddel Nov 13, 2024
440144b
Print more debug output
hugobuddel Nov 13, 2024
98031da
switch from band to detector
hugobuddel Nov 13, 2024
b0591f6
Use wrong recipe name
hugobuddel Nov 13, 2024
f62b601
What? Tabs?
hugobuddel Nov 13, 2024
f7dfc91
Merge branch 'main' into hb/addmorerecipes
hugobuddel Nov 13, 2024
a1c6272
Disable last recipe for now
hugobuddel Nov 13, 2024
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
20 changes: 11 additions & 9 deletions .github/workflows/run_edps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,24 @@ jobs:
git clone https://github.com/AstarVienna/METIS_Pipeline_Test_Data.git
- name: Run pyESOREX test
run: |
set +x
# . metispipe/bin/activate
export PYESOREX_PLUGIN_DIR="$(pwd)/metisp/pyrecipes/"
export PYCPL_RECIPE_DIR="$(pwd)/metisp/pyrecipes/"
export PYTHONPATH="$(pwd)/metisp/pymetis/src/"
export SOF_DATA="$(pwd)/METIS_Pipeline_Test_Data/metis_sim_small_1/data"
export SOF_DIR="$(pwd)/METIS_Pipeline_Test_Data/metis_sim_small_1/sof"
export PYESOREX_OUTPUT_DIR="$SOF_DATA"
pyesorex --recipes
pyesorex metis_det_lingain "${SOF_DIR}/metis_lm_lingain.sof"
cp LINEARITY_2RG.fits $SOF_DATA/LINEARITY_LM.fits
cp BADPIX_MAP_2RG.fits $SOF_DATA/PERSISTENCE_MAP.fits
cp GAIN_MAP_2RG.fits $SOF_DATA/GAIN_MAP_LM.fits
pyesorex metis_det_dark "${SOF_DIR}/metis_lm_dark.sof"
cp MASTER_DARK_2RG.fits $SOF_DATA/MASTER_DARK_LM.fits
pyesorex metis_lm_img_flat "${SOF_DIR}/metis_lm_img_flat_lamp.sof"
cp MASTER_IMAGE_FLAT_LAMP_LM.fits $SOF_DATA/MASTER_IMAGE_FLAT_LAMP_LM.fits
pyesorex metis_lm_basic_reduce "${SOF_DIR}/metis_lm_img_basic_reduce.sof"
cat "${SOF_DIR}/metis_det_lingain.lm.sof"
pyesorex metis_det_lingain "${SOF_DIR}/metis_det_lingain.lm.sof"
cat "${SOF_DIR}/metis_det_dark.lm.sof"
pyesorex metis_det_dark "${SOF_DIR}/metis_det_dark.lm.sof"
cat "${SOF_DIR}/metis_lm_img_flat.lamp.sof"
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"
- name: Run EDPS
run: |
# . metispipe/bin/activate
Expand Down
4 changes: 2 additions & 2 deletions metisp/pymetis/src/pymetis/recipes/metis_det_dark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class LinearityInput(LinearityInput):
_tags = ["LINEARITY_{det}"]

def __init__(self, frameset: cpl.ui.FrameSet):
self.raw = self.RawDarkInput(frameset, det=self.band) # ToDo: inconsistent, should be detector "2RG"
self.linearity = self.LinearityInput(frameset, det=self.band, required=False)
self.raw = self.RawDarkInput(frameset, det=self.detector)
self.linearity = self.LinearityInput(frameset, det=self.detector, required=False)

self.inputs = [self.raw, self.linearity]
super().__init__(frameset)
Expand Down