From e1458fd3ba6c5fa018ba3f993a73a786c8c287c8 Mon Sep 17 00:00:00 2001
From: yuedong <fangyuedong@qxslab.cn>
Date: Wed, 11 Aug 2021 00:55:41 +0800
Subject: [PATCH] galaxy SED bug fixed

---
 .../__pycache__/ImageHeader.cpython-38.pyc    | Bin 7735 -> 7740 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 270 -> 275 bytes
 .../__pycache__/ChipOutput.cpython-38.pyc     | Bin 4472 -> 4477 bytes
 .../Config/__pycache__/Config.cpython-38.pyc  | Bin 2997 -> 3002 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 276 -> 281 bytes
 .../Chip/__pycache__/Chip.cpython-38.pyc      | Bin 16006 -> 16011 bytes
 .../Chip/__pycache__/Effects.cpython-38.pyc   | Bin 18152 -> 18157 bytes
 .../Chip/__pycache__/__init__.cpython-38.pyc  | Bin 194 -> 199 bytes
 .../__pycache__/Filter.cpython-38.pyc         | Bin 2834 -> 2839 bytes
 .../__pycache__/FilterParam.cpython-38.pyc    | Bin 2493 -> 2498 bytes
 .../__pycache__/FocalPlane.cpython-38.pyc     | Bin 3560 -> 3565 bytes
 .../__pycache__/Telescope.cpython-38.pyc      | Bin 1359 -> 1364 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 319 -> 324 bytes
 .../__pycache__/_util.cpython-38.pyc          | Bin 560 -> 565 bytes
 ObservationSim/MockObject/Catalog.py          |  32 +++++++++---------
 .../__pycache__/SpecDisperser.cpython-38.pyc  | Bin 13933 -> 13938 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 268 -> 273 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 276 -> 281 bytes
 .../__pycache__/Catalog.cpython-38.pyc        | Bin 5577 -> 5531 bytes
 .../__pycache__/Galaxy.cpython-38.pyc         | Bin 11095 -> 11428 bytes
 .../__pycache__/MockObject.cpython-38.pyc     | Bin 7735 -> 8851 bytes
 .../__pycache__/Quasar.cpython-38.pyc         | Bin 3119 -> 3124 bytes
 .../SkybackgroundMap.cpython-38.pyc           | Bin 3004 -> 3009 bytes
 .../__pycache__/Star.cpython-38.pyc           | Bin 3840 -> 3845 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 345 -> 350 bytes
 .../__pycache__/_util.cpython-38.pyc          | Bin 17076 -> 17081 bytes
 ObservationSim/ObservationSim.py              |   5 ++-
 .../__pycache__/PSFConfig.cpython-38.pyc      | Bin 4447 -> 4452 bytes
 .../__pycache__/PSFInterp.cpython-38.pyc      | Bin 7000 -> 7005 bytes
 .../__pycache__/PSFUtil.cpython-38.pyc        | Bin 12777 -> 12782 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 197 -> 202 bytes
 .../FieldDistortion.cpython-38.pyc            | Bin 2114 -> 2119 bytes
 .../PSF/__pycache__/PSFGauss.cpython-38.pyc   | Bin 4229 -> 4234 bytes
 .../PSF/__pycache__/PSFModel.cpython-38.pyc   | Bin 1394 -> 1399 bytes
 .../PSF/__pycache__/__init__.cpython-38.pyc   | Bin 289 -> 294 bytes
 ObservationSim/Pointing.py                    |   5 +--
 .../__pycache__/ObservationSim.cpython-38.pyc | Bin 8375 -> 8403 bytes
 .../__pycache__/Pointing.cpython-38.pyc       | Bin 1210 -> 1218 bytes
 .../__pycache__/_util.cpython-38.pyc          | Bin 2076 -> 2081 bytes
 ObservationSim/run.pbs                        |   6 ++--
 40 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc b/ObservationSim/Config/Header/__pycache__/ImageHeader.cpython-38.pyc
index 5c84dc417479dd9ae4bc38e39da70e0cabcf3e93..a4d3370b5d08194750f3cc5f26b9f3621d478ced 100644
GIT binary patch
delta 37
rcmdmPv&V)fl$V!_0SJ^@xe_<>{9t4Znas*0&r*_FT(Vi2Nkj$!t&#~7

delta 32
mcmdmEv)zU#l$V!_0SL0cu1VO)^MjGme=;kR{ANuiVHp6J*$Als

diff --git a/ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Config/Header/__pycache__/__init__.cpython-38.pyc
index 3307ee5e9eb502bd404ae7bbff5bc360c9cde375..95498b910bc3cbf213678df11cd50137784c98ce 100644
GIT binary patch
delta 33
ncmeBUn#{x#%FD~e00c^{T!|BT7BB`*Tr1B~l3H9c@w77lcx?#`

delta 28
icmbQt)W^gV%FD~e00cMtauX)<EMWARxK@7RMJE7aiwJ4}

diff --git a/ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc b/ObservationSim/Config/__pycache__/ChipOutput.cpython-38.pyc
index 8d63bc483452a94c3210f9a5899706ba9d74c33d..0af438058be76f3f7d83400ab223b8ab5e2f2c7e 100644
GIT binary patch
delta 37
rcmeyN^jC=|l$V!_0SJ^@xe_<>ykKSYnf#Sio~0zUxMZ_1TPimI#2X59

delta 32
mcmeyX^h1d!l$V!_0SJmdZB5w7^MaMpeezdU`OT7SDck_6X$ltr

diff --git a/ObservationSim/Config/__pycache__/Config.cpython-38.pyc b/ObservationSim/Config/__pycache__/Config.cpython-38.pyc
index 90677a327f1f5aa30f55233c1c180be2926dd1bf..bbaea4d7f2b9e0b83a4d3e16dfe00d3780980e93 100644
GIT binary patch
delta 37
rcmdlgzDt}Zl$V!_0SJ^@xe_<>2(U1EOqOMlXDLZ7F4=6&QpFAclz<3X

delta 32
mcmdlbzEzwjl$V!_0SG=EU6rtrM}URVd9o~v{ANd%N_GH?-3USe

diff --git a/ObservationSim/Config/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Config/__pycache__/__init__.cpython-38.pyc
index 383f859df993ea3782b8c1fd2ac7101360974e00..dcce485ab8de6ed97359abf898f9c603d8b1fb91 100644
GIT binary patch
delta 33
ncmbQjG?R%Zl$V!_0SJ^@xe_PxtY!3?xJ#a;B(=C?;td-BdgKW)

delta 28
icmbQqG=+&Ll$V!_0SIpO<t9wzS<C1;ahLqWd)5GCb_kFF

diff --git a/ObservationSim/Instrument/Chip/__pycache__/Chip.cpython-38.pyc b/ObservationSim/Instrument/Chip/__pycache__/Chip.cpython-38.pyc
index 04dcf2fffaf8dbb23429b6504ae597b6bc5e9b96..5db77ca069ccb0db010ad81ff1dc9acc6472fdea 100644
GIT binary patch
delta 131
zcmZpx?XKku<>lpK00N~}u0;3ljeJpTjQ*1|+2mPDQj1GAx3k5GFuh{f{9MYJiRl-^
zW*u2ECPvB0&hqaWIW`+B@Gx_ysMRoJNr^CsGl*>VQkD~A)SR4Yd7PhFj8TM9hFOSF
h2#7ftC)-<<Gcr%!ZZ(&YZF8u#J`*F$=2lxqMgWb~9~=Mx

delta 126
zcmeCKZL8%A<>lpK0D?cCcO=A2+sGHi#^^OUlTCheFI%h#lLF)BH&V__Oa_db4Q0ic
z82u-E$iHV~+H9e~!^|zhkfK(@kR>I;AimjOSx$^GesZ4WaefvtMiE9CW+6r)Am(72
c>|#~U$U1qC)m%o_%~96+OpI2WyKEU50Xo+ntN;K2

diff --git a/ObservationSim/Instrument/Chip/__pycache__/Effects.cpython-38.pyc b/ObservationSim/Instrument/Chip/__pycache__/Effects.cpython-38.pyc
index 5b8b9b9c4e96791918411bdc73a6fe5ccf036c3a..303968f15726e04a2c7b9af955df831995dc922e 100644
GIT binary patch
delta 39
tcmaFS%lNjJktdXwmx}=ilv=qGH}d$gFa}MIW|3zpNi8nfT*;E}1OU+f3ZVc1

delta 34
ocmaFc%lM*~ktdXwmx}=iUVPb+u#v})h0%9%G>iP^dX_vV0K&owzW@LL

diff --git a/ObservationSim/Instrument/Chip/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Instrument/Chip/__pycache__/__init__.cpython-38.pyc
index 6202baf53621573af1f61b61635ba36e5ab439d4..277c47b11ccb2236e498dfb7ae94d0e2b5c6e16e 100644
GIT binary patch
delta 33
ncmX@ac$|?Zl$V!_0SJ^@xe_PxgfIqAOq6FSNi8m!Snmt~eUAu`

delta 28
icmX@kc!-fFl$V!_0SNZ?<t9wz31Re`m?%H7)d>J*`3KSf

diff --git a/ObservationSim/Instrument/__pycache__/Filter.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/Filter.cpython-38.pyc
index fcebf5167a91b96e35555e3025f1b38a8f86e165..2b37ab185f518e1771a98f36a77a51e6d17f926b 100644
GIT binary patch
delta 37
rcmbOvHeHM-l$V!_0SJ^@xe_<>@Gvp@OqOJlXDLZ7F4=6(bejVJij@du

delta 32
mcmbO(Hc5;pl$V!_0SK1cZA;k5!^6brK3S4UezPspEe-&6We17?

diff --git a/ObservationSim/Instrument/__pycache__/FilterParam.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/FilterParam.cpython-38.pyc
index 1ca75d6fbf3f5c70a59905b25f1d3ae636dae5c9..bb08b43d2cb7a5e622d265d9963bf473660d28d6 100644
GIT binary patch
delta 37
rcmdlhd`Orll$V!_0SJ^@xe_<>STZsOPIhCIXDLZ7F4>&I7|8(un<)sq

delta 32
mcmX>kyjPefl$V!_0SNZ=<tA+8v1DZQne4_Wzd4IBf&&1A?g#w<

diff --git a/ObservationSim/Instrument/__pycache__/FocalPlane.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/FocalPlane.cpython-38.pyc
index 92e6fc32170edaead10e083be1ccdcfe1fdec6dd..b43df585778cb90566db7f9e8b1333f5abff2b1e 100644
GIT binary patch
delta 63
zcmaDM{Z^VMl$V!_0SJ^@xe_<>JY`l1(9g{)(Jx3WN-QqPFVfG*&rQ`&OUz5JEKN<x
R&r8=YNi8nfEWmPu698wa6$$_V

delta 58
zcmaDW{X&{2l$V!_0SNZ?<tA+8dCDyBt)H7$qF<0$lvrGnU!<RrpPQ<mmYA1bS(=)X
MpO?N_l;s8|04;758~^|S

diff --git a/ObservationSim/Instrument/__pycache__/Telescope.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/Telescope.cpython-38.pyc
index d3af64c8e58419a840b314c4892e91ccafa0c97d..6bf29c20e588c6038023de8ce4567086ed8e14be 100644
GIT binary patch
delta 37
rcmX@lb%l#3l$V!_0SJ^@xe_<>G%_;!Pwr!sXDLZ7F4??>aWOLhs0<0|

delta 32
mcmcb@b)JhSl$V!_0SNZ?<tA+8X=G&dn%u`Izj+hmB4z-N#0e_^

diff --git a/ObservationSim/Instrument/__pycache__/__init__.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/__init__.cpython-38.pyc
index cf5ac354c6883e23b732c60621361dbe7f924d8b..76ee1b645269ab0afe006079e97121d5fe1137ca 100644
GIT binary patch
delta 33
ncmdnbbcBf~l$V!_0SJ^@xe_PxoMZHxcw3&OB(=C?;!igKi8u-P

delta 28
icmX@Yw4aG5l$V!_0SNZ=<t9wzImhTZ@wWWL|E>US{0TV#

diff --git a/ObservationSim/Instrument/__pycache__/_util.cpython-38.pyc b/ObservationSim/Instrument/__pycache__/_util.cpython-38.pyc
index 87890f7b3a2c1a8b757004a39b4c354217d17c7c..048e4c873f60d594ec5b3d266f22fc7814e98b2c 100644
GIT binary patch
delta 36
qcmdnMvXzA=l$V!_0SJ^@xe_<>q%bmiPcCGXXDLZ7E}7iVxDWu3w+SBr

delta 31
lcmdnWvVnysl$V!_0SNZ?<tA+8NnvDkn_S2!KY1$S0swi{2w?yK

diff --git a/ObservationSim/MockObject/Catalog.py b/ObservationSim/MockObject/Catalog.py
index 0bf7439..6da49ec 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
GIT binary patch
delta 93
zcmaEx^C^cXl$V!_0SJ^@xe_<>G%ztHPVQxrXDLZ7F4?@A>8>_o)aFjTQ_PI#Cx;jX
t3ta@NEIJP)Zm}lj6l5e8UEaLYsFe{YYi}aKcye-t$w$Udo4rhx83BHWAFcoZ

delta 111
zcmeyA^EQVkl$V!_0SK-)uS(d+)4;?SGr5;Ze)C4AJKBu5HuveBVrINBInpRt=n_y-
z(FGuJi#0K)AS1Ep%I1AWt&CD&A?CEq^dd`;iX;$m0z{me9BcBC@$+N@A&JfDrreAG
DR!1cP

diff --git a/ObservationSim/MockObject/SpecDisperser/__pycache__/__init__.cpython-38.pyc b/ObservationSim/MockObject/SpecDisperser/__pycache__/__init__.cpython-38.pyc
index cd38720add740402e19da900411cfd48b385dfd6..bb9ae4ff8db2343afa4cf8f97e893b84a08de064 100644
GIT binary patch
delta 33
ncmeBSn#jZx%FD~e00c^{T!|BTCNsuNTp-U<l3H9cai1RmcPa??

delta 28
icmbQp)WgIR%FD~e00jH{auX)<OlAz9xIlj55nljcAqYDF

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
GIT binary patch
delta 33
ncmbQjG?R%Zl$V!_0SJ^@xe_Px^f9JSoGs5%l3H9cac49Dc{vFX

delta 28
icmbQqG=+&Ll$V!_0SNZ@<t9wz>0?ZqI9q<={wM%p+Xz$u

diff --git a/ObservationSim/MockObject/__pycache__/Catalog.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Catalog.cpython-38.pyc
index 10f5c371fa5a6f4fff0530887acb42acd33c3b93..d34d179ec40c26b378c0cdcea67b8fb0410f5073 100644
GIT binary patch
delta 2652
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
QupO&F|C2xc#ng@e0>AM`i2wiq

delta 2595
zcmbtWOKenC7(VB|=FXk>1KQ~nTPPHU(gKYFYI&t4hzW&IKo~<VW6!kAOy|*aZ!5(+
z8MW*ThIk?|@sVlb#*K+#tveG*OiWzfy$ciL!lk<K|Ib{ef=lP7-~al~`~3gurxQ;m
zV%K6Zi@@)@59_!8`X+Xo(s^-_9@`aVvHPTGvN%hC46`IlfwUN1Acc(hlJ2Fyi6=DQ
zakZ|#MLc2~eJ$jXs?jw)%4m*kQ3}y&NZLwZQ>NyyP1v=%5#VX)2RrJ<nBI+h`WD?p
zI}zAMU?-W;4zp0(VrDzyrmE>~C*!GJcuN6tRyxqOq`jkWN2I;egNfM#9_bEl5u8*v
z7s#PN=20>ND-6&3rc*96d%3jYho$DYCGLl$dUn0o^VOTmVokiO+@!<8SH>^<1}`;O
zv+f&LdeY*JW!ovU^QDzyB+wVIBMm#^3D|hwfH9m(-H%^uRF;~&K386^l-#nftTCah
zUyr1L#FGdqgk1<PAnZfPh@aI-;}EESz9w{SL=?0WxhXISHSkjmYQdL;5AbnIo1io;
zKGQ#@2gS7Uau!>136rQD05~c-#`@G=(EO-duD2G>&Dps60_6w$?CmD|!FNiGg+5A-
zV008=H$p~yAKEvLO^OlhhgCT4XK%Fa_TxY}E0U%-G>la1!rW}rsW<0lr;DNHTh*%@
zt#ZNS&-I-WKbd1EW#2K_U%S#+YT8Scm2wfzt!F+rjvu#Ink8oAYLI<i91a&c3Jm%5
z7YD_FzghTm9znz<y*s=~+los)Ws}a4hsv#cZM8z$8pPl}dw7#Irp_Q2?r~u2V3Vp+
zRWT+RdX6xIg&wF*aWxBE6S*B33IkbVVIWvFo!^Bp(MVNek>f-mwgw$(5Rb|sV*MfF
zGlV6;p9Gl#nGR$okl8@)2;@%LexTRBt-}-sa~(O~wgE;i2!uc%3Utije4vLx9}aX2
z^j(3D`TIhkM?oLy=`f*DIpFTTy=R8Fde`s_FO<c6*VtGmaD_c9aP5UgKp2!bK=QaV
z`@jbb@Bs$CaqvaFDEI&a-+t&V1pGJ*3Bv=Ds>u#Kz(XhipH#!B<%o<Q1W$)lEjI$C
zAc{4t8q1PRs98XofS{zZLpAzP;e%|l=apLxO{JXbvkupEV7<<cAS*|*gdLSrhkn>J
z_<GDKIO0@I0cOjMdvLHXRuh{_I|f51yD2XwizSeOHeFMA)=hgFT)t=Gt64D_%}<_z
zOA6(=ylA_8t<2AY`Rfk=U#VDxY)BkGgi%oVVUdX+d;Dhf3z{rse08PV@O3Cu%VnMx
z-^K@So`7~xkyg3OL!k1V2p7<)m)4<l`D&%%@*#AnjnX>TFpky7*PwgHH%hHmxxu&&
zu0mWE317piCiKLunP)4EZ}rj;!xw??FaScMN}Ou4N)1s3WE3z?E%7LEhEnlMVkGwO
zOf^I*nYa5ndF%K8nUOcPGg6+uOi1xTa-{P#?eJFg@;C-(PURKr*^q`{C;IV(w3B^1
zCGB+I#x%{qjllGbfQ0mPb$QG>Tmz#U!q<<I)hs?lqL50TJ_8%%t8?W=dCL3}nEWz8
z(Sm)q9p*UpGG9RNRRr89ehpy>;fA=E%6F=$UPq__Ks{}s-b9e^OAEDC1QlT&;cb9|
z(K}8Z9{{IlGy++Xl5ZgI9>Q~{9O<31WZfr3<kHtIyf(77ej+x~SLhM(V|w^xH|lA<
z{}H;eVCC~}oQ2#3?1s5XHx+!UZ>#cIHs>p!zXFq@d;rIs6_c5~xRe>|tf6Tl;FHQ7
zggJzB2xAC)5ahb#GEaf&tB%Y0I~aH$;WPqnOt9*riMP~VEV=Ni!1_`1)mG&$zl+TG
z5ahZe+pk$c{GAz9EgBUg*#R+=9q-^{EZ<d*FD1w4j?W`(4_rWVdk43Bi$VaOeh0y%
z)~FdXRnvg)xH-r%S{RT|qpvsC>a7iqsm!wog8;sE=cN>QaVv_(opNafj90}U**Esg
UVAz24EibyVqyLOAYCDen1Mc8Bz5oCK

diff --git a/ObservationSim/MockObject/__pycache__/Galaxy.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Galaxy.cpython-38.pyc
index 6f7f272fcf2d884910242f1d4d33794aa8437ec7..4eaa9589bf1fc54e04217d2675c89b5651ace89c 100644
GIT binary patch
delta 1994
zcmbVMOK%%h6u$S)cx;a!u^q?u*zwzWI7#!8SQJ4eR76{;GNFM=jf#Ss<GP+Cju}s-
z6y2#Ml2WP2Qlw#tL?R*46%q{#Bvv36{RI?x1sfp0fCURUckIZmXf}*=?>+OK^PThE
zbL@F`{mUD{_W}Wx;8S>@R<&#21Rv4P_(O7=0t0E^yCy*zWN_`%H5n9e?~^qbc)*LN
z0vYf_06lKVLJ&sK@<0y45JAfec^HK#S}Ke|4C8%JfCOlW_@M|%NTC&YNMy1WTqWgF
zPq|dxs_x#aY#hhgc}B0=@5ou%thLSK9eI1Kb5aWuvJntc2hS3oeq0xEwcnKq;Xa@m
z0k$by0h4f|Q;;-qGVU{_Lz(+{0R3`*9Z|$w1I%@bfzowZK^_EolNr~+y-G|4<J|W3
zWVjQIk~%x0x(8J7b(u8+ZYzZOz2M)JjROdXw?mb?jwl2-sqvVH+K*wx3O8j4Sz*(s
z`*|3`U1~)jBHANb1M$yY)+kr>fF9)jII*JUh#BJY9^IpFk^|}eJJuMN`ItsJR*Xw}
zm@Ay|7$!<|<(tfkTM0}Y0nHJj@dzZlvZWz5ibxdK7^F~al52-Co;;$CF9PG}i6g5Y
zpBls`5Y?Rcah}5Xag0wPmgK2uhd4!&3Bt7~L8WP)K1^|{k8?FjFfi>T@o=w`AcNi*
z&-C%bG>`N25fdCeg9)>c#y(`x%JHn8*9*8869jV;z2qPhxCaGNXI75qK<?l$bCA&l
zkQV^HXLYweDXchw43ZuH0L92Yitz=W7fc?Ni9|NZ0W;p>1%aR~8J{#2N)BlARdb3*
z`;iIE7bknvDvE4CfIR3hka_U|yUjFWl}z8^G%w-pCV0-8G|P_es1UKo`qNAhYs$Hw
zm@VGTnl@+n1fSy5e3Fmwm_7^HD8X~iITig}|F;RbuGbRz=6M;1Jqr1*MDePffeyxt
zLfi0`14%QEq#2YnJLpanZ$4)(yj0q`7o^Rjv{`<R&-1x6q-8XmzwBre3FrC3P}}|T
z{e|X_r>)zh*wQ~Sp_p#zv=`5p<GC}7oYq)$YAiliW3kix088|z<~op#%m1r{^Y?eI
z@sbkv;~)MC0iL+c@S9Yq7_<0oG3LZ}fe^c%{=#iY_;#Y&fy|9`S?Wn`Xc<os>IHV+
zHlSv#HtH)|ciZJfdpq++py#@^bGHdSd3U?fw7<@D#$D|@)mF`TDk!ci+tqrlC!x;}
zA7T4KwxETp0IOG5&7F&P8Z9Tl_yK+8CHuGRYoonz-Kd(4W_`Wg+G?2Vt(~@=&Xv-}
zA0lDwKhE_H%wn(Pu5{FTb!&acXw)0co?F;8)TOrX-de>xD?9C;7ws$C_4U?L&)qhw
zhA_N+f-u$Hjat*JIk0+fXe-zOC-juQd`e#)(wBSrA%D3y<S+O7{AJ^Jdue*qF63kM
zseL{_Oa1mnzSNOIbdgQcs1&0rm1%+onL-(1lu-}yP!DB)EA9|0px1w<mmxDqL)8Bw
zPYIogGfAc&#V=Klf6jkPY3umY;w)t+%>J%)nSOjsC;W`5)E=4oO6kc}qgJ)QpZbhG
zvR9`6qEGD0<!cK{#h^Hm{<e=+#ds#Bs0`ssrD6zA*=6|cpUOAKJjgJ-Vk-)2QdlYb
im6^ry48D74FrvQhad{%@oLVCyJ0bt5+jeK>mwy4$xbj#4

delta 1603
zcmZ8hTWB0r7(VCh%-(NFX0x|sce9(@?j*5ZYOVIcqO=BOTdfKW4eOeJvu2XrZD%){
zz&}|bk%ABjjP$ACE+|&tN*)9sRZz5wpi<fQKJ?iK1rhzvBvNsP^Plhk{`;BBhnMfZ
z8h#}d@-w>b?tc0jK7Tv>F7KwVvsDfPTzkGH7mR@d>K<QGzzv=~wxog=e6+h^9D)!c
ziw80gh6o`qWFZPegnW>LVHhFg2MuE6AAkvnLxPwf<RJ+uLZRzSVN2mltXLSh&sR69
zTifN8!?-vt_<8$9C40E3Y{W_{LD}H(wLrVnpP|*h;$jQ~z>^Hbx?%<GXewR|lBOK3
zKJU1CDh5z;>c1Sg_f;!|A^T!#q8rj!UG%x(1wRD#g%t*m6+veBAh@oW2N054&yQ-K
zLwKE=w=mMa1raOSR3K_aI{_nzH1a;ThUCC<SQv%)P1PFiggRkVcKI%UmK}&?v_??D
zktDM;bQuwJqd=`o!HIq4im+nVC?$(R(kY(AAxP~jR-CvYVuoprK$;p%V7#YcqR$;$
z6voIBqo^bQ<gx!Kv2n*gg-P;Hk-yBGz@)~U8i@qMxYlKHW~DLROCmQ?=+_uIrkx~S
z^f?K}$g1Jk5#LK=4AXrfV+>h(9L8z(aY7j!H?l^K<V1o|a%SWmra*F1GIe2PI#Vcp
z^XN9FCEIlZr9wfN!7ysZ3}iG$`>eCOjUr^_ql4VO&&p!9SL!n>hq<2KXLPW9IYXy6
zVdXI|AG=lP%wYkCaU#if1z8H#Bv~i}QaNjiFj*Wt-3j!%^H`wCW@zGt-a|M;cot_B
zW)yJh6cemcaI_pwJ6f)D0%weeX;CuB#@Q~niVpV(aWuj)SEAJOSi};Ylujd#qh5Iw
z_1<GRh0}e(8S2JKI)lf%#>uCdHHUM(Q+=9oT^zVfdReZOq!H(+Qyu5dFpM0y+LOdR
z(L0T^sLK>hjfy-;XEBfS4_N6>QBL$3wxi2jJK3GwPVCyx5W>+_L0?<GZ0hv=m~+ft
z$$aFwFaH3h%Z_9(d+rOu#i#6dvS;m|vfUwNtFhKJrNcmdy|vi{yP3;(M^;*mtDBu#
zrG2%wQfZk`Gus1oty62XO`lBmwG0Sce52KAHP4!6b$bwMRM%_g%vNKuQLWd^Z=}~3
zQhX`JXVTx-u5~V$YjrC4tt7vbq*66&Rr8M2zn9_%5~8?Zf08?6|B;)F3_@EMWc^EP
z^@|&uZTs}ZV%OD%tAoIQd*kZ^{w8(Us8`wpZ;OglTC1yrutaOkqX{Zo|I@bz9+_jY
zQ8&Mmt$4RKYR$@8V|C!&K1Sv*vL~lor^Q*R+Nq@9KA9ioH|!Vky1kt*EUHl+WP%Is
zWnS*(;!n57%ZCXK^B~=RT45d*8rKMUk2J0j<K|I8x+~1x6fO8+tnfMK%ZEQs>Rg!j
z?7ya-<E_JU(?KEbG5h7&k5%(G>cQs4_xW4)jpFb81N*(wOC_~za@m_B_6U`W?gvb{
rTs9?HR86-X(XYf@<Yy{U6lBzhM4J7!eu9tLxAjri-~J{0j{fUE#_gZj

diff --git a/ObservationSim/MockObject/__pycache__/MockObject.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/MockObject.cpython-38.pyc
index 581be6e18f28f80061bd082dd220d1837ac7cabd..e2afe2b63b9bccbc017e6eb977bd759859edb614 100644
GIT binary patch
delta 2388
zcmah~U2GIp6u$S)?CkFB&&>YMZg=~${bNBu`T#^xFcg$n3bCkhBUwuCvUFOuWo9s7
z&U7V(HyfIa`ee-RyMjWDi6%a1qQ+OBY(nCTi9G3(FPPxDvn?$GaVGc7ch9-!o^#JR
z_smxZyd&|~V=<NBQ@*ZF=l6aQe}$?FP7mR*m%KBy*y!g94_>3y03YBX9!8{al}E0T
zYLJ(CoNLGl@j<Th1fnn>;whd+r1D{&;aNlxKEe&2M-=6wyvR$4VtgC#<$Z|aJUT@x
zl{>%Ec}h=uN2Na5soTySF8!pnWb|X>NgxQ|IE=$iQ$m2YNr$*H$Zgso<K*-|Z!<UG
zDxh$hCvMPT5CjPVd9ut<5_Cf-VR-@}gScVD(mGZhsVzgWL*0lYnSr(f5yVl5qJ1+6
z;eCXWS`eZ*3xVp-LQWVWrivqC5YBRBnYuBb7e!v|AusN49fNp>xf&2N4q8nEt*t{C
z)DEKrG&2FrOqz*9#MMD>r#ghwIcEKKQHPgN06Kc9fqsDCvUEEGQP8@IzQkW~fGlYj
z^(C1T45d72VQ`2g38EpXWWB$0Wjf}ijp31lf_q4imjtnqtjU)z%r-5@hgSrA!5cSr
z_9d)>U`aM#wDt=WyL`gpb!%$2adQ5W?d{IL*Gf!tJ~c7rEF3;RyLjxvbff+$uC#X{
zAv8pF97!6*SH%&hah9fOL?Iewar`pD!&j#77LPB?%$+!E)@Phuk8OId9w%fbCU#wa
zcHlQkTI=QTEglvkBJG^b$(RX(v8H~4iOB%diV2QD4CQinbSUxy>pUzG!S7J6tOVRR
z#JP+ac!LM0a33s(07^o0)G~S4)tWL_UCjw%EodzsS)s1(gmE(!O)?(EY>6+Lf_R!V
zScjSsaZOg3n-G_TC&dNfnU4c*5)?CP#vqy_Zpw)}8pz9ZnU0fHcKQ!D4Kk#$jx!*c
zIw-&(0~*h+$XLr+H-`=+pr!L1I$(g&P69Pkpr-K@uHgjRX~=?sRfjS&gZIxsx3WCH
zBDr})ImnxanMYbMh#_3=@i|4LSiJ^1?iQdRqJp%L7xSL=dEQjbl91#`i=%pX0V)bM
zF3l0aMTH{th&iNWB9S?=O0CbKC^(3j^;c7&$ZJ05^g^n;60c3cze**s8z-DxXIzHT
zb#@N#t=o&o>VsZ9U>_9Rey1N=!tazYx6Hc1#H&5vpHGAq`EJ=6fIb+2GW0_NGG>|g
zqzQfp{jXvUbt{4wSHkWfY7WC720O`1D-zz$hi(8KE$7d>hwQr4a)*4MhR~<s_3)(d
z<Ri|AAJYH2Hu{Kb+t9UP7=>*x@)XxFR$TU7tN5-}HeFj9T&gr%-))3$j;>19Yq+7v
zZqG(6wwi;&{~Fou8`-|a$oA$Lw9rjj04>~p)WU>cIyv8*UkOh!;a@uc98WN@l)d;f
z?}eQAXXdK%A>M22Bk!H;`Jmsy?y27I*|*Xa$+{sVq7PZCNKREoy`#D3qicb)3zwSQ
zdLMb-)!e}eYeg&>7ew^BwSawoda>?zyS0Gdq1GhP<04|kGlJ|C%R=_NU7J~Gp0hl`
zvyfDFc$RS_(XghS*=D0=FV4?8wZ#S7`_kA~@|~z=9~0JQun~Iqjoq!P+L)fNEm*US
z*=98;aJ|W^s(tC~6mE2K!LEi8AG^?~E$*oXZD-mNAly|DP`x};Z#s3KtzOy03N~ba
z>4y5)hWgm1`dE33{#bQWf2`WoAG2<Fdtxc?Rz9Kph^Mu0dq3odTT$%SA)3YBtm8<s
zBuze$C7nLYMrc~fVjq{Ofqh(|j4<rqAriv%?7kAzS=sOMPm?m#jEh|#)l>AXeEc<R
zY^dnoi-k|<P48~u7dA@0+dXd<Zi?JIk$8i}{cI2QP8Uz@l_n=AE6VzB(Ek?>q28qR
zfk-Or>fh>OUn)pN^X?Xp>wfY-!@2dfAm4ZoN;z+$q?Y?}iYHBkf~u@4p@5oJi|VUt
Q4-v|QJW$VgPU-u90j$y~Q~&?~

delta 1177
zcmZuwU5Fc16ux&dGnt+IZIa0(Gnq*;*-X~dU0V@<(1liPQ55S!E8=3=sz=vO*R4&a
zQ02^SB^6N#EL<N&k{7$yC#m9F5q$7f@S(6E2tN7ZgZNgdo;%z6<Q?w0-}jw!=HBlz
zBTjs`Qhc#cFd2<o<LhVJhrTX8!%dCoF`A=ToaNpbA9ToG<!c(Wz<@bII+&2V%GR>b
zh9Z<mF`xtUP$o170aU>vWI`8eU=zy00yy9j%0myD;1Mc7{uCR8H-6)roIfX4GwmC3
z=Eu??PaEGGiv%QpistCL!Wia&I}DWbYLXYLc72d1rXI{0k26yZb0{_Ko(B3vOA1&J
zyLPi$+)}|zig7kFun4&cPfFsZUEe8KY(tsxC@0-alw@9dfr|72wa>Jq9OvT#s$)Lp
z$Js7F^J`K;6)O%)s+ft2sH1{adZRs2Ur`b(snHH4EJ2-iu+g5*Bag~xT5Lu<&Q2?6
zp*>S%E~-Lf2O7vC3!F(NsS~PUJ+h-Z#YTfQ7%5JwxD=aG*-(;3?4hi6P>+16rhO7q
z4>oWft5FMFi_zLnS3T-LQ(g;rlexq}XBx~{;-Wj<>CRZ{OQF*@6AwLkr->ggppRvw
zrm@WUNsBVXu+?Bmo3MWucgRx@eR3C&^Kjb7fN&SPDvMlfKgtxg?xw7cos`w%MGT_*
zXwuPlpjl^Qo-Cx|fJE|eSL>y(Uceq*S4bW$4A&1~IK3a+*qJGuVHhpZ9V|yn$5_(G
z{`7$vc|5P|D#K`(U;I?&uulgKvA@EI9iAS+E`|raX~s!QR@inZ8@8QociXyn6Ixgk
zcbxb2kLc?gek?w4-^%_jf0bcI{N=uE3`>Mh4;~b+HlGlC&7+U(tM9&jZfkg4mK>$9
zuU?isC!zM*g-cs7T#~tEDHx;8(faEbw%!z1tgg6b1-U0>ZX`o2{;-z$qIk$VAwKaQ
zF0B<Vzc7S1hNsSLtZrT!iC?_K+J0sP?}*21SH$;zS^tXKM(>GRekktvb~Vowu5g1H
z+~CS>J!|la*suA8B3F4aeRQsf4_lw}J<)Ifto+Hu?e<IVp4|L@gV^jmru@ys7oF2f
z+Q}i8g=y#!Iyq1dy1pbr_`mF+D2@cr=dQ`>Z)EsZOoE{05u}rqjjXAfx}lkt>6y<m
N+4hh5wD>9b;a_CU92Nio

diff --git a/ObservationSim/MockObject/__pycache__/Quasar.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Quasar.cpython-38.pyc
index 70215de2647aae7339d7bf0bd8e73d21b82ce4fd..7b75a46094c6b6b94ba3f5e576621bd2aea6a2ae 100644
GIT binary patch
delta 36
qcmZ24u|<L>l$V!_0SJ^@xe_<>d}d_ynZzW|Qj%I+vRRHvkP85satMw9

delta 31
lcmdlYv0j2Fl$V!_0SNZ><tA+8`OL`ZK8Z<wvkH>{7XX2Z2hjik

diff --git a/ObservationSim/MockObject/__pycache__/SkybackgroundMap.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/SkybackgroundMap.cpython-38.pyc
index 0a0d8a540d447b5836d3bd431ba41c24ce2d85c2..84666cd5e170eb86c2fb25334012611289c2ef66 100644
GIT binary patch
delta 47
zcmdlZeo&k@l$V!_0SJ^@xe~W-<TYeuPUU0R?8vx>l`(AcKQ?)mlGNgo%`)r@SO5>b
B3}65N

delta 42
xcmX>ozDJxll$V!_0SNZ><tA+3$ZN>Ryr7M7vm@gkR>r`||JdX=E3waK0RaBQ3|RmG

diff --git a/ObservationSim/MockObject/__pycache__/Star.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/Star.cpython-38.pyc
index 99d9f2ca092f36cee6ce2c64491eafa0f64cbbf1..3f06002d807ac881f578e31fe9d0addd0e881571 100644
GIT binary patch
delta 37
rcmZpWYn9^(<>lpK00N~}uEdQz%1n%2lMR^USxQoiOE&v4ZQ=m{if#yR

delta 32
mcmZpbYmnm!<>lpK0D^sexd|J2l$jV^CmS%yZw_JF$O8a(LI<({

diff --git a/ObservationSim/MockObject/__pycache__/__init__.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/__init__.cpython-38.pyc
index 5878d5ec01e34cf8dc426eb5e8394179de43efc2..4aeb75f96f2fb0bf2f27fd4bf6183b956a7926d1 100644
GIT binary patch
delta 61
zcmcb~bdQNAl$V!_0SJ^@xe_PxJX7)0&&?~*FGws(EH23}($C1xP1R3J%uBB<O-;$q
POV=++EiRcX$mjt8GnEtD

delta 56
zcmcb|bd!lEl$V!_0SNZ><t9wzc_#0vpPN^rUyxXoSX`1{q@R(Wo2s9dn3rBznwpZI
Kmp)mH(E|Ycq7v=^

diff --git a/ObservationSim/MockObject/__pycache__/_util.cpython-38.pyc b/ObservationSim/MockObject/__pycache__/_util.cpython-38.pyc
index 96946b0149b4c2b5b41ca0e93be722f29c2855f5..a3c2bdaba0cafe57c6dd7d1ec6e1cce576bc459f 100644
GIT binary patch
delta 39
tcmdne%DA(YktdXwmx}=ilv=qGH}b4yV)UN8i%FiPB(=C?^9`mu_5jSK3!?x4

delta 34
pcmdnl%DAPKktdXwmx}=it~akr*vPY%iP3HHE++ZS_n2<m0|2uh3o!ry

diff --git a/ObservationSim/ObservationSim.py b/ObservationSim/ObservationSim.py
index 9dae35f..d49957f 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
GIT binary patch
delta 294
zcmcbw^hAj#l$V!_0SJ^@xe_<>tYK%2+Pss!kde(4DE2F8vH_<&OG#>R$z(sy6O87Y
z#ku}5OIiV?ZZT)%C*NWR5;>X0B}J@2p(2aPdVC6u;*<UP=5X7B1nfYB*5q$|;f(5&
z{rEMxL53EA3A4#f{F#g)li%<+`f7re0f{Q!g5osKytI71?9|F)D^1oAw;~pxxSN|M
zYmo(z5#s0PrYTe;1!Uf0%`43<s4Nl(vZFYPlQRn{^)mB|WGC+u(DpC~3KoTcRB^<|
n=OyN*#>W?_g2dE7ggS`O01>(%LJ~;aVgcC*aT>BCbp?$8CF4f_

delta 289
zcmaE&bYF=ll$V!_0SFHC<tA+8S;NkFYx7R_LPj<-px7_p$p)PAlS4R<Gg@qx;rhpH
zWepU)#hj6!e2X1O<YX3?6tMz@iY$S|OJ*RE4#Yt4!M=zCNNMuiVlB={EJ!Vqm>j}4
zhuaP)R%8z%v?u@O3un}r9L%rD4YH~TOqfq@=g(veo&1r%kxdJttU^FR9b|flpP!qi
zP?0o{d5bl#G`FC#NCL=?;wVneEU47W%rBCgyk9`u!vdr&6r_qHK0YroH#I)KNDU;W
f4k9!_geHj40})a{;ucGGYGpCReq@&z2^s+aG<8M*

diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/PSFInterp.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/PSFInterp.cpython-38.pyc
index 61560ce79bc8f050debdcea91cf431befc1037c6..f5be4d2ac0cdf119f4f1b41592eff70f742b2f88 100644
GIT binary patch
delta 63
zcmca%cGrw2l$V!_0SJ^@xe_<>9OY06($CE+(Jx3WN-QqPFVfG*&rQ`&OUz5JEKN<x
R&r8=YNi8nf{DC7w2mos(6@&l)

delta 58
zcmca>cEgM(l$V!_0SLa|-kPwH=O~A~uYPV`iGD$1QDSjPevy7ger~FMT4G*$Woc?k
MeqQ?KuN)ad091b!WdHyG

diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/PSFUtil.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/PSFUtil.cpython-38.pyc
index 951c9b79a377319435febd7d00e7e311823d093f..91ce15d443edbf546e8556af513f5f41117f52c8 100644
GIT binary patch
delta 57
zcmaEv{4SX%l$V!_0SJ^@xe_<>%wk~-n7o`to~0zUxMcHDmNi<8QJahO<rx`wZJuPn
L0;DESHw*#*?u!w?

delta 52
zcmaEt{4$v*l$V!_0SHd@<tA+8nZ?5BJ$X5c{N~dvtF;(!Z7$cBXJp*HdAb1$keWQl
GFbDw5@)4i_

diff --git a/ObservationSim/PSF/PSFInterp/__pycache__/__init__.cpython-38.pyc b/ObservationSim/PSF/PSFInterp/__pycache__/__init__.cpython-38.pyc
index 33d9ce0eebba8f744921b8afe5426de2e484f9f7..0261ab3e66d147ed69ec746d72e76afec0120863 100644
GIT binary patch
delta 33
ncmX@gc#4rHl$V!_0SJ^@xe_PxL^1|WOp|9RNi8m!*y0EPezypr

delta 28
icmX@bc$ASRl$V!_0SHd@<t9wziDdMdm?l55%K-pro(J#%

diff --git a/ObservationSim/PSF/__pycache__/FieldDistortion.cpython-38.pyc b/ObservationSim/PSF/__pycache__/FieldDistortion.cpython-38.pyc
index 7b3541b21799a858d05859591e7451af9418b63c..eb4cc3241920e91255bd16ed47010b40ba4f6144 100644
GIT binary patch
delta 37
rcmX>ka9n^Vl$V!_0SJ^@xe_<>oMvS7n|y;&o~0zUxMcG;Mjti+uWSlr

delta 32
mcmX>ua7chBl$V!_0SHd@<tA+8InBuEIr#>o{N_K5-fRGrf(f$#

diff --git a/ObservationSim/PSF/__pycache__/PSFGauss.cpython-38.pyc b/ObservationSim/PSF/__pycache__/PSFGauss.cpython-38.pyc
index 6c27b983395a3d279b8df50c0fde4ae9b9d80183..743b59e2ca6bc80bb165530155391c95f89d8f17 100644
GIT binary patch
delta 285
zcmZow>{8?j<>lpK00N~}uEdQzOiYaKllhtCSxQoiOE&8=O<-b-+Psft8WW?@=1_KR
zCLukb(jrbEp~+OF0Aia>j^PTN{Fw8!ye)_;1|sZ0gd?0Q4q`b^KFek8W(8#4Voppd
z*5oP@0SPOB2qzF>1|)7Vrxq0zse!nvAi@D8#+sRzl3G#34H5tw@3`5IdkM3GH%P!2
ztRm4UC^6+0Q(D?BrlRCqEXf6#6-D8bh4|GN{U=-U2Xb2jRrzT$`}q}lO`giHFRBUB
d3UW)4Cx{3I5&o0?1;i(R;8$lfo-84d3jlG3K2rby

delta 256
zcmeBDY*pk5<>lpK0D=R3xd|J2n3x!yCi64NZ#HJ?XJWjy`7p~gCPw4UQS91GLi#{e
zMVvrFlc`7n#5SLt$Q3yG1?OpbI}le4MA(A}CpcFe#B!N@iObr}8pyoGoS0Os$yFo*
z5>@~a&LF}ZNZevhEh;Kf194SBgd<3dH8U?IwW5d{Bmg$vX>&055@t3ZkbvLhzkHI6
z5tGIF)ffXN+wli-+W>|AG@1SUio7S!;@20|0x1L8TjT{I!azj8<a_*fj3$$11#$r>
C@HQ3z

diff --git a/ObservationSim/PSF/__pycache__/PSFModel.cpython-38.pyc b/ObservationSim/PSF/__pycache__/PSFModel.cpython-38.pyc
index ed0556dc88d0372130fcc177bc5ff7ae411216c8..69f51a786878cd27bf55ed0eaedfe8f1cf39545b 100644
GIT binary patch
delta 37
rcmeyw^_`0+l$V!_0SHuDxe_<>XfZOnPc~<iXDLZ7F4-K)D9Zu>q^t;^

delta 32
mcmey)^@)ool$V!_0SFHC<tA+8(PCtDnrzM}zd4#wh6MnPod@Co

diff --git a/ObservationSim/PSF/__pycache__/__init__.cpython-38.pyc b/ObservationSim/PSF/__pycache__/__init__.cpython-38.pyc
index aa42e9e3346429a7b07e8737a26ba8df96761fa9..130eaafe650cbc3e12701b4e63a5f8f07d61d290 100644
GIT binary patch
delta 33
ncmZ3;w2X--l$V!_0SHuDxe_Px>|}JGcubz9B(=C?;uBi{e_;u4

delta 28
icmZ3+w2+A>l$V!_0SFHC<t9wz*~#cM@tFL?S2h4<S_rZL

diff --git a/ObservationSim/Pointing.py b/ObservationSim/Pointing.py
index 138af66..735307b 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
GIT binary patch
delta 388
zcmdn)c-fIRl$V!_0SI3Da3|i}$Xm_E=sCHQO`fGBwYX&Ra<)~BUp5D^yD&1UO`gu-
z$v9>5Lyl76s2cGsl@#%8rU^_%1~rUXnza&>=W|Ml<mrGVB*79fa0y-B2~Z8pKn)Wn
z-{e$h+%cJvOPTi_SX>mW{@!FmE=@*}$<bW4ydE_&Sw<;JKyl`xn8{1I6d5N>KF(#x
zcxduZE^Wp;lU2FZ83iW$a`%bVFl3pesQ2>JFvj!O@T3R<wXha#+WeN=m4%UKvavuG
zYmo-fcbn%5TxMmAn_MUsBh19Y$i&FP$Oa^tesi$#FtRaCej+xLiGgKvt#|`7<BZAw
zq$aveV2ov|<uBo=;caGgVTk=wD^SB<!z;p2BOuODD_Fyv!jR2Tw6BJ*h9Afm%HybE
zuHlyivT6itc*GcLxU-pyt`yFhd{BBX<DAX)G8-5fvnCtJDRK!h@&F+RBNx-=aJd8~
E05W-Of&c&j

delta 389
zcmccYxZROAl$V!_0SKOp?Mw*Y$Xm_E=rXyJO@8uPwv~)OHixsjFf!^*p2OkEIA`)R
zj#BZY8u2WZ6!C1P2~0&MHH=xBwGtB;3p*y~aY~CDfaN5?aw#ZsQj@oF3iHl@>SYG%
zoiX_ur#j<-$^ST&dB1_hMZx->P1fVmWR#g4!DXu-P$QFNl%fO_XD&*q5l)ddXQ&mf
z5nrIYkb#i_WNTFi&=%1Y9<YiTlaFv2GM<|JjZ2&H$z&yNbw-KFUfg{`DeAr4HH`86
zH9RRoK!vPD+cv-Bc4cAYo@^qJwRy3?Wmd+7$>m}(;*2an$OOb}K$7V<2OAHN#lkrG
znb^$Djp7Z=j4hLyq$e81eyHUy;i%zlW^`eQeN-z@!(YQI!cZe1&QL2@!&k!(q=jk(
tYk0&MYPhqRiw+ddntW4wFXODu(`7a=GNw)TkW*w6VB`V9&BbyFOaSj_aM%C<

diff --git a/ObservationSim/__pycache__/Pointing.cpython-38.pyc b/ObservationSim/__pycache__/Pointing.cpython-38.pyc
index 22442f6ccad9d75cc79c4e5e4a811f12344183ad..2dccd0258a9dc7d83260f981da6f71d290870cbe 100644
GIT binary patch
delta 76
zcmdnRd5DuYl$V!_0SJn&awVRe$SccuYNPf+M%EOr6p{4FpBc3nH73h3NwSor7MDym
bV_M88w)qy54I`uTWN{XGh^Q$`3nL2vDajP;

delta 68
zcmX@axr>uGl$V!_0SMUd>`0g}kyn=S%tq~ljO?j`DGVth&67VeYB4HLmSK{dY{j&Q
Xk!kZ?CL2aZyU9{4@{{dYni-h^fEW?&

diff --git a/ObservationSim/__pycache__/_util.cpython-38.pyc b/ObservationSim/__pycache__/_util.cpython-38.pyc
index 1f0b66f8877f4d082bdf59a704fd98b443b9579e..0df2540b77bb84486a2b4eb24a8201af6902ec97 100644
GIT binary patch
delta 205
zcmbOuuuy;}l$V!_0SHuDxe_<>9ARQ~n0%2*o~0zUxMcHtCSFFysL6kspR%a}l_WDy
zwqui+#M<I34&)U{fCxz-af`(_*g5_sJBZ0>pvhh&4U&-o5wajc4n%-uS&Onti%V{?
zWaVe(X|ff`gCrCtUu0EeRGj>o)s<0ivL)LoMuW*L?3RoQlkM2E7_BC+WS5gS0VxEV
V$^>GGfe4U`iu6E))#PXFW&jNaEmZ&j

delta 192
zcmZ1|Fh_tVl$V!_0SIpO<tA+8Il{zfJ^3P&{N}GrJdBLDCNr@-WmKE|f@Ptv1W-+p
zB#4j#sb=vFc8-6^4q`GIXtEc{fMjGrgdB*F2N7Ud)}pM^;*wh|S^1fHnruZ1APL3E
z*H{%9l_vjSb!F6_Y{zzr(Qq;+yCtLIWM}p)paa&i%gLL96oO4<0<pwEgc^v@2NBkj
IU$dJ50JNDb8UO$Q

diff --git a/ObservationSim/run.pbs b/ObservationSim/run.pbs
index 395472a..34274e3 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
-- 
GitLab