diff --git a/ObservationSim/ObservationSim.py b/ObservationSim/ObservationSim.py index 0822789e40b974826e0b836b79e187c6f5b80787..adeb9553bc536a7ceeacea585117bc0ce1a3516b 100755 --- a/ObservationSim/ObservationSim.py +++ b/ObservationSim/ObservationSim.py @@ -111,8 +111,10 @@ class Observation(object): if self.config["obs_setting"]["enable_straylight_model"]: filt.setFilterStrayLightPixel(jtime = pointing.jdt, sat_pos = np.array([pointing.sat_x, pointing.sat_y, pointing.sat_z]), pointing_radec = np.array([pointing.ra,pointing.dec]), sun_pos = np.array([pointing.sun_x,pointing.sun_y,pointing.sun_z])) - print("========================sky pix========================") - print(filt.sky_background) + chip_output.Log_info("========================sky pix========================") + chip_output.Log_info(filt.sky_background) + + return if chip.survey_type == "photometric": sky_map = None diff --git a/config/config_C6.yaml b/config/config_C6.yaml index 087de4f806734afba835509cb784ee3fe5dc05ef..e97ee8e09b438f536fc1721edfea714010a573d1 100644 --- a/config/config_C6.yaml +++ b/config/config_C6.yaml @@ -11,7 +11,7 @@ # OK to pass either way or both, as long as they are consistent work_dir: "/share/home/fangyuedong/fgs_sim/csst-simulation/workplace/" data_dir: "/share/simudata/CSSOSDataProductsSims/data/" -run_name: "C6_spectroscopic_20230225" +run_name: "C6_test" # Whether to use MPI run_option: @@ -94,13 +94,13 @@ obs_setting: # - give a list of indexes of pointings: [ip_1, ip_2...] # - run all pointings: null # Note: only valid when a pointing list is specified - run_pointings: [0] + run_pointings: [0, 1, 2, 3, 4, 5] # Run specific chip(s): # - give a list of indexes of chips: [ip_1, ip_2...] # - run all chips: null # Note: for all pointings - run_chips: [24] + run_chips: null # Whether to enable astrometric modeling enable_astrometric_model: True diff --git a/run_C6.pbs b/run_C6.pbs index 9fd867219deb03f388f44b297b5bd130f5b8d5c5..563007f97fa153457ae5e9cf60fecae8088dd74c 100755 --- a/run_C6.pbs +++ b/run_C6.pbs @@ -1,18 +1,20 @@ #!/bin/bash - -#PBS -N SIMS -#PBS -l nodes=wcl-1:ppn=60 -###PBS -l nodes=wcl-1:ppn=24+wcl-2:ppn=24+wcl-3:ppn=24+wcl-4:ppn=24+wcl-5:ppn=24+wcl-6:ppn=24 +#PBS -N C6_TEST +#PBS -l walltime=70:00:00 +#PBS -j oe +##PBS -l nodes=wcl-1:ppn=16+wcl-2:ppn=16 +#PBS -q batch #PBS -u fangyuedong -###PBS -j oe cd $PBS_O_WORKDIR -NP=60 +NP=80 +hostfile=wcl-1,wcl-2 date -mpirun -np $NP python3 /share/home/fangyuedong/fgs_sim/csst-simulation/run_sim.py \ +mpirun --oversubscribe -H $hostfile -np $NP python /share/home/fangyuedong/csst-simulation/run_sim.py \ --config_file config_C6.yaml \ --catalog C6_Catalog \ - -c /share/home/fangyuedong/fgs_sim/csst-simulation/config + -c /share/home/fangyuedong/csst-simulation/config +