diff --git a/ObservationSim/Instrument/data/ccd/.DS_Store b/ObservationSim/Instrument/data/ccd/.DS_Store
deleted file mode 100644
index f5986581377d6596ff3f73a930a273a694ebd847..0000000000000000000000000000000000000000
Binary files a/ObservationSim/Instrument/data/ccd/.DS_Store and /dev/null differ
diff --git a/ObservationSim/Instrument/data/field_distortion/__pycache__/__init__.cpython-39.pyc b/ObservationSim/Instrument/data/field_distortion/__pycache__/__init__.cpython-39.pyc
deleted file mode 100644
index 347511c2b740a42e0dff664b5c77a40f93200323..0000000000000000000000000000000000000000
Binary files a/ObservationSim/Instrument/data/field_distortion/__pycache__/__init__.cpython-39.pyc and /dev/null differ
diff --git a/ObservationSim/MockObject/Galaxy.py b/ObservationSim/MockObject/Galaxy.py
index 02faeb262e0864fa7325fe797c241792ff908cfd..9c586bb931732728d00d448242722445df14ee0e 100755
--- a/ObservationSim/MockObject/Galaxy.py
+++ b/ObservationSim/MockObject/Galaxy.py
@@ -144,6 +144,11 @@ class Galaxy(MockObject):
         ###bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
         ###bulge = bulge.shear(bulge_shape)
 
+        if fd_shear:
+            g1 += fd_shear.g1
+            g2 += fd_shear.g2
+        gal_shear = galsim.Shear(g1=g1, g2=g2)
+
         for i in range(len(bandpass_list)):
             bandpass = bandpass_list[i]
 
@@ -175,6 +180,7 @@ class Galaxy(MockObject):
             # bulge = bulge.shear(bulge_shape)
             
             gal_temp = self.bfrac * bulge + (1.0 - self.bfrac) * disk
+            gal_temp = gal_temp.shear(gal_shear)
 
             gal_temp = gal_temp.withFlux(nphotons)
             if not big_galaxy: # Not apply PSF for very big galaxy
@@ -218,13 +224,6 @@ class Galaxy(MockObject):
         # top_stats = snapshot.statistics('lineno')
         # for stat in top_stats[:10]:
         #     print(stat)
-        if fd_shear:
-            g1 += fd_shear.g1
-            g2 += fd_shear.g2
-        gal_shear = galsim.Shear(g1=g1, g2=g2)
-        gal = gal.shear(gal_shear)
-        # if fd_shear is not None:
-        #     gal = gal.shear(fd_shear)
 
         stamp = gal.drawImage(wcs=real_wcs_local, method='phot', offset=offset, save_photons=True)
         photons = stamp.photons
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.7/disperse_c/disperse.cpython-37m-x86_64-linux-gnu.so b/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.7/disperse_c/disperse.cpython-37m-x86_64-linux-gnu.so
deleted file mode 100755
index df39d4dd7a3e9e91461e47547cdda61b0da5a58c..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.7/disperse_c/disperse.cpython-37m-x86_64-linux-gnu.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.7/disperse_c/interp.cpython-37m-x86_64-linux-gnu.so b/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.7/disperse_c/interp.cpython-37m-x86_64-linux-gnu.so
deleted file mode 100755
index 8f65db26166811166f208b031d4d38bcd51bc9e6..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.7/disperse_c/interp.cpython-37m-x86_64-linux-gnu.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.8/disperse_c/disperse.cpython-38-x86_64-linux-gnu.so b/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.8/disperse_c/disperse.cpython-38-x86_64-linux-gnu.so
deleted file mode 100755
index 2ed89c7e7d08aa2449d0d8aad1f2add6cb954021..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.8/disperse_c/disperse.cpython-38-x86_64-linux-gnu.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.8/disperse_c/interp.cpython-38-x86_64-linux-gnu.so b/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.8/disperse_c/interp.cpython-38-x86_64-linux-gnu.so
deleted file mode 100755
index 355c81e7e32f056a1241cd702cc401c41ae88800..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.linux-x86_64-3.8/disperse_c/interp.cpython-38-x86_64-linux-gnu.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/MockObject/disperse_c/disperse.cpython-37m-darwin.so b/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/MockObject/disperse_c/disperse.cpython-37m-darwin.so
deleted file mode 100755
index 5197cdcf8cae7a9ff2d15749ca310ef4a064f678..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/MockObject/disperse_c/disperse.cpython-37m-darwin.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/MockObject/disperse_c/interp.cpython-37m-darwin.so b/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/MockObject/disperse_c/interp.cpython-37m-darwin.so
deleted file mode 100755
index d359bb3ccb84e0bb176179d1c2978df9be128f6d..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/MockObject/disperse_c/interp.cpython-37m-darwin.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/disperse_c/disperse.cpython-37m-darwin.so b/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/disperse_c/disperse.cpython-37m-darwin.so
deleted file mode 100755
index 4d1d315c5ca3555585365a486b413f892ef9f152..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/disperse_c/disperse.cpython-37m-darwin.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/disperse_c/interp.cpython-37m-darwin.so b/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/disperse_c/interp.cpython-37m-darwin.so
deleted file mode 100755
index 0061b7af9b20c163a478bf13b77b6ecb43ee0d2a..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/lib.macosx-10.9-x86_64-3.7/disperse_c/interp.cpython-37m-darwin.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.7/disperse_c/disperse.o b/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.7/disperse_c/disperse.o
deleted file mode 100644
index c99c2b26bfc359149d028fd8017ed40207b65f40..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.7/disperse_c/disperse.o and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.7/disperse_c/interp.o b/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.7/disperse_c/interp.o
deleted file mode 100644
index 743b3f6ab802a6d5418696d6a3e677ad7002aea4..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.7/disperse_c/interp.o and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.8/disperse_c/disperse.o b/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.8/disperse_c/disperse.o
deleted file mode 100644
index 544f093bb01d078415c9b07d2289895615a2b802..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.8/disperse_c/disperse.o and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.8/disperse_c/interp.o b/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.8/disperse_c/interp.o
deleted file mode 100644
index 0524e54b0594ae059d56841ccc43cdd1ddbdafac..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/temp.linux-x86_64-3.8/disperse_c/interp.o and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/temp.macosx-10.9-x86_64-3.7/disperse_c/disperse.o b/ObservationSim/MockObject/SpecDisperser/build/temp.macosx-10.9-x86_64-3.7/disperse_c/disperse.o
deleted file mode 100644
index e72ab2785974393e518eb6af609db30cf4777668..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/temp.macosx-10.9-x86_64-3.7/disperse_c/disperse.o and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/build/temp.macosx-10.9-x86_64-3.7/disperse_c/interp.o b/ObservationSim/MockObject/SpecDisperser/build/temp.macosx-10.9-x86_64-3.7/disperse_c/interp.o
deleted file mode 100644
index a2423056cb36c54b24cb2d1163597ded1c57adbb..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/build/temp.macosx-10.9-x86_64-3.7/disperse_c/interp.o and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/.DS_Store b/ObservationSim/MockObject/SpecDisperser/disperse_c/.DS_Store
deleted file mode 100644
index 927866aaf638fb901d10c70bd308faa67c730ec7..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/.DS_Store and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-37m-darwin.so b/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-37m-darwin.so
deleted file mode 100755
index 4d1d315c5ca3555585365a486b413f892ef9f152..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-37m-darwin.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-37m-x86_64-linux-gnu.so b/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-37m-x86_64-linux-gnu.so
deleted file mode 100755
index df39d4dd7a3e9e91461e47547cdda61b0da5a58c..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-37m-x86_64-linux-gnu.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-37m-darwin.so b/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-37m-darwin.so
deleted file mode 100755
index 0061b7af9b20c163a478bf13b77b6ecb43ee0d2a..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-37m-darwin.so and /dev/null differ
diff --git a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-37m-x86_64-linux-gnu.so b/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-37m-x86_64-linux-gnu.so
deleted file mode 100755
index 8f65db26166811166f208b031d4d38bcd51bc9e6..0000000000000000000000000000000000000000
Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-37m-x86_64-linux-gnu.so and /dev/null differ
diff --git a/ObservationSim/ObservationSim.py b/ObservationSim/ObservationSim.py
index d59e21cfaf1ed87c0926145423a0811e659072b1..87b0ac096dffae0843e00276ca5b5d782181ecd3 100755
--- a/ObservationSim/ObservationSim.py
+++ b/ObservationSim/ObservationSim.py
@@ -112,11 +112,6 @@ class Observation(object):
 
         chip_output.Log_info("========================sky pix========================")
         chip_output.Log_info(filt.sky_background)
-        chip_output.Log_info("========================sky pix========================")
-        chip_output.Log_info(filt.sky_background)
-
-        # [TODO] [TEST]
-        #return
 
         if chip.survey_type == "photometric":
             sky_map = None
diff --git a/run_C6.pbs b/run_C6.pbs
index 563007f97fa153457ae5e9cf60fecae8088dd74c..6447207188224701c54ab76a2c472cfe1176afc1 100755
--- a/run_C6.pbs
+++ b/run_C6.pbs
@@ -8,8 +8,8 @@
 
 cd $PBS_O_WORKDIR
 
-NP=80
-hostfile=wcl-1,wcl-2
+NP=60
+hostfile=wcl-2
 date
 
 mpirun --oversubscribe -H $hostfile -np $NP python /share/home/fangyuedong/csst-simulation/run_sim.py \