Merge branch 'master' into 'current_stable_for_tests'

for tests before release

See merge request !23

profile_C6.sh

-#!/bin/bash
-
-date
-
-python -m cProfile -o C6_profiler_test.pstats /share/home/fangyuedong/new_sim/csst-simulation/run_sim.py \
-    --config_file config_C6.yaml \
-    --catalog C6_Catalog \
-    -c /share/home/fangyuedong/new_sim/csst-simulation/config
-    
-    # --config_file config_test_new_sim.yaml \
-    # --catalog New_sim_Test \
-    # -c /share/home/fangyuedong/new_sim/csst-simulation/config
-    
-    # --config_file config_50sqdeg.yaml \
-    # --catalog C6_50sqdeg \
-    # -c /share/home/fangyuedong/new_sim/csst-simulation/config
-    
-    # --config_file config_fgs.yaml \
-    # --catalog FGS_Catalog \
-    # -c /share/home/fangyuedong/csst-simulation/config
-
-    # --config_file test_fd_C6.yaml \
-    # --catalog fd_test_C6 \
-    # --config_file config_C6_test_wcs.yaml \
-    # --catalog wcs_test_C6 \

profile_run.sh

+#!/bin/bash
+
+date
+
+python -m cProfile -o profiler_test.pstats /share/home/fangyuedong/new_sim/csst-simulation/run_sim.py \
+    --config_file config_overall.yaml \
+    --catalog C9_Catalog \
+    -c /share/home/fangyuedong/new_sim/csst-simulation/config

run_sim.py

-from ObservationSim.ObservationSim import Observation
-from ObservationSim._util import parse_args, make_run_dirs, generate_pointing_list
+from observation_sim.ObservationSim import Observation
+from observation_sim._util import parse_args, make_run_dirs, generate_pointing_list
 from importlib.metadata import version
 import os
 import yaml
@@ -18,7 +18,7 @@ def run_sim():
     Parameters
     ----------
     Catalog : Class
-        a catalog class which is inherited from ObservationSim.MockObject.CatalogBase 
+        a catalog class which is inherited from observation_sim.mock_objects.CatalogBase 
 
     Returns
     ----------
@@ -94,7 +94,7 @@ def run_sim():
 
     # Initialize the simulation
     if args.catalog is not None:
-        catalog_module = importlib.import_module('Catalog.'+args.catalog)
+        catalog_module = importlib.import_module('catalog.'+args.catalog)
         obs = Observation(config=config, Catalog=catalog_module.Catalog,
                           work_dir=config['work_dir'], data_dir=config['data_dir'])
     else:

setup.py

@@ -39,26 +39,26 @@ class build_ext(build_ext):
 
 
 extensions = [
-    Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.interp", ["ObservationSim/MockObject/SpecDisperser/disperse_c/interp.pyx"],
+    Extension("observation_sim.mock_objects.SpecDisperser.disperse_c.interp", ["observation_sim/mock_objects/SpecDisperser/disperse_c/interp.pyx"],
               include_dirs=[numpy.get_include()],
               libraries=["m"]),
 
-    Extension("ObservationSim.MockObject.SpecDisperser.disperse_c.disperse", ["ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.pyx"],
+    Extension("observation_sim.mock_objects.SpecDisperser.disperse_c.disperse", ["observation_sim/mock_objects/SpecDisperser/disperse_c/disperse.pyx"],
               include_dirs=[numpy.get_include()],
               libraries=["m"]),
 ]
 
-df_module = [CTypes('ObservationSim.Instrument.Chip.libBF.libmoduleBF',
-                    ['ObservationSim/Instrument/Chip/libBF/diffusion_X1.c',
-                        'ObservationSim/Instrument/Chip/libBF/nrutil.c'],
+df_module = [CTypes('observation_sim.instruments.chip.libBF.libmoduleBF',
+                    ['observation_sim/instruments/chip/libBF/diffusion_X1.c',
+                        'observation_sim/instruments/chip/libBF/nrutil.c'],
                     include_dirs=[
-                        'ObservationSim/Instrument/Chip/libBF/', '/usr/include']
+                        'observation_sim/instruments/chip/libBF/', '/usr/include']
                     )]
-cti_module = [CTypes('ObservationSim.Instrument.Chip.libCTI.libmoduleCTI',
-                     ['ObservationSim/Instrument/Chip/libCTI/src/add_CTI.c', 'ObservationSim/Instrument/Chip/libCTI/src/nrutil.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran1.c', 'ObservationSim/Instrument/Chip/libCTI/src/ran2.c', 'ObservationSim/Instrument/Chip/libCTI/src/poidev.c',
-                         'ObservationSim/Instrument/Chip/libCTI/src/gammln.c', 'ObservationSim/Instrument/Chip/libCTI/src/gasdev.c', 'ObservationSim/Instrument/Chip/libCTI/src/sort.c', 'ObservationSim/Instrument/Chip/libCTI/src/creattraps.c'],
+cti_module = [CTypes('observation_sim.instruments.chip.libCTI.libmoduleCTI',
+                     ['observation_sim/instruments/chip/libCTI/src/add_CTI.c', 'observation_sim/instruments/chip/libCTI/src/nrutil.c', 'observation_sim/instruments/chip/libCTI/src/ran1.c', 'observation_sim/instruments/chip/libCTI/src/ran2.c', 'observation_sim/instruments/chip/libCTI/src/poidev.c',
+                         'observation_sim/instruments/chip/libCTI/src/gammln.c', 'observation_sim/instruments/chip/libCTI/src/gasdev.c', 'observation_sim/instruments/chip/libCTI/src/sort.c', 'observation_sim/instruments/chip/libCTI/src/creattraps.c'],
                      include_dirs=[
-                         'ObservationSim/Instrument/Chip/libCTI/src/', '/usr/include']
+                         'observation_sim/instruments/chip/libCTI/src/', '/usr/include']
                      )]
 
 
@@ -76,7 +76,7 @@ with open("requirements.txt", "r") as f:
     ]
 
 setup(name='csst_msc_sim',
-      version='3.0.0rc',
+      version='3.0.0',
       packages=find_packages(),
       # install_requires=[
       #     # 'numpy>=1.18.5',
@@ -93,23 +93,23 @@ setup(name='csst_msc_sim',
       # ],
 
       package_data={
-          'ObservationSim.Astrometry.lib': ['libshao.so'],
-          'ObservationSim.Instrument.Chip.libBF': ['libmoduleBF.so'],
-          'ObservationSim.Instrument.Chip.libCTI': ['libmoduleCTI.so'],
-          'ObservationSim.MockObject.data': ['*.dat'],
-          'ObservationSim.MockObject.data.led': ['*.fits'],
-          'ObservationSim.Instrument.data': ['*.txt', '*.dat', '*.json'],
-          'ObservationSim.Instrument.data.field_distortion': ['*.pickle'],
-          'ObservationSim.Instrument.data.ccd': ['*.txt', '*.json'],
-          'ObservationSim.Instrument.data.filters': ['*.txt', '*.list', '*.dat'],
-          'ObservationSim.Instrument.data.throughputs': ['*.txt', '*.dat'],
-          'ObservationSim.Instrument.data.sls_conf': ['*.conf', '*.fits'],
-          #   'ObservationSim.Instrument.data.flatCube': ['*.fits'],
-          'Catalog.data': ['*.fits', '*.so'],
-          'ObservationSim.Config.Header': ['*.fits', '*.lst'],
-          'ObservationSim.Straylight.data': ['*.dat'],
-          'ObservationSim.Straylight.data.sky': ['*.dat'],
-          'ObservationSim.Straylight.lib': ['*'],
+          'observation_sim.astrometry.lib': ['libshao.so'],
+          'observation_sim.instruments.chip.libBF': ['libmoduleBF.so'],
+          'observation_sim.instruments.chip.libCTI': ['libmoduleCTI.so'],
+          'observation_sim.mock_objects.data': ['*.dat'],
+          'observation_sim.mock_objects.data.led': ['*.fits'],
+          'observation_sim.instruments.data': ['*.txt', '*.dat', '*.json'],
+          'observation_sim.instruments.data.field_distortion': ['*.pickle'],
+          'observation_sim.instruments.data.ccd': ['*.txt', '*.json'],
+          'observation_sim.instruments.data.filters': ['*.txt', '*.list', '*.dat'],
+          'observation_sim.instruments.data.throughputs': ['*.txt', '*.dat'],
+          'observation_sim.instruments.data.sls_conf': ['*.conf', '*.fits'],
+          #   'observation_sim.Instrument.data.flatCube': ['*.fits'],
+          'catalog.data': ['*.fits', '*.so'],
+          'observation_sim.config.header': ['*.fits', '*.lst'],
+          'observation_sim.sky_background.data': ['*.dat'],
+          'observation_sim.sky_background.data.sky': ['*.dat'],
+          'observation_sim.sky_background.lib': ['*'],
       },
       python_requires=">=3.11",  # Python版本要求
       install_requires=requirements,

run_C6.pbs → submit_jobs.slurm

@@ -12,4 +12,4 @@ date
 #限定单节点任务数
 srun hostname -s | sort -n | awk -F"-" '{print $2}' | uniq > pnodes
 
-mpirun -mca pml ucx -x  UCX_NET_DEVICES=mlx5_0:1 -machinefile pnodes -np 6 --map-by node python3 /public/home/fangyuedong/project/csst_msc_sim/run_sim.py  --config_file config_overall.yaml --catalog C6_50sqdeg_ns -c /public/home/fangyuedong/project/csst_msc_sim/config
+mpirun -mca pml ucx -x  UCX_NET_DEVICES=mlx5_0:1 -machinefile pnodes -np 6 --map-by node python3 /public/home/fangyuedong/project/csst_msc_sim/run_sim.py  --config_file config_overall.yaml --catalog C9_Catalog -c /public/home/fangyuedong/project/csst_msc_sim/config
\ No newline at end of file

test_C6.sh

-#!/bin/bash
-
-date
-
-python3 /public/home/fangyuedong/project/csst_msc_sim/run_sim.py \
-    --config_file config_overall.yaml \
-    -c /public/home/fangyuedong/project/csst_msc_sim/config \
-    --catalog C6_50sqdeg 
-
-# python3 /share/home/fangyuedong/20231211/csst-simulation/run_sim.py \
-#     --config_file config_C6_dev.yaml \
-#     --catalog C6_Catalog \
-#     -c /share/home/fangyuedong/20231211/csst-simulation/config
-
-# python3 /share/home/fangyuedong/20231211/csst-simulation/run_sim.py \
-#     --config_file config_ooc_c6.yaml \
-#     --catalog C6_Catalog \
-#     -c /share/home/fangyuedong/20231211/csst-simulation/config
-