Skip to content

Remove print in minimize #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZacharyLane1204 wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Remove print in minimize #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f88c0c7
Merge branch 'CheerfulUser:master' into master
ZacharyLane1204 Jun 11, 2024
34ca8bb
Merge pull request #1 from ZacharyLane1204/snlook
ZacharyLane1204 Jul 2, 2024
9da3d2b
Update
ZacharyLane1204 Mar 7, 2025
837f61b
Remove Print in Minimize
ZacharyLane1204 Mar 7, 2025
8583b3b
Debugging
ZacharyLane1204 Mar 7, 2025
dde6e6e
Fixed PSF flux shape error
ZacharyLane1204 Mar 7, 2025
875efb8
Fixed PSF flux shape error
ZacharyLane1204 Mar 7, 2025
a0dece8
Fixed PSF flux shape error
ZacharyLane1204 Mar 7, 2025
706df60
Fixed PSF flux shape error
ZacharyLane1204 Mar 8, 2025
90fc330
Fixed PSF flux shape error
ZacharyLane1204 Mar 8, 2025
255b1dc
Fixed PSF flux shape error
ZacharyLane1204 Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tessreduce/psf_photom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def psf_flux(self,image,ext_shift=None,surface=True,poly_order=3):
mask = np.zeros_like(self.psf)
mask[self.psf > np.nanpercentile(self.psf,90)] = 1
f0 = np.nansum(image*mask)
print(f0)
# print(f0)
#bkg = np.nanmedian(image[~mask.astype(bool)])
#image = image - bkg

Expand Down
11 changes: 8 additions & 3 deletions tessreduce/tessreduce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,6 +1617,7 @@ def psf_photometry(self,xPix,yPix,size=7,snap='brightest',ext_shift=True,plot=Fa
if diff is None:
diff = self.diff
flux = []
eflux = []

# if isinstance(xPix,(list,np.ndarray)):
# self.moving_psf_phot()
Expand Down Expand Up @@ -1669,8 +1670,10 @@ def psf_photometry(self,xPix,yPix,size=7,snap='brightest',ext_shift=True,plot=Fa
inds = np.arange(len(cutouts))
flux, eflux = zip(*Parallel(n_jobs=self.num_cores)(delayed(par_psf_flux)(cutouts[i],base,self.shift[i]) for i in inds))
else:
print('Non-parallell')
for i in range(len(cutouts)):
flux += [par_psf_flux(cutouts[i],base,self.shift[i])]
flux += [par_psf_flux(cutouts[i],base,self.shift[i])[0]]
eflux += [par_psf_flux(cutouts[i],base,self.shift[i])[1]]
if plot:
plt.figure()
plt.plot(flux)
Expand All @@ -1691,6 +1694,7 @@ def psf_photometry(self,xPix,yPix,size=7,snap='brightest',ext_shift=True,plot=Fa
ax.plot(flux)
ax.set_ylabel('Flux')
flux = np.array(flux)
# print('New flux shape:', flux.shape)
eflux = np.array(eflux)
return flux, eflux

Expand Down Expand Up @@ -2623,7 +2627,8 @@ def field_calibrate(self,zp_single=True,plot=None,savename=None):
if self.phot_method == 'aperture':
flux += [np.nansum(tflux*mask,axis=(1,2))]
elif self.phot_method == 'psf':
flux += [self.psf_photometry(xPix=xx,yPix=yy,snap='ref',diff=False)]
flux += [self.psf_photometry(xPix=xx,yPix=yy,snap='ref',diff=False)[0]]
eflux += [self.psf_photometry(xPix=xx,yPix=yy,snap='ref',diff=False)[1]]
m2 = np.zeros_like(self.ref)
m2[int(d.row.values[i] + .5),int(d.col.values[i] + .5)] = 1
m2 = convolve(m2,np.ones((7,7))) - convolve(m2,np.ones((5,5)))
Expand All @@ -2641,9 +2646,9 @@ def field_calibrate(self,zp_single=True,plot=None,savename=None):
if self.phot_method == 'aperture':
flux[~eind] = np.nan


#calculate the zeropoint
zp = d.tmag.values[:,np.newaxis] + 2.5*np.log10(flux)
# zp = d.tmag.values[:, np.newaxis, np.newaxis] + 2.5*np.log10(flux)
if len(zp) == 0:
zp = np.array([20.44])

Expand Down