Merge branch 'new_sim' of https://csst-tb.bao.ac.cn/code/csst_sim/csst-simulation into new_sim

ObservationSim/_util.py

@@ -97,14 +97,14 @@ def make_run_dirs(work_dir, run_name, pointing_list):
         except OSError:
             pass
     prefix = "MSC_"
-    for pointing in pointing_list:
-        fname=prefix + str(pointing.id).rjust(7, '0')
-        subImgDir = os.path.join(imgDir, fname)
-        if not os.path.exists(subImgDir):
-            try:
-                os.makedirs(subImgDir, exist_ok=True)
-            except OSError:
-                pass
+    # for pointing in pointing_list:
+    #     fname=prefix + str(pointing.id).rjust(7, '0')
+    #     subImgDir = os.path.join(imgDir, fname)
+    #     if not os.path.exists(subImgDir):
+    #         try:
+    #             os.makedirs(subImgDir, exist_ok=True)
+    #         except OSError:
+    #             pass
     return imgDir
 
 def imgName(tt=0):

config/config_C6_dev.yaml

@@ -9,15 +9,15 @@
 # Base diretories and naming setup
 # Can add some of the command-line arguments here as well;
 # OK to pass either way or both, as long as they are consistent
-work_dir: "/share/simudata/CSSOSDataProductsSims/data/CSSTSimImage_C8/"
+work_dir: "/share/home/fangyuedong/20231211/workplace/"
 data_dir: "/share/simudata/CSSOSDataProductsSims/data/"
-run_name: "testRun_cal"
+run_name: "test_C6_dev"
 project_cycle: 6
 run_counter: 1
 
 # Whether to use MPI
 run_option:
-  use_mpi: YES
+  use_mpi: NO
   # NOTE: "n_threads" paramters is currently not used in the backend
   # simulation codes. It should be implemented later in the web frontend
   # in order to config the number of threads to request from NAOC cluster
@@ -68,14 +68,14 @@ obs_setting:
   # "All": simulate full focal plane
   # "CALIBRATION": falt, bias, dark with or without postflash
   survey_type: "Photometric"
-  #"LED": ['LED1','LED2','LED3','LED4','LED5','LED6','LED7','LED8','LED9','LED10','LED11','LED12','LED13','LED14'] or null
-  #'LED1': '275', 'LED2': '310', 'LED3': '430', 'LED4': '505', 'LED5': '545', 'LED6': '590', 'LED7': '670',
-  #'LED8': '760', 'LED9': '940', 'LED10': '940', 'LED11': '1050', 'LED12': '1050','LED13': '340', 'LED14': '365'
-  LED_TYPE: ['LED5']
-  LED_TIME: [1.]
-  # unit e- ,flat level
-  FLAT_LEVEL: 20000
-  FLAT_LEVEL_FIL: 'g'
+  # "LED": ['LED1','LED2','LED3','LED4','LED5','LED6','LED7','LED8','LED9','LED10','LED11','LED12','LED13','LED14'] or null
+  # 'LED1': '275', 'LED2': '310', 'LED3': '430', 'LED4': '505', 'LED5': '545', 'LED6': '590', 'LED7': '670',
+  # 'LED8': '760', 'LED9': '940', 'LED10': '940', 'LED11': '1050', 'LED12': '1050','LED13': '340', 'LED14': '365'
+  # LED_TYPE: ['LED5']
+  # LED_TIME: [1.]
+  # # unit e- ,flat level
+  # FLAT_LEVEL: 20000
+  # FLAT_LEVEL_FIL: 'g'
   
   # Exposure time [seconds]
   exp_time: 150.
@@ -99,7 +99,7 @@ obs_setting:
   pointing_file: "pointing_radec_246.5_40.dat"
 
   # Number of calibration pointings
-  np_cal: 3
+  np_cal: 1
 
   # Run specific pointing(s):
   # - give a list of indexes of pointings: [ip_1, ip_2...]
@@ -111,7 +111,7 @@ obs_setting:
   # - give a list of indexes of chips: [ip_1, ip_2...]
   # - run all chips: null
   # Note: for all pointings
-  run_chips: null
+  run_chips: [8]
 
   # Whether to enable astrometric modeling
   enable_astrometric_model: True
@@ -174,7 +174,7 @@ ins_effects:
   add_dark:       YES  # Whether to add dark noise
   add_readout:    YES  # Whether to add read-out (Gaussian) noise
   add_bias:       YES  # Whether to add bias-level to images
-  add_prescan:    YES
+  add_prescan:    OFF
   bias_16channel: YES  # Whether to add different biases for 16 channels
   gain_16channel: YES  # Whether to make different gains for 16 channels
   shutter_effect: YES  # Whether to add shutter effect

test_C6.sh

@@ -2,8 +2,8 @@
 
 date
 
-python3 /share/home/fangyuedong/sim_v2/csst-simulation/run_sim.py \
-    --config_file config_C6.yaml \
+python3 /share/home/fangyuedong/20231211/csst-simulation/run_sim.py \
+    --config_file config_C6_dev.yaml \
     --catalog C6_Catalog \
-    -c /share/home/fangyuedong/sim_v2/csst-simulation/config
+    -c /share/home/fangyuedong/20231211/csst-simulation/config