Skip to content

Commit

Permalink
Merge pull request lsst#256 from lsst/tickets/DM-23526
Browse files Browse the repository at this point in the history
DM-23526: Fix fgcmcal issues exposed during PDR2 run
  • Loading branch information
erykoff authored and PaulPrice committed Feb 20, 2020
2 parents 40c5250 + 9e74041 commit e546994
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
11 changes: 6 additions & 5 deletions config/hsc/fgcmFitCycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@
config.filterMap = {'g': 'g', 'r': 'r', 'r2': 'r', 'i': 'i', 'i2': 'i',
'z': 'z', 'y': 'y',
'N387': 'N387', 'N816': 'N816', 'N921': 'N921'}
config.maxIterBeforeFinalCycle = 30
config.maxIterBeforeFinalCycle = 75
config.nCore = 4
config.cycleNumber = 0
config.utBoundary = 0.0
config.washMjds = (56700.0, 57500.0, 57700.0, 58050.0)
config.epochMjds = (56700., 57420., 57606., 59000.)
config.coatingMjds = (56700.0, 58050.0)
config.washMjds = (56650.0, 57500.0, 57700.0, 58050.0)
config.epochMjds = (56650., 57420., 57606., 59000.)
config.coatingMjds = (56650.0, 58050.0)
config.latitude = 19.8256
config.expGrayPhotometricCut = (-0.05, -0.05, -0.05, -0.05, -0.05, -0.05, -0.05, -0.05)
config.expGrayHighCut = (0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2)
config.aperCorrFitNBins = 10
config.aperCorrInputSlopes = (-1.0150, -0.9694, -1.7229, -1.4549, -1.1998, -1.0, -1.0, -1.0)
config.aperCorrInputSlopes = (-1.0, -1.1579, -1.3908, -1.1436, -1.8149,
-1.6974, -1.3310, -1.2057)
config.starColorCuts = ('g,r,-0.25,2.25',
'r,i,-0.50,2.25',
'i,z,-0.50,1.00',
Expand Down
6 changes: 3 additions & 3 deletions config/hsc/fgcmMakeLut.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

# Filter names to build LUT ('short' names)
config.filterNames = ('g', 'r', 'r2', 'i', 'i2', 'z', 'y',
'N387', 'N816', 'N921')
'N387', 'N816', 'N921', 'N1010')

# Standard filterNames ('short' names)
# These settings will put both "r" and "r2" filters on the
# "r2" standard, and similar for "i" and "i2".
config.stdFilterNames = ('g', 'r2', 'r2', 'i2', 'i2', 'z', 'y',
'N387', 'N816', 'N921')
'N387', 'N816', 'N921', 'N1010')

# FGCM name or filename of precomputed atmospheres
config.atmosphereTableName = 'fgcm_atm_subaru2'
config.atmosphereTableName = 'fgcm_atm_subaru3'

0 comments on commit e546994

Please sign in to comment.