Merge remote-tracking branch 'origin/develop'

36189a3e · JX · dd26d370 · 27646bc4 · 36189a3e · 36189a3e
Commit 36189a3e authored 1 year ago by JX
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 309 additions and 242 deletions
+309 -242
--- a/ObservationSim/MockObject/SpecDisperser/SpecDisperser.py
+++ b/ObservationSim/MockObject/SpecDisperser/SpecDisperser.py
--- a/ObservationSim/MockObject/SpecDisperser/__init__.py
+++ b/ObservationSim/MockObject/SpecDisperser/__init__.py
--- a/ObservationSim/MockObject/SpecDisperser/disperse_c/__init__.py
+++ b/ObservationSim/MockObject/SpecDisperser/disperse_c/__init__.py
--- a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx
+++ b/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx
--- a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.pyx
+++ b/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.pyx
--- a/ObservationSim/MockObject/SpecDisperser/setup_c.py
+++ b/ObservationSim/MockObject/SpecDisperser/setup_c.py
--- a/ObservationSim/MockObject/Stamp.py
+++ b/ObservationSim/MockObject/Stamp.py
--- a/ObservationSim/MockObject/Star.py
+++ b/ObservationSim/MockObject/Star.py
--- a/ObservationSim/MockObject/__init__.py
+++ b/ObservationSim/MockObject/__init__.py
--- a/ObservationSim/MockObject/_util.py
+++ b/ObservationSim/MockObject/_util.py
--- a/ObservationSim/MockObject/data/led/__init__.py
+++ b/ObservationSim/MockObject/data/led/__init__.py
--- a/ObservationSim/Straylight/data/__init__.py
+++ b/ObservationSim/Straylight/data/__init__.py
--- a/ObservationSim/MockObject/data/led/model_1050nm.fits
+++ b/ObservationSim/MockObject/data/led/model_1050nm.fits
--- a/ObservationSim/MockObject/data/led/model_275nm.fits
+++ b/ObservationSim/MockObject/data/led/model_275nm.fits
--- a/ObservationSim/MockObject/data/led/model_310nm.fits
+++ b/ObservationSim/MockObject/data/led/model_310nm.fits
--- a/ObservationSim/MockObject/data/led/model_340nm.fits
+++ b/ObservationSim/MockObject/data/led/model_340nm.fits
--- a/ObservationSim/MockObject/data/led/model_365nm.fits
+++ b/ObservationSim/MockObject/data/led/model_365nm.fits
--- a/ObservationSim/MockObject/data/led/model_430nm.fits
+++ b/ObservationSim/MockObject/data/led/model_430nm.fits
--- a/ObservationSim/MockObject/data/led/model_505nm.fits
+++ b/ObservationSim/MockObject/data/led/model_505nm.fits
--- a/ObservationSim/MockObject/data/led/model_545nm.fits
+++ b/ObservationSim/MockObject/data/led/model_545nm.fits