From 837f61b1c0ee28943f3b44957a2b8cf60ffddb9a Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Fri, 7 Mar 2025 18:53:57 +1300 Subject: [PATCH 1/8] Remove Print in Minimize --- tessreduce/psf_photom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tessreduce/psf_photom.py b/tessreduce/psf_photom.py index 7fd584b..0821292 100644 --- a/tessreduce/psf_photom.py +++ b/tessreduce/psf_photom.py @@ -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 From 8583b3b26b13243ea92d23aae99692f9ae96e168 Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Fri, 7 Mar 2025 22:09:55 +1300 Subject: [PATCH 2/8] Debugging --- tessreduce/tessreduce.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index f470566..d1b0f00 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -2641,9 +2641,13 @@ def field_calibrate(self,zp_single=True,plot=None,savename=None): if self.phot_method == 'aperture': flux[~eind] = np.nan - + print(type(flux)) + print(flux.shape) + print(type(d.tmag.values)) + print(d.tmag.values.shape) #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]) From dde6e6e46e200982004c9e894ab62ba999fbfaf7 Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Sat, 8 Mar 2025 09:11:28 +1300 Subject: [PATCH 3/8] Fixed PSF flux shape error --- tessreduce/tessreduce.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index d1b0f00..2776038 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -1670,7 +1670,8 @@ def psf_photometry(self,xPix,yPix,size=7,snap='brightest',ext_shift=True,plot=Fa flux, eflux = zip(*Parallel(n_jobs=self.num_cores)(delayed(par_psf_flux)(cutouts[i],base,self.shift[i]) for i in inds)) else: 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) @@ -2641,10 +2642,6 @@ def field_calibrate(self,zp_single=True,plot=None,savename=None): if self.phot_method == 'aperture': flux[~eind] = np.nan - print(type(flux)) - print(flux.shape) - print(type(d.tmag.values)) - print(d.tmag.values.shape) #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) From 875efb8e19950c594c08d421215e48c970fa73b5 Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Sat, 8 Mar 2025 11:20:44 +1300 Subject: [PATCH 4/8] Fixed PSF flux shape error --- tessreduce/tessreduce.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index 2776038..c83d6e7 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -1669,10 +1669,13 @@ 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])[0]] eflux += [par_psf_flux(cutouts[i],base,self.shift[i])[1]] - if plot: + + print('Test1:', len(flux)) + if plot: plt.figure() plt.plot(flux) plt.ylabel('Flux') @@ -1692,6 +1695,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('Test2:', flux.shape) eflux = np.array(eflux) return flux, eflux From a0dece806a7c3860fd17aa981561a511e661a41f Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Sat, 8 Mar 2025 11:40:28 +1300 Subject: [PATCH 5/8] Fixed PSF flux shape error --- tessreduce/tessreduce.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index c83d6e7..fce7385 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -1673,9 +1673,11 @@ def psf_photometry(self,xPix,yPix,size=7,snap='brightest',ext_shift=True,plot=Fa for i in range(len(cutouts)): flux += [par_psf_flux(cutouts[i],base,self.shift[i])[0]] eflux += [par_psf_flux(cutouts[i],base,self.shift[i])[1]] - + + if i == 10: + print('Extra test:', len(par_psf_flux(cutouts[i],base,self.shift[i])[0])) print('Test1:', len(flux)) - if plot: + if plot: plt.figure() plt.plot(flux) plt.ylabel('Flux') From 706df60ff80368de0a363109dbe3663854f2c490 Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Sat, 8 Mar 2025 13:12:47 +1300 Subject: [PATCH 6/8] Fixed PSF flux shape error --- tessreduce/tessreduce.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index fce7385..323f4ac 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -1673,10 +1673,6 @@ def psf_photometry(self,xPix,yPix,size=7,snap='brightest',ext_shift=True,plot=Fa for i in range(len(cutouts)): flux += [par_psf_flux(cutouts[i],base,self.shift[i])[0]] eflux += [par_psf_flux(cutouts[i],base,self.shift[i])[1]] - - if i == 10: - print('Extra test:', len(par_psf_flux(cutouts[i],base,self.shift[i])[0])) - print('Test1:', len(flux)) if plot: plt.figure() plt.plot(flux) @@ -1697,7 +1693,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('Test2:', flux.shape) + # print('New flux shape:', flux.shape) eflux = np.array(eflux) return flux, eflux @@ -2630,7 +2626,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]] + e_flux += [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))) From 90fc330e17072ec6d2e234964f3b9020bde394a0 Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Sat, 8 Mar 2025 13:35:59 +1300 Subject: [PATCH 7/8] Fixed PSF flux shape error --- tessreduce/tessreduce.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index 323f4ac..eaf151a 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -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() From 255b1dc57fe6bc3816187e44dd8ae87ce23cb513 Mon Sep 17 00:00:00 2001 From: ZacharyLane1204 Date: Sat, 8 Mar 2025 13:42:29 +1300 Subject: [PATCH 8/8] Fixed PSF flux shape error --- tessreduce/tessreduce.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tessreduce/tessreduce.py b/tessreduce/tessreduce.py index eaf151a..c0f24fc 100644 --- a/tessreduce/tessreduce.py +++ b/tessreduce/tessreduce.py @@ -2628,7 +2628,7 @@ def field_calibrate(self,zp_single=True,plot=None,savename=None): 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)[0]] - e_flux += [self.psf_photometry(xPix=xx,yPix=yy,snap='ref',diff=False)[1]] + 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)))