Merge remote-tracking branch 'origin/develop'

catalog/C9_Catalog.py

@@ -249,9 +249,9 @@ class Catalog(CatalogBase):
             )
 
         for igals in range(ngals):
-            # (TEST)
-            if igals > 100:
-                break
+            # # (TEST)
+            # if igals > 100:
+            #     break
 
             param = self.initialize_param()
             param['ra'] = ra_arr[igals]
@@ -406,9 +406,9 @@ class Catalog(CatalogBase):
                 input_time_str=time_str
             )
         for istars in range(nstars):
-            # (TEST)
-            if istars > 100:
-                break
+            # # (TEST)
+            # if istars > 100:
+            #     break
 
             param = self.initialize_param()
             param['ra'] = ra_arr[istars]

observation_sim/PSF/PSFGauss.py → observation_sim/psf/PSFGauss.py

@@ -3,7 +3,7 @@ import sep
 import numpy as np
 from scipy.interpolate import interp1d
 
-from observation_sim.PSF.PSFModel import PSFModel
+from observation_sim.psf.PSFModel import PSFModel
 
 
 class PSFGauss(PSFModel):

observation_sim/PSF/PSFInterp.py → observation_sim/psf/PSFInterp.py

@@ -12,7 +12,7 @@ import scipy.spatial as spatial
 import galsim
 import h5py
 
-from observation_sim.PSF.PSFModel import PSFModel
+from observation_sim.psf.PSFModel import PSFModel
 
 
 NPSF = 900  # ***# 30*30

observation_sim/PSF/PSFInterpSLS.py → observation_sim/psf/PSFInterpSLS.py

@@ -14,7 +14,7 @@ import galsim
 import h5py
 
 from observation_sim.instruments import Filter, FilterParam, Chip
-from observation_sim.PSF.PSFModel import PSFModel
+from observation_sim.psf.PSFModel import PSFModel
 from observation_sim.instruments.chip import chip_utils
 import os
 from astropy.io import fits

observation_sim/sim_steps/add_objects.py

@@ -5,7 +5,7 @@ import traceback
 import numpy as np
 import galsim
 from observation_sim._util import get_shear_field
-from observation_sim.PSF import PSFGauss, FieldDistortion, PSFInterp, PSFInterpSLS
+from observation_sim.psf import PSFGauss, FieldDistortion, PSFInterp, PSFInterpSLS
 
 from astropy.time import Time
 from datetime import datetime, timezone

tests/test_PSFmodule.py

@@ -9,7 +9,7 @@ import galsim
 import yaml
 
 from observation_sim.instruments import Chip, Filter, FilterParam, FocalPlane
-from observation_sim.PSF.PSFInterp import PSFInterp
+from observation_sim.psf.PSFInterp import PSFInterp
 
 
 def defineCCD(iccd, config_file):

tests/test_SpecDisperse.py

@@ -9,7 +9,7 @@ from observation_sim.mock_objects.SpecDisperser import rotate90, SpecDisperser
 from observation_sim.config import ChipOutput
 from observation_sim.instruments import Telescope, Chip, FilterParam, Filter, FocalPlane
 from observation_sim.mock_objects import MockObject, Star
-from observation_sim.PSF import PSFGauss
+from observation_sim.psf import PSFGauss
 
 import numpy as np
 import galsim

tests/test_imaging.py

@@ -19,7 +19,7 @@ from observation_sim.mock_objects._util import getObservedSED
 from observation_sim.mock_objects import CatalogBase, Galaxy
 
 from observation_sim.instruments import Chip, Filter, FilterParam, FocalPlane
-from observation_sim.PSF.PSFInterp import PSFInterp
+from observation_sim.psf.PSFInterp import PSFInterp
 from observation_sim.mock_objects._util import integrate_sed_bandpass, getNormFactorForSpecWithABMAG, getABMAG
 
 

tools/get_PSF.py

 import os
 import numpy as np
-import observation_sim.PSF.PSFInterp as PSFInterp
+import observation_sim.psf.PSFInterp as PSFInterp
 from observation_sim.instruments import Chip, Filter, FilterParam
 import yaml
 import galsim