Merge branch 'master' into 'current_stable_for_tests'

for tests before release See merge request !23

Merge branch 'master' into 'current_stable_for_tests'
for tests before release See merge request !23
38e2c452 · Fang Yuedong · e0f2b9f7 · 1c35c0e2 · 38e2c452 · 38e2c452
Commit 38e2c452 authored May 13, 2024 by Fang Yuedong
--- a/ObservationSim/Instrument/Chip/libCTI/src/ran1.c
+++ b/ObservationSim/Instrument/Chip/libCTI/src/ran1.c
--- a/ObservationSim/Instrument/Chip/libCTI/src/ran2.c
+++ b/ObservationSim/Instrument/Chip/libCTI/src/ran2.c
--- a/ObservationSim/Instrument/Chip/libCTI/src/sort.c
+++ b/ObservationSim/Instrument/Chip/libCTI/src/sort.c
--- a/ObservationSim/Instrument/data/ccd/__init__.py
+++ b/ObservationSim/Instrument/data/ccd/__init__.py
--- a/ObservationSim/Instrument/data/ccd/Astro_MB.txt
+++ b/ObservationSim/Instrument/data/ccd/Astro_MB.txt
--- a/ObservationSim/Instrument/data/ccd/Basic_NIR.txt
+++ b/ObservationSim/Instrument/data/ccd/Basic_NIR.txt
--- a/ObservationSim/Instrument/data/ccd/UV0.txt
+++ b/ObservationSim/Instrument/data/ccd/UV0.txt
--- a/ObservationSim/Instrument/data/field_distortion/__init__.py
+++ b/ObservationSim/Instrument/data/field_distortion/__init__.py
--- a/ObservationSim/Instrument/data/ccd/chip_definition.json
+++ b/ObservationSim/Instrument/data/ccd/chip_definition.json
--- a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_mainFP_v1.0.pickle
+++ b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_mainFP_v1.0.pickle
--- a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs1.pickle
+++ b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs1.pickle
--- a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs2.pickle
+++ b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs2.pickle
--- a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs3.pickle
+++ b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs3.pickle
--- a/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs4.pickle
+++ b/ObservationSim/Instrument/data/field_distortion/FieldDistModelGlobal_pr4_fgs4.pickle
--- a/ObservationSim/Instrument/data/field_distortion/FieldDistModel_v2.0.pickle
+++ b/ObservationSim/Instrument/data/field_distortion/FieldDistModel_v2.0.pickle
--- a/ObservationSim/Instrument/data/filters/__init__.py
+++ b/ObservationSim/Instrument/data/filters/__init__.py
--- a/ObservationSim/Instrument/data/sls_conf/__init__.py
+++ b/ObservationSim/Instrument/data/sls_conf/__init__.py
--- a/ObservationSim/Instrument/data/filters/fgs_sub.list
+++ b/ObservationSim/Instrument/data/filters/fgs_sub.list
--- a/ObservationSim/Instrument/data/filters/filter.list
+++ b/ObservationSim/Instrument/data/filters/filter.list
--- a/ObservationSim/Instrument/data/filters/g.txt
+++ b/ObservationSim/Instrument/data/filters/g.txt