Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MICADO-WISE
Manage
Activity
Members
Labels
Plan
Issues
80
Issue boards
Milestones
Wiki
Code
Merge requests
4
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
MICADO
MICADO-WISE
Commits
3b6c9a3b
Commit
3b6c9a3b
authored
5 years ago
by
Hugo Buddelmeijer
Browse files
Options
Downloads
Patches
Plain Diff
Rename MasterFlat to LampFlat
parent
c1f4299f
Branches
hb/feature/lampflat
No related merge requests found
Pipeline
#5341
passed with stages
in 32 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/micado/test/functional/Detrend_test.py
+4
-4
4 additions, 4 deletions
src/micado/test/functional/Detrend_test.py
src/micado/test/functional/ditaa_test.py
+10
-10
10 additions, 10 deletions
src/micado/test/functional/ditaa_test.py
with
14 additions
and
14 deletions
src/micado/test/functional/Detrend_test.py
+
4
−
4
View file @
3b6c9a3b
...
...
@@ -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.
Master
Flat
import
Master
Flat
from
micado.dataitems.
Lamp
Flat
import
Lamp
Flat
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
Master
Flat.
# TODO: Do not reuse the MasterDark as
Lamp
Flat.
mymasterdark
.
save_fits
()
mymasterflat
=
Master
Flat
(
filename
=
mymasterdark
.
filename
)
mymasterflat
=
Lamp
Flat
(
filename
=
mymasterdark
.
filename
)
mydetector
=
Detector
()
mydetectorlist
=
[
mydetector
]
...
...
@@ -76,7 +76,7 @@ def test_processing():
mydetrend
=
Detrend
(
raw
=
myrawscience
,
masterdark
=
mymasterdark
,
master
flat
=
mymasterflat
,
lamp
flat
=
mymasterflat
,
recipe
=
myrecipe
,
)
mydetrend
.
make
()
...
...
This diff is collapsed.
Click to expand it.
src/micado/test/functional/ditaa_test.py
+
10
−
10
View file @
3b6c9a3b
...
...
@@ -60,17 +60,17 @@ ditaa_expected = """
| |cB56 | |
| \----------+--------/ |
| | |
+--------------
--+
| | |
|
|
| | |
|
MASTER
FLAT_IMG +--|--------------->| |
|c47A
|
| | |
+--------------
--+
| | |
+--------------
+
| | |
|
|
| | |
|
LAMP
FLAT_IMG +--
--
|--------------->| |
|c47A
|
| | |
+--------------
+
| | |
| v |
| /-----------------
--
\ |
| |
| |
| | apply_
master
_flat | |
| |cB56
| |
| \
-
---------+-------
-
/ |
|
/-----------------\
|
|
| |
|
|
| apply_
lamp
_flat |
|
|
|cB56 |
|
|
\---------+-------/
|
| | |
+-----------------------------+ +-------------+
| | |
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment