Skip to content
GitLab
Commit c7f7ec16 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

update

parent 16e7ff3e
Pipeline #7883 failed with stage
in 0 seconds
Show whitespace changes
Inline Side-by-side
csst_mci_sim/csst_mci_sim.py
View file @ c7f7ec16
...@@ -821,7 +821,7 @@ def psfMaker_IDW(px, py, PSFMat, cen_col, cen_row, dn=5, IDWindex=3, OnlyNeighbo ...@@ -821,7 +821,7 @@ def psfMaker_IDW(px, py, PSFMat, cen_col, cen_row, dn=5, IDWindex=3, OnlyNeighbo
dist = np.sqrt((ref_col - cen_col[idx]) dist = np.sqrt((ref_col - cen_col[idx])
** 2 + (ref_row - cen_row[idx])**2) ** 2 + (ref_row - cen_row[idx])**2)
#if IDWindex == 1: # if IDWindex == 1:
psfWeight[ipsf] = dist**IDWindex psfWeight[ipsf] = dist**IDWindex
# if IDWindex == 2: # if IDWindex == 2:
# psfWeight[ipsf] = dist**2 # psfWeight[ipsf] = dist**2
...@@ -1051,8 +1051,8 @@ class MCIsimulator(): ...@@ -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(): ...@@ -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(): ...@@ -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]
......
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