Commit c7f7ec16 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

update

parent 16e7ff3e
Loading
Loading
Loading
Loading
Loading
+10 −9
Original line number Original line Diff line number Diff line
@@ -1051,8 +1051,8 @@ class MCIsimulator():
            (self.information['ysize'], self.information['xsize']), dtype=float)
            (self.information['ysize'], self.information['xsize']), dtype=float)
        return
        return


##########################################IDWindex#####################################
# ###############################IDWindex#####################################
##############################################################################
# ############################################################################
    def _loadGhostModel(self):
    def _loadGhostModel(self):
        """
        """
        Reads in a ghost model from a FITS file and stores the data to self.ghostModel.
        Reads in a ghost model from a FITS file and stores the data to self.ghostModel.
@@ -1285,7 +1285,12 @@ class MCIsimulator():
            # SED flux*filter_flux*tel_eff
            # SED flux*filter_flux*tel_eff
            eff_arr = Nphoton*ft_effnew*tel_effnew
            eff_arr = Nphoton*ft_effnew*tel_effnew


            Sumphoton[ch] = np.sum(eff_arr)
            S    checkInputList(input_ra_list, input_nstars)
    checkInputList(input_dec_list, input_nstars)
    checkInputList(input_pmra_list, input_nstars)
    checkInputList(input_pmdec_list, input_nstars)
    checkInputList(input_rv_list, input_nstars)
    checkInputList(input_parallax_list, input_nstars)umphoton[ch] = np.sum(eff_arr)


            # seven wavelength for the seleced filter
            # seven wavelength for the seleced filter
            iwave = self.filter_psf[ch]['psf_iwave'][:]
            iwave = self.filter_psf[ch]['psf_iwave'][:]
@@ -1818,16 +1823,12 @@ class MCIsimulator():
                    star_output[ch][int(nlayccd)-1, 0] = fpx  # ra
                    star_output[ch][int(nlayccd)-1, 0] = fpx  # ra
                    star_output[ch][int(nlayccd)-1, 1] = fpy  # dec
                    star_output[ch][int(nlayccd)-1, 1] = fpy  # dec


            #######################################################################
            # ################################################################


            # ###### use  SED_code to generate star SED   #######
            # ###### use  SED_code to generate star SED   #######
            if get_file_extension(starcat) == '.fits':
            if get_file_extension(starcat) == '.fits':
                umag = self.star['gmag'][j]; gmag = self.star['gmag'][j]; rmag = self.star['rmag'][j]; imag = self.star['imag'][j]; zmag = self.star['zmag'][j];
                umag = self.star['gmag'][j]; gmag = self.star['gmag'][j]; rmag = self.star['rmag'][j]; imag = self.star['imag'][j]; zmag = self.star['zmag'][j];






            # SED of j-th star
            # SED of j-th star
            else:
            else:
                umag = self.star['umag'][j]
                umag = self.star['umag'][j]