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-23699: Update fgcmcal default config format #14

Merged
merged 3 commits into from
Mar 10, 2020
Merged

DM-23699: Update fgcmcal default config format #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f40cbdf
Change config lists to dicts to avoid index errors.
erykoff Mar 3, 2020
ed77576
Merge branch 'configliststodicts'
erykoff Mar 4, 2020
8b74670
Merge branch 'master' into tickets/DM-23699
erykoff Mar 4, 2020
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
2 changes: 1 addition & 1 deletion fgcm/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from __future__ import division, absolute_import, print_function

__version__ = '3.1.3'
__version__ = '3.2.0'

__version_info__ = __version__.split('.')
50 changes: 25 additions & 25 deletions fgcm/fgcmAtmosphereTable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,31 +417,31 @@ def saveTable(self, fileName, clobber=False):

fits = fitsio.FITS(fileName, 'rw')

parStruct = np.zeros(1, dtype=[('ELEVATION','f4'),
('PMBELEVATION','f4'),
('PMBSTD','f4'),
('PWVSTD','f4'),
('O3STD','f4'),
('TAUSTD','f4'),
('ALPHASTD','f4'),
('AIRMASSSTD','f4'),
('LAMBDARANGE','f4',2),
('LAMBDASTEP','f4'),
('LAMBDANORM','f4'),
('ATMLAMBDA','f4',self.atmLambda.size),
('ATMSTDTRANS','f4',self.atmStdTrans.size),
('PMB','f4',self.pmb.size),
('PMBDELTA','f4'),
('LNPWV','f4',self.lnPwv.size),
('LNPWVDELTA','f4'),
('O3','f4',self.o3.size),
('O3DELTA','f4'),
('LNTAU','f4',self.lnTau.size),
('LNTAUDELTA','f4'),
('ALPHA','f4',self.alpha.size),
('ALPHADELTA','f4'),
('SECZENITH','f4',self.secZenith.size),
('SECZENITHDELTA','f4')])
parStruct = np.zeros(1, dtype=[('ELEVATION', 'f4'),
('PMBELEVATION', 'f4'),
('PMBSTD', 'f4'),
('PWVSTD', 'f4'),
('O3STD', 'f4'),
('TAUSTD', 'f4'),
('ALPHASTD', 'f4'),
('AIRMASSSTD', 'f4'),
('LAMBDARANGE', 'f4',2),
('LAMBDASTEP', 'f4'),
('LAMBDANORM', 'f4'),
('ATMLAMBDA', 'f4', (self.atmLambda.size, )),
('ATMSTDTRANS', 'f4', (self.atmStdTrans.size, )),
('PMB', 'f4', (self.pmb.size, )),
('PMBDELTA', 'f4'),
('LNPWV', 'f4', (self.lnPwv.size, )),
('LNPWVDELTA', 'f4'),
('O3', 'f4', (self.o3.size, )),
('O3DELTA', 'f4'),
('LNTAU', 'f4', (self.lnTau.size, )),
('LNTAUDELTA', 'f4'),
('ALPHA', 'f4', (self.alpha.size, )),
('ALPHADELTA', 'f4'),
('SECZENITH', 'f4', (self.secZenith.size,)),
('SECZENITHDELTA', 'f4')])

parStruct['ELEVATION'] = self.elevation
parStruct['PMBELEVATION'] = self.pmbElevation
Expand Down
54 changes: 27 additions & 27 deletions fgcm/fgcmChisq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ def __call__(self,fitParams,fitterUnits=False,computeDerivatives=False,computeSE
# put in saving of the parameters...
# this will be in both units
import astropy.io.fits as pyfits
tempCat = np.zeros(1, dtype=[('o3', 'f8', self.fgcmPars.nCampaignNights),
('lnTauIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnTauSlope', 'f8', self.fgcmPars.nCampaignNights),
('alpha', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvSlope', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvQuadratic', 'f8', self.fgcmPars.nCampaignNights),
('qeSysIntercept', 'f8', self.fgcmPars.parQESysIntercept.size)])
tempCat = np.zeros(1, dtype=[('o3', 'f8', (self.fgcmPars.nCampaignNights, )),
('lnTauIntercept', 'f8', (self.fgcmPars.nCampaignNights, )),
('lnTauSlope', 'f8', (self.fgcmPars.nCampaignNights, )),
('alpha', 'f8', (self.fgcmPars.nCampaignNights, )),
('lnPwvIntercept', 'f8', (self.fgcmPars.nCampaignNights, )),
('lnPwvSlope', 'f8', (self.fgcmPars.nCampaignNights, )),
('lnPwvQuadratic', 'f8', (self.fgcmPars.nCampaignNights, )),
('qeSysIntercept', 'f8', (self.fgcmPars.parQESysIntercept.size, ))])
tempCat['o3'][0][:] = fitParams[self.fgcmPars.parO3Loc:
(self.fgcmPars.parO3Loc +
self.fgcmPars.nCampaignNights)]
Expand Down Expand Up @@ -238,14 +238,14 @@ def __call__(self,fitParams,fitterUnits=False,computeDerivatives=False,computeSE

pyfits.writeto('%s_fitParams_%d_fitterunits.fits' % (self.outfileBaseWithCycle, len(self.fitChisqs) + 1), tempCat, overwrite=True)

tempCat = np.zeros(1, dtype=[('o3', 'f8', self.fgcmPars.nCampaignNights),
('lnTauIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnTauSlope', 'f8', self.fgcmPars.nCampaignNights),
('alpha', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvSlope', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvQuadratic', 'f8', self.fgcmPars.nCampaignNights),
('qeSysIntercept', 'f8', (self.fgcmPars.nBands, self.fgcmPars.nWashIntervals))])
tempCat = np.zeros((1, ), dtype=[('o3', 'f8', self.fgcmPars.nCampaignNights),
('lnTauIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnTauSlope', 'f8', self.fgcmPars.nCampaignNights),
('alpha', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvSlope', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvQuadratic', 'f8', self.fgcmPars.nCampaignNights),
('qeSysIntercept', 'f8', (self.fgcmPars.nBands, self.fgcmPars.nWashIntervals))])
tempCat['o3'][0][:] = self.fgcmPars.parO3
tempCat['lnTauIntercept'][0][:] = self.fgcmPars.parLnTauIntercept
tempCat['lnTauSlope'][0][:] = self.fgcmPars.parLnTauSlope
Expand Down Expand Up @@ -430,15 +430,15 @@ def __call__(self,fitParams,fitterUnits=False,computeDerivatives=False,computeSE
if self.saveParsForDebugging:

import astropy.io.fits as pyfits
tempCat = np.zeros(1, dtype=[('chisq', 'f8'),
('o3', 'f8', self.fgcmPars.nCampaignNights),
('lnTauIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnTauSlope', 'f8', self.fgcmPars.nCampaignNights),
('alpha', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvSlope', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvQuadratic', 'f8', self.fgcmPars.nCampaignNights),
('qeSysIntercept', 'f8', self.fgcmPars.nWashIntervals)])
tempCat = np.zeros((1, ), dtype=[('chisq', 'f8'),
('o3', 'f8', self.fgcmPars.nCampaignNights),
('lnTauIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnTauSlope', 'f8', self.fgcmPars.nCampaignNights),
('alpha', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvIntercept', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvSlope', 'f8', self.fgcmPars.nCampaignNights),
('lnPwvQuadratic', 'f8', self.fgcmPars.nCampaignNights),
('qeSysIntercept', 'f8', self.fgcmPars.nWashIntervals)])
tempCat['o3'][0][:] = dChisqdP[self.fgcmPars.parO3Loc:
(self.fgcmPars.parO3Loc +
self.fgcmPars.nCampaignNights)]
Expand Down Expand Up @@ -541,7 +541,7 @@ def _magWorker(self, goodStarsAndObs):
# this is ccdGray[expIndex, ccdIndex]
# and we only apply when > self.illegalValue
# same sign as FGCM_DUST (QESys)
if self.ccdGraySubCCD:
if np.any(self.ccdGraySubCCD):
ccdGraySubCCDPars = snmm.getArray(self.fgcmGray.ccdGraySubCCDParsHandle)

# and the arrays for locking access
Expand Down Expand Up @@ -598,7 +598,7 @@ def _magWorker(self, goodStarsAndObs):
# because we're filtering good observations (I hope!)
ok,=np.where(ccdGray[obsExpIndexGO, obsCCDIndexGO] > self.illegalValue)

if self.ccdGraySubCCD:
if np.any(self.ccdGraySubCCD):
obsXGO = snmm.getArray(self.fgcmStars.obsXHandle)[goodObs]
obsYGO = snmm.getArray(self.fgcmStars.obsYHandle)[goodObs]
expCcdHash = (obsExpIndexGO[ok] * (self.fgcmPars.nCCD + 1) +
Expand Down