Skip to content
Snippets Groups Projects
Commit 3b6c9a3b authored by Hugo Buddelmeijer's avatar Hugo Buddelmeijer
Browse files

Rename MasterFlat to LampFlat

parent c1f4299f
No related merge requests found
Pipeline #5341 passed with stages
in 32 seconds
...@@ -11,7 +11,7 @@ from micado.main.ObservingBlock import ObservingBlock ...@@ -11,7 +11,7 @@ from micado.main.ObservingBlock import ObservingBlock
from micado.hardware.Detector import Detector from micado.hardware.Detector import Detector
from micado.hardware.DetectorArray import DetectorArray from micado.hardware.DetectorArray import DetectorArray
from micado.hardware.DarkCurrent import DarkCurrent from micado.hardware.DarkCurrent import DarkCurrent
from micado.dataitems.MasterFlat import MasterFlat from micado.dataitems.LampFlat import LampFlat
from micado.dataitems.Science import Science from micado.dataitems.Science import Science
from micado.dataitems.ScienceExtension import ScienceExtension from micado.dataitems.ScienceExtension import ScienceExtension
from micado.dataitems.Detrend import Detrend from micado.dataitems.Detrend import Detrend
...@@ -29,9 +29,9 @@ def test_processing(): ...@@ -29,9 +29,9 @@ def test_processing():
Env['use_python_logging'] = True Env['use_python_logging'] = True
myraws, mymasterdark, dark_real = create_masterdark() myraws, mymasterdark, dark_real = create_masterdark()
# TODO: Do not reuse the MasterDark as MasterFlat. # TODO: Do not reuse the MasterDark as LampFlat.
mymasterdark.save_fits() mymasterdark.save_fits()
mymasterflat = MasterFlat(filename=mymasterdark.filename) mymasterflat = LampFlat(filename=mymasterdark.filename)
mydetector = Detector() mydetector = Detector()
mydetectorlist = [mydetector] mydetectorlist = [mydetector]
...@@ -76,7 +76,7 @@ def test_processing(): ...@@ -76,7 +76,7 @@ def test_processing():
mydetrend = Detrend( mydetrend = Detrend(
raw=myrawscience, raw=myrawscience,
masterdark=mymasterdark, masterdark=mymasterdark,
masterflat=mymasterflat, lampflat=mymasterflat,
recipe=myrecipe, recipe=myrecipe,
) )
mydetrend.make() mydetrend.make()
......
...@@ -60,17 +60,17 @@ ditaa_expected = """ ...@@ -60,17 +60,17 @@ ditaa_expected = """
| |cB56 | | | |cB56 | |
| \----------+--------/ | | \----------+--------/ |
| | | | | |
+----------------+ | | | +--------------+ | | |
| | | | | | | | | |
| MASTERFLAT_IMG +--|--------------->| | | LAMPFLAT_IMG +----|--------------->| |
|c47A | | | | |c47A | | | |
+----------------+ | | | +--------------+ | | |
| v | | v |
| /-------------------\ | | /-----------------\ |
| | | | | | | |
| | apply_master_flat | | | | apply_lamp_flat | |
| |cB56 | | | |cB56 | |
| \----------+--------/ | | \---------+-------/ |
| | | | | |
+-----------------------------+ +-------------+ +-----------------------------+ +-------------+
| | | | | |
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment