diff --git a/ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc b/ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc index 5c84dc417479dd9ae4bc38e39da70e0cabcf3e93..a4d3370b5d08194750f3cc5f26b9f3621d478ced 100644 Binary files a/ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc and b/ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc differ diff --git a/ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc index 3307ee5e9eb502bd404ae7bbff5bc360c9cde375..95498b910bc3cbf213678df11cd50137784c98ce 100644 Binary files a/ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc b/ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc index 8d63bc483452a94c3210f9a5899706ba9d74c33d..0af438058be76f3f7d83400ab223b8ab5e2f2c7e 100644 Binary files a/ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc and b/ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc differ diff --git a/ObservationSim/Config/__pycache__/Config.cpython-38.pyc b/ObservationSim/Config/__pycache__/Config.cpython-38.pyc index 90677a327f1f5aa30f55233c1c180be2926dd1bf..bbaea4d7f2b9e0b83a4d3e16dfe00d3780980e93 100644 Binary files a/ObservationSim/Config/__pycache__/Config.cpython-38.pyc and b/ObservationSim/Config/__pycache__/Config.cpython-38.pyc differ diff --git a/ObservationSim/Config/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Config/__pycache__/__init__.cpython-38.pyc index 383f859df993ea3782b8c1fd2ac7101360974e00..dcce485ab8de6ed97359abf898f9c603d8b1fb91 100644 Binary files a/ObservationSim/Config/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/Config/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/Chip/__pycache__/Chip.cpython-38.pyc b/ObservationSim/Instrument/Chip/__pycache__/Chip.cpython-38.pyc index 04dcf2fffaf8dbb23429b6504ae597b6bc5e9b96..5db77ca069ccb0db010ad81ff1dc9acc6472fdea 100644 Binary files a/ObservationSim/Instrument/Chip/__pycache__/Chip.cpython-38.pyc and b/ObservationSim/Instrument/Chip/__pycache__/Chip.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/Chip/__pycache__/Effects.cpython-38.pyc b/ObservationSim/Instrument/Chip/__pycache__/Effects.cpython-38.pyc index 5b8b9b9c4e96791918411bdc73a6fe5ccf036c3a..303968f15726e04a2c7b9af955df831995dc922e 100644 Binary files a/ObservationSim/Instrument/Chip/__pycache__/Effects.cpython-38.pyc and b/ObservationSim/Instrument/Chip/__pycache__/Effects.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/Chip/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Instrument/Chip/__pycache__/__init__.cpython-38.pyc index 6202baf53621573af1f61b61635ba36e5ab439d4..277c47b11ccb2236e498dfb7ae94d0e2b5c6e16e 100644 Binary files a/ObservationSim/Instrument/Chip/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/Instrument/Chip/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/__pycache__/Filter.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/Filter.cpython-38.pyc index fcebf5167a91b96e35555e3025f1b38a8f86e165..2b37ab185f518e1771a98f36a77a51e6d17f926b 100644 Binary files a/ObservationSim/Instrument/__pycache__/Filter.cpython-38.pyc and b/ObservationSim/Instrument/__pycache__/Filter.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/__pycache__/FilterParam.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/FilterParam.cpython-38.pyc index 1ca75d6fbf3f5c70a59905b25f1d3ae636dae5c9..bb08b43d2cb7a5e622d265d9963bf473660d28d6 100644 Binary files a/ObservationSim/Instrument/__pycache__/FilterParam.cpython-38.pyc and b/ObservationSim/Instrument/__pycache__/FilterParam.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/__pycache__/FocalPlane.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/FocalPlane.cpython-38.pyc index 92e6fc32170edaead10e083be1ccdcfe1fdec6dd..b43df585778cb90566db7f9e8b1333f5abff2b1e 100644 Binary files a/ObservationSim/Instrument/__pycache__/FocalPlane.cpython-38.pyc and b/ObservationSim/Instrument/__pycache__/FocalPlane.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/__pycache__/Telescope.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/Telescope.cpython-38.pyc index d3af64c8e58419a840b314c4892e91ccafa0c97d..6bf29c20e588c6038023de8ce4567086ed8e14be 100644 Binary files a/ObservationSim/Instrument/__pycache__/Telescope.cpython-38.pyc and b/ObservationSim/Instrument/__pycache__/Telescope.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/__init__.cpython-38.pyc index cf5ac354c6883e23b732c60621361dbe7f924d8b..76ee1b645269ab0afe006079e97121d5fe1137ca 100644 Binary files a/ObservationSim/Instrument/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/Instrument/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/Instrument/__pycache__/_util.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/_util.cpython-38.pyc index 87890f7b3a2c1a8b757004a39b4c354217d17c7c..048e4c873f60d594ec5b3d266f22fc7814e98b2c 100644 Binary files a/ObservationSim/Instrument/__pycache__/_util.cpython-38.pyc and b/ObservationSim/Instrument/__pycache__/_util.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/Catalog.py b/ObservationSim/MockObject/Catalog.py index 0bf7439a339b58d911e4bd3ddc6ecc8538ff8bf5..6da49ec8785ad4bfd6f07aedc3d382f887442d55 100644 --- a/ObservationSim/MockObject/Catalog.py +++ b/ObservationSim/MockObject/Catalog.py @@ -20,12 +20,7 @@ class Catalog(object): self.chip = chip self.template_dir = template_dir - self.rng_sedGal = random.Random() - self.rng_sedStar = random.Random() - self.rng_sedGal.seed(config["seed_gal"]) - self.rng_sedStar.seed(config["seed_star"]) self.seed_Av = config["seed_Av"] - self.ud = galsim.UniformDeviate(config["seed_mock"]) self.pRa = float('{:8.4f}'.format(pRa)) self.pDec = float('{:8.4f}'.format(pDec)) @@ -74,20 +69,16 @@ class Catalog(object): self.cosids = sed_info["IDCosmoDC2"] self.objtypes = sed_info["objType"] - def _load_gals(self, gals): + def _load_gals(self, gals, pix_id=None): ngals = len(gals['galaxyID']) + self.rng_sedGal = random.Random() + self.rng_sedGal.seed(pix_id) # Use healpix index as the random seed + self.ud = galsim.UniformDeviate(pix_id) # print(ngals) for igals in range(ngals): param = {} param['ra'] = gals['ra_true'][igals] param['dec'] = gals['dec_true'][igals] - if not self.chip.isContainObj(ra_obj=param['ra'], dec_obj=param['dec'], margin=200): - continue - param['mag_use_normal'] = gals['mag_true_g_lsst'][igals] - if param['mag_use_normal'] >= 26.5: - continue - self.ids += 1 - param['id'] = self.ids param['z'] = gals['redshift_true'][igals] param['model_tag'] = 'None' param['gamma1'] = 0 @@ -122,6 +113,15 @@ class Catalog(object): if param['sed_type'] >= 29: param['av'] = 0.6 * param['av'] / 3.0 # for quasar, av=[0, 0.2], 3.0=av.max-av.im param['star'] = 2 # Quasar + + if not self.chip.isContainObj(ra_obj=param['ra'], dec_obj=param['dec'], margin=200): + continue + param['mag_use_normal'] = gals['mag_true_g_lsst'][igals] + if param['mag_use_normal'] >= 26.5: + continue + self.ids += 1 + param['id'] = self.ids + if param['star'] == 0: obj = Galaxy(param, self.rotation) self.objs.append(obj) @@ -129,7 +129,7 @@ class Catalog(object): obj = Quasar(param) self.objs.append(obj) - def _load_stars(self, stars): + def _load_stars(self, stars, pix_id=None): nstars = len(stars['sourceID']) # print(nstars) for istars in range(nstars): @@ -167,8 +167,8 @@ class Catalog(object): for pix in self.pix_list: gals = gals_cat[str(pix)] stars = star_cat[str(pix)] - self._load_gals(gals) - self._load_stars(stars) + self._load_gals(gals, pix_id=pix) + self._load_stars(stars, pix_id=pix) print("number of objects in catalog: ", len(self.objs)) del self.avGal # for igals in range(self.ngals): diff --git a/ObservationSim/MockObject/SpecDisperser/__pycache__/SpecDisperser.cpython-38.pyc b/ObservationSim/MockObject/SpecDisperser/__pycache__/SpecDisperser.cpython-38.pyc index 6c273a84ba7338c4306e2e5bedb66b3c57a23655..b19854db741e875348d2f21151daef7d417a8f52 100644 Binary files a/ObservationSim/MockObject/SpecDisperser/__pycache__/SpecDisperser.cpython-38.pyc and b/ObservationSim/MockObject/SpecDisperser/__pycache__/SpecDisperser.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/SpecDisperser/__pycache__/__init__.cpython-38.pyc b/ObservationSim/MockObject/SpecDisperser/__pycache__/__init__.cpython-38.pyc index cd38720add740402e19da900411cfd48b385dfd6..bb9ae4ff8db2343afa4cf8f97e893b84a08de064 100644 Binary files a/ObservationSim/MockObject/SpecDisperser/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/MockObject/SpecDisperser/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/__pycache__/__init__.cpython-38.pyc b/ObservationSim/MockObject/SpecDisperser/disperse_c/__pycache__/__init__.cpython-38.pyc index def3ba9e2a42b77f17b8285b878c5815b52b8b18..b97e9a26fd9c012c40ea2433061431b57d551d33 100644 Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/MockObject/SpecDisperser/disperse_c/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/Catalog.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Catalog.cpython-38.pyc index 10f5c371fa5a6f4fff0530887acb42acd33c3b93..d34d179ec40c26b378c0cdcea67b8fb0410f5073 100644 Binary files a/ObservationSim/MockObject/__pycache__/Catalog.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/Catalog.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/Galaxy.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Galaxy.cpython-38.pyc index 6f7f272fcf2d884910242f1d4d33794aa8437ec7..4eaa9589bf1fc54e04217d2675c89b5651ace89c 100644 Binary files a/ObservationSim/MockObject/__pycache__/Galaxy.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/Galaxy.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/MockObject.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/MockObject.cpython-38.pyc index 581be6e18f28f80061bd082dd220d1837ac7cabd..e2afe2b63b9bccbc017e6eb977bd759859edb614 100644 Binary files a/ObservationSim/MockObject/__pycache__/MockObject.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/MockObject.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/Quasar.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Quasar.cpython-38.pyc index 70215de2647aae7339d7bf0bd8e73d21b82ce4fd..7b75a46094c6b6b94ba3f5e576621bd2aea6a2ae 100644 Binary files a/ObservationSim/MockObject/__pycache__/Quasar.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/Quasar.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/SkybackgroundMap.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/SkybackgroundMap.cpython-38.pyc index 0a0d8a540d447b5836d3bd431ba41c24ce2d85c2..84666cd5e170eb86c2fb25334012611289c2ef66 100644 Binary files a/ObservationSim/MockObject/__pycache__/SkybackgroundMap.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/SkybackgroundMap.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/Star.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Star.cpython-38.pyc index 99d9f2ca092f36cee6ce2c64491eafa0f64cbbf1..3f06002d807ac881f578e31fe9d0addd0e881571 100644 Binary files a/ObservationSim/MockObject/__pycache__/Star.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/Star.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/__init__.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/__init__.cpython-38.pyc index 5878d5ec01e34cf8dc426eb5e8394179de43efc2..4aeb75f96f2fb0bf2f27fd4bf6183b956a7926d1 100644 Binary files a/ObservationSim/MockObject/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/MockObject/__pycache__/_util.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/_util.cpython-38.pyc index 96946b0149b4c2b5b41ca0e93be722f29c2855f5..a3c2bdaba0cafe57c6dd7d1ec6e1cce576bc459f 100644 Binary files a/ObservationSim/MockObject/__pycache__/_util.cpython-38.pyc and b/ObservationSim/MockObject/__pycache__/_util.cpython-38.pyc differ diff --git a/ObservationSim/ObservationSim.py b/ObservationSim/ObservationSim.py index 9dae35feae4bae0f66369139eb5306632c0723a8..d49957f877f1efe3eb0ef99abb2378bf8a7737e9 100755 --- a/ObservationSim/ObservationSim.py +++ b/ObservationSim/ObservationSim.py @@ -339,7 +339,10 @@ class Observation(object): for ipoint in range(len(ra_cen)): for ichip in range(nchips_per_fp): i = ipoint*nchips_per_fp + ichip - pointing_ID = pStart + ipoint + if pRange is None: + pointing_ID = pStart + ipoint + else: + pointing_ID = pRange[ipoint] if i % num_thread != ind_thread: continue diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/PSFConfig.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/PSFConfig.cpython-38.pyc index 8d69d156c3b0d307bddb9ac8cba6311623dedd24..76f505d0428a825e0ccdf624a54c0f9f248d0ee2 100644 Binary files a/ObservationSim/PSF/PSFInterp/__pycache__/PSFConfig.cpython-38.pyc and b/ObservationSim/PSF/PSFInterp/__pycache__/PSFConfig.cpython-38.pyc differ diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/PSFInterp.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/PSFInterp.cpython-38.pyc index 61560ce79bc8f050debdcea91cf431befc1037c6..f5be4d2ac0cdf119f4f1b41592eff70f742b2f88 100644 Binary files a/ObservationSim/PSF/PSFInterp/__pycache__/PSFInterp.cpython-38.pyc and b/ObservationSim/PSF/PSFInterp/__pycache__/PSFInterp.cpython-38.pyc differ diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/PSFUtil.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/PSFUtil.cpython-38.pyc index 951c9b79a377319435febd7d00e7e311823d093f..91ce15d443edbf546e8556af513f5f41117f52c8 100644 Binary files a/ObservationSim/PSF/PSFInterp/__pycache__/PSFUtil.cpython-38.pyc and b/ObservationSim/PSF/PSFInterp/__pycache__/PSFUtil.cpython-38.pyc differ diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/__init__.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/__init__.cpython-38.pyc index 33d9ce0eebba8f744921b8afe5426de2e484f9f7..0261ab3e66d147ed69ec746d72e76afec0120863 100644 Binary files a/ObservationSim/PSF/PSFInterp/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/PSF/PSFInterp/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/PSF/__pycache__/FieldDistortion.cpython-38.pyc b/ObservationSim/PSF/__pycache__/FieldDistortion.cpython-38.pyc index 7b3541b21799a858d05859591e7451af9418b63c..eb4cc3241920e91255bd16ed47010b40ba4f6144 100644 Binary files a/ObservationSim/PSF/__pycache__/FieldDistortion.cpython-38.pyc and b/ObservationSim/PSF/__pycache__/FieldDistortion.cpython-38.pyc differ diff --git a/ObservationSim/PSF/__pycache__/PSFGauss.cpython-38.pyc b/ObservationSim/PSF/__pycache__/PSFGauss.cpython-38.pyc index 6c27b983395a3d279b8df50c0fde4ae9b9d80183..743b59e2ca6bc80bb165530155391c95f89d8f17 100644 Binary files a/ObservationSim/PSF/__pycache__/PSFGauss.cpython-38.pyc and b/ObservationSim/PSF/__pycache__/PSFGauss.cpython-38.pyc differ diff --git a/ObservationSim/PSF/__pycache__/PSFModel.cpython-38.pyc b/ObservationSim/PSF/__pycache__/PSFModel.cpython-38.pyc index ed0556dc88d0372130fcc177bc5ff7ae411216c8..69f51a786878cd27bf55ed0eaedfe8f1cf39545b 100644 Binary files a/ObservationSim/PSF/__pycache__/PSFModel.cpython-38.pyc and b/ObservationSim/PSF/__pycache__/PSFModel.cpython-38.pyc differ diff --git a/ObservationSim/PSF/__pycache__/__init__.cpython-38.pyc b/ObservationSim/PSF/__pycache__/__init__.cpython-38.pyc index aa42e9e3346429a7b07e8737a26ba8df96761fa9..130eaafe650cbc3e12701b4e63a5f8f07d61d290 100644 Binary files a/ObservationSim/PSF/__pycache__/__init__.cpython-38.pyc and b/ObservationSim/PSF/__pycache__/__init__.cpython-38.pyc differ diff --git a/ObservationSim/Pointing.py b/ObservationSim/Pointing.py index 138af6681c2977cee2bab84957b1b448e020d016..735307bf01dd2131ce16c84d1ad4ce972fe22ae4 100644 --- a/ObservationSim/Pointing.py +++ b/ObservationSim/Pointing.py @@ -3,7 +3,7 @@ import numpy as np from Config import ReadConfig from datetime import datetime -work_dir = "/public/home/fangyuedong/CSST/test/" +work_dir = "/public/home/fangyuedong/test/CSST/test/" data_dir = "/data/simudata/CSSOSDataProductsSims/data/" config_file = os.path.join(work_dir, "ObservationSim.cfg") @@ -51,4 +51,5 @@ timestamp_obs = np.array(timestamp_obs) pointing_type = np.array(pointing_type) # Define the range of pointing list -pRange = range(0, 2) \ No newline at end of file +# pRange = range(0, 2) +pRange = [1, 22] \ No newline at end of file diff --git a/ObservationSim/__pycache__/ObservationSim.cpython-38.pyc b/ObservationSim/__pycache__/ObservationSim.cpython-38.pyc index 77c1d72f8838d139cc4a15cbbd231ce09587a820..758e8ec39517bc7aba7295398f3cda415a577705 100644 Binary files a/ObservationSim/__pycache__/ObservationSim.cpython-38.pyc and b/ObservationSim/__pycache__/ObservationSim.cpython-38.pyc differ diff --git a/ObservationSim/__pycache__/Pointing.cpython-38.pyc b/ObservationSim/__pycache__/Pointing.cpython-38.pyc index 22442f6ccad9d75cc79c4e5e4a811f12344183ad..2dccd0258a9dc7d83260f981da6f71d290870cbe 100644 Binary files a/ObservationSim/__pycache__/Pointing.cpython-38.pyc and b/ObservationSim/__pycache__/Pointing.cpython-38.pyc differ diff --git a/ObservationSim/__pycache__/_util.cpython-38.pyc b/ObservationSim/__pycache__/_util.cpython-38.pyc index 1f0b66f8877f4d082bdf59a704fd98b443b9579e..0df2540b77bb84486a2b4eb24a8201af6902ec97 100644 Binary files a/ObservationSim/__pycache__/_util.cpython-38.pyc and b/ObservationSim/__pycache__/_util.cpython-38.pyc differ diff --git a/ObservationSim/run.pbs b/ObservationSim/run.pbs index 395472a421badab7104fe5d545e10f7fff386703..34274e334c5a5211e9247eda8472f25e1ea05d00 100755 --- a/ObservationSim/run.pbs +++ b/ObservationSim/run.pbs @@ -12,11 +12,11 @@ #PBS -q batch #PBS -u fangyuedong -NP=40 +NP=54 date echo $NP # mpirun -np $NP --oversubscribe -H comput101 python /public/home/fangyuedong/CSST/ObservationSim/runExposure.py -python /public/home/fangyuedong/CSST/ObservationSim/preprocess.py -mpirun -np $NP python /public/home/fangyuedong/CSST/ObservationSim/runExposure.py +python /public/home/fangyuedong/test/CSST/ObservationSim/preprocess.py +mpirun -np $NP python /public/home/fangyuedong/test/CSST/ObservationSim/runExposure.py