Skip to content
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

Jump to bottom

DM-43561: Update to fgcm 3.10.6 with distutils removal and plotting bug fixes #42

Merged
merged 9 commits into from
Apr 10, 2024
Merged

DM-43561: Update to fgcm 3.10.6 with distutils removal and plotting bug fixes #42

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be72784
Use setuptools instead of deprecated distutils.
erykoff Mar 27, 2024
93e9b57
Fix unit calculation for I1 corrections.
erykoff Mar 27, 2024
d8c6a71
Fix plotting crash when background variations are very large.
erykoff Mar 27, 2024
3fa2ab3
Don't try to latex-format filter names.
erykoff Mar 27, 2024
1b65e94
Fix reversed logic.
erykoff Mar 27, 2024
b96c4f1
Fix label formatting.
erykoff Mar 27, 2024
79a737c
Fix filter name plotting on superstar flats.
erykoff Mar 27, 2024
cf1d52e
Merge pull request #47 from erykoff/distutils_and_fixes
erykoff Mar 27, 2024
473e432
Merge branch 'master' into tickets/DM-43561
erykoff Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 24 additions & 14 deletions fgcm/fgcmZeropoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def __init__(self,fgcmConfig,fgcmPars,fgcmLUT,fgcmGray,fgcmRetrieval,fgcmStars):
self.superStarSubCCD = fgcmConfig.superStarSubCCD
self.seeingSubExposure = fgcmConfig.seeingSubExposure
self.ccdGraySubCCD = fgcmConfig.ccdGraySubCCD
self.colorSplitBands = fgcmConfig.colorSplitBands
self.colorSplitIndices = fgcmConfig.colorSplitIndices
self.I10StdBand = fgcmConfig.I10StdBand
self.I0StdBand = fgcmConfig.I0StdBand
Expand Down Expand Up @@ -587,7 +588,7 @@ def computeZeropoints(self):

plotter = FgcmZeropointPlotter(zpStruct, self.fgcmStars, self.fgcmPars,
self.I0StdBand, self.I1StdBand, self.I10StdBand,
self.colorSplitIndices,
self.colorSplitIndices, self.colorSplitBands,
self.plotPath, self.outfileBaseWithCycle)

plotter.makeR1I1Plots()
Expand Down Expand Up @@ -826,19 +827,20 @@ class FgcmZeropointPlotter(object):

def __init__(self, zpStruct, fgcmStars, fgcmPars,
I0StdBand, I1StdBand, I10StdBand,
colorSplitIndices, plotPath, outfileBase):
colorSplitIndices, colorSplitBands, plotPath, outfileBase):
self.zpStruct = zpStruct
self.bands = fgcmPars.bands
self.filterNames = fgcmPars.lutFilterNames
self.plotPath = plotPath
self.outfileBase = outfileBase
self.filterToBand = fgcmPars.filterToBand
self.colorSplitIndices = colorSplitIndices
self.colorSplitBands = colorSplitBands
self.I0StdBand = I0StdBand
self.I1StdBand = I1StdBand
self.I10StdBand = I10StdBand

self.i1Conversions = self.computeI1Conversions(fgcmStars)
self.i1Conversions, self.blueString, self.redString = self.computeI1Conversions(fgcmStars)

def computeI1Conversions(self, fgcmStars):
"""
Expand All @@ -856,13 +858,15 @@ def computeI1Conversions(self, fgcmStars):
gmi = (objMagStdMean[goodStars, self.colorSplitIndices[0]] -
objMagStdMean[goodStars, self.colorSplitIndices[1]])

# This maybe could be made more clever...
cuts = np.percentile(gmi, [5.0, 95.0])
blueStars, = np.where(gmi < cuts[0])
redStars, = np.where(gmi > cuts[1])

blueStars, = np.where((gmi > 0.5) & (gmi < 0.55))
redStars, = np.where((gmi > 3.0) & (gmi < 3.05))
# Make sure we have some blue and red stars
if blueStars.size == 0 or redStars.size == 0:
return i1Conversions
blueColor = np.median(gmi[blueStars])
redColor = np.median(gmi[redStars])

blueString = "%s-%s ~ %.2f" % (self.colorSplitBands[0], self.colorSplitBands[1], np.median(blueColor))
redString = "%s-%s ~ %.2f" % (self.colorSplitBands[0], self.colorSplitBands[1], np.median(redColor))

deltaI1 = 1.0

Expand All @@ -875,7 +879,7 @@ def computeI1Conversions(self, fgcmStars):

i1Conversions[i] = 1000.0 * (deltaMagRed - deltaMagBlue) / deltaI1

return i1Conversions
return i1Conversions, blueString, redString

def makeR1I1Plots(self):
"""
Expand Down Expand Up @@ -924,7 +928,9 @@ def makeR1I1Plots(self):
ax.set_xlabel(r'$I_1$ from FGCM Fit (red-blue mmag)',fontsize=16)
ax.set_ylabel(r'$R_1$ from Retrieval (red-blue mmag)',fontsize=16)

text=r'$(%s)$' % (filterName)
text = r'(%s)\n' % (filterName)
text += r"Blue: %s\n" % (self.blueString)
text += r"Red: %s\n" % (self.redString)
ax.annotate(text,(0.1,0.93),xycoords='axes fraction',
ha='left',va='top',fontsize=16)

Expand Down Expand Up @@ -1011,8 +1017,10 @@ def makeR1I1Maps(self, deltaMapper, ccdField='CCDNUM'):
except ValueError:
continue

text = r'$(%s)$' % (filterName) + '\n' + \
r'%s' % (plotType)
text = r'(%s)\n' % (filterName)
text += r'%s\n' % (plotType)
text += r"Blue: %s\n" % (self.blueString)
text += r"Red: %s\n" % (self.redString)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usual mix-n-match of single vs double quotes (and below).

ax.annotate(text,
(0.1,0.93),xycoords='axes fraction',
ha='left',va='top',fontsize=18)
Expand Down Expand Up @@ -1091,7 +1099,9 @@ def makeR1I1TemporalResidualPlots(self):
plt.errorbar(binStruct['X_BIN'], binStruct['Y'],
yerr=binStruct['Y_ERR'], fmt='r.', markersize=10)

text = r'$(%s)$' % (filterName)
text = r'(%s)\n' % (filterName)
text += r"Blue: %s\n" % (self.blueString)
text += r"Red: %s\n" % (self.redString)
ax.annotate(text,
(0.1, 0.93), xycoords='axes fraction',
ha='left', va='top', fontsize=18, color='r')
Expand Down