Commit 1635e47d authored by Fang Yuedong's avatar Fang Yuedong
Browse files

modified to absolute import, change location of runExposure.py and run.pbs

parent c3247cab

ObservationSim/Instrument/Chip/Chip.py

+4 −14
Original line number Diff line number Diff line 
import galsim

import os

import numpy as np

import Instrument.Chip.Effects as effects

from Instrument.FocalPlane import FocalPlane

from astropy.table import Table

from numpy.random import Generator, PCG64

from Config.Header import generatePrimaryHeader, generateExtensionHeader

from astropy.io import fits

from datetime import datetime



from ObservationSim.Instrument.Chip import Effects as effects

from ObservationSim.Instrument.FocalPlane import FocalPlane

from ObservationSim.Config.Header import generatePrimaryHeader, generateExtensionHeader



class Chip(FocalPlane):

    def __init__(self, chipID, ccdEffCurve_dir, CRdata_dir, normalize_dir=None, sls_dir=None, config=None, treering_func=None):

        # Get focal plane (instance of paraent class) info

        # TODO: use chipID to config individual chip?

        super().__init__()

        # if config is not None:

        #     self.npix_x     = config["npix_x"]

        #     self.npix_y     = config["npix_y"]

        #     self.read_noise = config["read_noise"]

        #     self.dark_noise = config["dark_noise"]

        #     self.pix_scale  = config["pix_scale"]

        #     self.gain       = config["gain"]

        #     self.bias_level = config["bias_level"]

        #     self.overscan   = config["overscan"]

        # else:

        # Default setting

        self.npix_x = 9216

        self.npix_y = 9232

        self.read_noise = 5.0   # e/pix

ObservationSim/Instrument/Filter.py

+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ import galsim 
import pylab as pl

import os

import numpy as np

from ._util import photonEnergy

from .FilterParam import FilterParam



from ObservationSim.Instrument._util import photonEnergy

from ObservationSim.Instrument.FilterParam import FilterParam



class Filter(object):

    def __init__(self, filter_id, filter_type, filter_param, ccd_bandpass):

ObservationSim/MockObject/Catalog.py

+5 −4
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ import random 
import galsim

import h5py as h5

import healpy as hp

from .Star import Star

from .Galaxy import Galaxy

from .Quasar import Quasar

from ._util import seds, sed_assign, extAv

from astropy.table import Table

from astropy.coordinates import spherical_to_cartesian



from ObservationSim.MockObject.Star import Star

from ObservationSim.MockObject.Galaxy import Galaxy

from ObservationSim.MockObject.Quasar import Quasar

from ObservationSim.MockObject._util import seds, sed_assign, extAv



NSIDE = 128



class Catalog(object):

ObservationSim/MockObject/CosmicRay.py

+1 −1
Original line number Diff line number Diff line 
import MockObject

from ObservationSim.MockObject.MockObject import MockObject



class CosmicRay(MockObject):

	pass
 
 No newline at end of file

ObservationSim/MockObject/Galaxy.py

+4 −3
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ import galsim 
import os, sys

import astropy.constants as cons

from astropy.table import Table

from ._util import eObs, integrate_sed_bandpass, getNormFactorForSpecWithABMAG, getObservedSED, getABMAG,convolveGaussXorders

from .SpecDisperser import SpecDisperser

from .MockObject import MockObject

from scipy import interpolate



from ObservationSim.MockObject._util import eObs, integrate_sed_bandpass, getNormFactorForSpecWithABMAG, getObservedSED, getABMAG,convolveGaussXorders

from ObservationSim.MockObject.SpecDisperser import SpecDisperser

from ObservationSim.MockObject.MockObject import MockObject



class Galaxy(MockObject):

    def __init__(self, param, rotation=None):

        super().__init__(param)