Merge remote-tracking branch 'origin/develop'

ObservationSim/ObservationSim.py

@@ -119,11 +119,10 @@ class Observation(object):
         chip_output.Log_info("check running:1: pointing-%d chip-%d pid-%d memory-%6.2fGB"%(pointing.id, chip.chipID, os.getpid(), (psutil.Process(os.getpid()).memory_info().rss / 1024 / 1024 / 1024) ))
         del chip.img
 
-    def runExposure_MPI_PointingList(self, pointing_list, chips=None, use_mpi=False):
-        if use_mpi:
-            comm = MPI.COMM_WORLD
-            ind_thread = comm.Get_rank()
-            num_thread = comm.Get_size()
+    def runExposure_MPI_PointingList(self, pointing_list, chips=None):
+        comm = MPI.COMM_WORLD
+        ind_thread = comm.Get_rank()
+        num_thread = comm.Get_size()
 
         process_counter = 0
         for ipoint in range(len(pointing_list)):
@@ -158,7 +157,7 @@ class Observation(object):
                 run_filts = self.filter_list
                 nchips_per_fp = len(self.chip_list)
             else:
-                # Only run a particular set of chips (defined in the overall config file)
+                # Only run a particular set of chips
                 run_chips = []
                 run_filts = []
                 for ichip in range(len(self.chip_list)):
@@ -171,9 +170,8 @@ class Observation(object):
             
             for ichip in range(nchips_per_fp):
                 i_process = process_counter + ichip
-                if use_mpi:
-                    if i_process % num_thread != ind_thread:
-                        continue
+                if i_process % num_thread != ind_thread:
+                    continue
                 pid = os.getpid()
 
                 chip = run_chips[ichip]

config/config_50sqdeg.yaml

@@ -15,7 +15,6 @@ run_name: "testRun0"
 
 # Whether to use MPI
 run_option:
-  use_mpi: YES
   # 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

config/config_C6.yaml

@@ -18,7 +18,6 @@ run_counter: 1
 
 # Whether to use MPI
 run_option:
-  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

config/config_C6_dev.yaml

@@ -17,7 +17,6 @@ run_counter: 1
 
 # Whether to use MPI
 run_option:
-  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

config/config_C6_fits.yaml

@@ -17,7 +17,6 @@ run_counter: 1
 
 # Whether to use MPI
 run_option:
-  use_mpi: YES
   # 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

config/config_ooc_c6.yaml

@@ -17,7 +17,6 @@ run_counter: 1
 
 # Whether to use MPI
 run_option:
-  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

config/config_overall.yaml

@@ -19,8 +19,6 @@ run_counter: 1
 
 # Run options
 run_option:
-  use_mpi: NO
-
   # Output catalog only?
   # If yes, no imaging simulation will be run. Only the catalogs
   # of corresponding footprints will be generated.

config/config_overall_newStar.yaml

@@ -19,8 +19,6 @@ run_counter: 1
 
 # Run options
 run_option:
-  use_mpi: NO
-
   # Output catalog only?
   # If yes, no imaging simulation will be run. Only the catalogs
   # of corresponding footprints will be generated.

config/config_testCASE.yaml

@@ -15,7 +15,6 @@ run_name: "C6_fits_testRun"
 
 # Whether to use MPI
 run_option:
-  use_mpi: YES
   # 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

config/obs_config_Calibration_BIAS.yaml

@@ -43,7 +43,11 @@ call_sequence:
   # Apply PRNU to accumulated photons
   PRNU_effect: {}
   # Accumulate photons caused by cosmic rays
-  cosmic_rays: {}
+  cosmic_rays:
+  # [Optional]: exposure time of the pointing will be used as default.
+    # Set it here is you want to override the default
+    # exptime: 150. # [s]
+    save_cosmic_img:  NO # # Whether to export cosmic ray image
   # Add Poission noise and dark current
   poisson_and_dark:
     add_dark: YES

config/obs_config_Calibration_FLAT.yaml

@@ -43,7 +43,11 @@ call_sequence:
   # Apply PRNU to accumulated photons
   PRNU_effect: {}
   # Accumulate photons caused by cosmic rays
-  cosmic_rays: {}
+  cosmic_rays:
+  # [Optional]: exposure time of the pointing will be used as default.
+    # Set it here is you want to override the default
+    # exptime: 150. # [s]
+    save_cosmic_img:  NO # # Whether to export cosmic ray image
   # Add Poission noise and dark current
   poisson_and_dark:
     add_dark: YES

install.sh

+# conda create -n csstsim_py311 python==3.11
+# conda activate csstsim_py311
+conda config --add channels conda-forge
+conda install numpy==1.26.4
+conda install cython==3.0.6
+conda install sep==1.2.1
+conda install mpi4py==3.1.6
+python3 setup.py install --user
+pip install -e .