Merge branch 'develop'

edd720e6 · Fang Yuedong · 959f0ebc · 8df06b27 · edd720e6 · edd720e6
Commit edd720e6 authored Apr 17, 2024 by Fang Yuedong
--- a/ObservationSim/Instrument/data/throughputs/z_throughput.txt
+++ b/ObservationSim/Instrument/data/throughputs/z_throughput.txt
--- a/ObservationSim/MockObject/CatalogBase.py
+++ b/ObservationSim/MockObject/CatalogBase.py
@@ -56,6 +56,8 @@ class CatalogBase(metaclass=ABCMeta):
            "teff":0.,
            "logg":0.,
            "feh":0.,
+            "DM":0.,
+            "stellarMass":1.,
            # C6 galaxies parameters
            "e1":0.,
            "e2":0.,

--- a/ObservationSim/MockObject/FlatLED.py
+++ b/ObservationSim/MockObject/FlatLED.py
--- a/ObservationSim/MockObject/Galaxy.py
+++ b/ObservationSim/MockObject/Galaxy.py
--- a/ObservationSim/MockObject/MockObject.py
+++ b/ObservationSim/MockObject/MockObject.py
--- a/ObservationSim/MockObject/SpecDisperser/SpecDisperser.py
+++ b/ObservationSim/MockObject/SpecDisperser/SpecDisperser.py
--- a/ObservationSim/MockObject/Stamp.py
+++ b/ObservationSim/MockObject/Stamp.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/MockObject/data/led/__pycache__/__init__.cpython-38.pyc
+++ b/ObservationSim/MockObject/data/led/__pycache__/__init__.cpython-38.pyc
--- 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
--- a/ObservationSim/MockObject/data/led/model_590nm.fits
+++ b/ObservationSim/MockObject/data/led/model_590nm.fits