Merge remote-tracking branch 'origin/develop'

observation_sim/ObservationSim.py

@@ -135,6 +135,9 @@ 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
+        del chip.flat_img
+        del chip.prnu_img
+        del chip.shutter_img
 
     def runExposure_MPI_PointingList(self, pointing_list, chips=None):
         comm = MPI.COMM_WORLD

observation_sim/sim_steps/add_objects.py

@@ -216,7 +216,7 @@ def add_objects(self, chip, filt, tel, pointing, catalog, obs_param):
         # Unload SED:
         obj.unload_SED()
         del obj
-        gc.collect()
+        # gc.collect()
     del psf_model
     gc.collect()