Commit 8c89a2dd authored by JX's avatar JX 😵
Browse files

Merge remote-tracking branch 'origin/develop'

parents 36189a3e 27e4deb8
Pipeline #4511 passed with stage
in 0 seconds
......@@ -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]
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment