From 3b6c9a3bffd57ee368b95b867c0df01321b88e8b Mon Sep 17 00:00:00 2001
From: Hugo Buddelmeijer <hugo@buddelmeijer.nl>
Date: Tue, 29 Oct 2019 10:13:45 +0000
Subject: [PATCH] Rename MasterFlat to LampFlat
---
src/micado/test/functional/Detrend_test.py | 8 ++++----
src/micado/test/functional/ditaa_test.py | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/micado/test/functional/Detrend_test.py b/src/micado/test/functional/Detrend_test.py
index 4cce23839..a72d6edc0 100644
--- a/src/micado/test/functional/Detrend_test.py
+++ b/src/micado/test/functional/Detrend_test.py
@@ -11,7 +11,7 @@ from micado.main.ObservingBlock import ObservingBlock
from micado.hardware.Detector import Detector
from micado.hardware.DetectorArray import DetectorArray
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.ScienceExtension import ScienceExtension
from micado.dataitems.Detrend import Detrend
@@ -29,9 +29,9 @@ def test_processing():
Env['use_python_logging'] = True
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()
- mymasterflat = MasterFlat(filename=mymasterdark.filename)
+ mymasterflat = LampFlat(filename=mymasterdark.filename)
mydetector = Detector()
mydetectorlist = [mydetector]
@@ -76,7 +76,7 @@ def test_processing():
mydetrend = Detrend(
raw=myrawscience,
masterdark=mymasterdark,
- masterflat=mymasterflat,
+ lampflat=mymasterflat,
recipe=myrecipe,
)
mydetrend.make()
diff --git a/src/micado/test/functional/ditaa_test.py b/src/micado/test/functional/ditaa_test.py
index ce51d3fcc..710e6d234 100644
--- a/src/micado/test/functional/ditaa_test.py
+++ b/src/micado/test/functional/ditaa_test.py
@@ -60,17 +60,17 @@ ditaa_expected = """
| |cB56 | |
| \----------+--------/ |
| | |
-+----------------+ | | |
-| | | | |
-| MASTERFLAT_IMG +--|--------------->| |
-|c47A | | | |
-+----------------+ | | |
++--------------+ | | |
+| | | | |
+| LAMPFLAT_IMG +----|--------------->| |
+|c47A | | | |
++--------------+ | | |
| v |
- | /-------------------\ |
- | | | |
- | | apply_master_flat | |
- | |cB56 | |
- | \----------+--------/ |
+ | /-----------------\ |
+ | | | |
+ | | apply_lamp_flat | |
+ | |cB56 | |
+ | \---------+-------/ |
| | |
+-----------------------------+ +-------------+
| | |
--
GitLab