Skip to content

Commit

Permalink
Merge pull request #187 from lsst/tickets/DM-23846
Browse files Browse the repository at this point in the history
DM-23846: Replace OrderedDict in YAML with normal dict
  • Loading branch information
timj committed Mar 12, 2020
2 parents 84b08bc + 5b106b6 commit 0190d27
Show file tree
Hide file tree
Showing 10 changed files with 1,215 additions and 1,522 deletions.
173 changes: 86 additions & 87 deletions tests/headers/UCD-E2V-CCD250-112-04_flat_flat_100_20181205153143.yaml
@@ -1,88 +1,87 @@
!!python/object/apply:collections.OrderedDict
- - [SIMPLE, true]
- [BITPIX, -64]
- [NAXIS, 2]
- [EXTEND, true]
- [ORIGIN, UCDAVIS]
- [DATE, 'Wed Dec 05 23:31:48 GMT 2018']
- [DATE-OBS, 'Wed Dec 05 23:31:48 GMT 2018']
- [MJD, '58457.98042']
- [JD, '2458458.48042']
- [IMAGETAG, NONE]
- [TSTAND, LSST_OPTICAL_SIMULATOR]
- [INSTRUME, SAO]
- [CONTROLL, SAO]
- [CONTNUM, AY0094]
- [CCD_MANU, E2V]
- [CCD_TYPE, CCD250]
- [CCD_SERN, E2V-CCD250-112-04]
- [LSST_NUM, E2V-CCD250-112-04]
- [TESTTYPE, flat]
- [IMGTYPE, flat]
- [SEQNUM, '100']
- [TEMP_SET, -100.0]
- [CCDTEMP, -100.0]
- [MONDIODE, 1.2713e-10]
- [MONOWL, -999999.99]
- [FILTER, r]
- [MASK_TYP, none]
- [MASK_SER, N/A]
- [EXPTIME, '0.5']
- [SHUT_DEL, '100.0']
- [CTLRCFG, /sandbox/lsst/lsst/GUI/UCDavis.cfg]
- [FILENAME, testdata/E2V-CCD250-112-04_flat_flat_100_20181205153143.fits]
- [DETSIZE, '[1:4576,1:4096]']
- [BINNING, 1]
- [BINX, 1]
- [BINY, 1]
- [PRE_COLS, 10]
- [IMG_COLS, 512]
- [OVR_COLS, 50]
- [PRE_ROWS, 0]
- [IMG_ROWS, 2002]
- [OVR_ROWS, 46]
- [HEADVER, 1]
- [CCDGAIN, '5.0']
- [CCDNOISE, UNKNOWN]
- [CHECKSUM, VIdJWGZIVGdIVGZI]
- [DATASUM, '0']
- [BZERO, 32768.0]
- [BSCALE, 1.0]
- [NEXTEND, 16]
- [HISTORY, Updated via LSST FITS Header Conformance Tool]
- [XTENSION, IMAGE]
- [NAXIS1, 0]
- [NAXIS2, 0]
- [PCOUNT, 0]
- [GCOUNT, 1]
- [CHANNEL, 1]
- [EXTNAME, SEGMENT17]
- [AVERAGE, 2249.922414499563]
- [STDEV, 497.5779871494874]
- [CCDSUM, 1 1]
- [NAMPS, 16]
- [DATASEC, '[11:522,1:2002]']
- [TRIMSEC, '[50:622,1:2048]']
- [ORIGSEC, '[1:572,1:2048]']
- [CCDSEC, '[1:572,1:2048]']
- [DETSEC, '[4096:3585,4004:2003]']
- [DTV1, 0.0]
- [ATV1, 0.0]
- [ATV2, 0.0]
- [LTM1_1, -1.0]
- [LTM2_2, -1.0]
- [ATM1_1, 1.0]
- [ATM2_2, 1.0]
- [DTM1_1, -9.93626100783522e-42]
- [DTM2_2, -2.89322161349291e-42]
- [DETECTOR, E2V-CCD250-112-04]
- [DTV2, 0.0]
- [LTV1, 4096]
- [LTV2, 4004]
- [DTM1_2, 0.0]
- [DTM2_1, 0.0]
- [LTM1_2, 0.0]
- [LTM2_1, 0.0]
- [ATM1_2, 0.0]
- [ATM2_1, 0.0]
SIMPLE: true
BITPIX: -64
NAXIS: 2
EXTEND: true
ORIGIN: UCDAVIS
DATE: Wed Dec 05 23:31:48 GMT 2018
DATE-OBS: Wed Dec 05 23:31:48 GMT 2018
MJD: '58457.98042'
JD: '2458458.48042'
IMAGETAG: NONE
TSTAND: LSST_OPTICAL_SIMULATOR
INSTRUME: SAO
CONTROLL: SAO
CONTNUM: AY0094
CCD_MANU: E2V
CCD_TYPE: CCD250
CCD_SERN: E2V-CCD250-112-04
LSST_NUM: E2V-CCD250-112-04
TESTTYPE: flat
IMGTYPE: flat
SEQNUM: '100'
TEMP_SET: -100.0
CCDTEMP: -100.0
MONDIODE: 1.2713e-10
MONOWL: -999999.99
FILTER: r
MASK_TYP: none
MASK_SER: N/A
EXPTIME: '0.5'
SHUT_DEL: '100.0'
CTLRCFG: /sandbox/lsst/lsst/GUI/UCDavis.cfg
FILENAME: testdata/E2V-CCD250-112-04_flat_flat_100_20181205153143.fits
DETSIZE: '[1:4576,1:4096]'
BINNING: 1
BINX: 1
BINY: 1
PRE_COLS: 10
IMG_COLS: 512
OVR_COLS: 50
PRE_ROWS: 0
IMG_ROWS: 2002
OVR_ROWS: 46
HEADVER: 1
CCDGAIN: '5.0'
CCDNOISE: UNKNOWN
CHECKSUM: VIdJWGZIVGdIVGZI
DATASUM: '0'
BZERO: 32768.0
BSCALE: 1.0
NEXTEND: 16
HISTORY: Updated via LSST FITS Header Conformance Tool
XTENSION: IMAGE
NAXIS1: 0
NAXIS2: 0
PCOUNT: 0
GCOUNT: 1
CHANNEL: 1
EXTNAME: SEGMENT17
AVERAGE: 2249.922414499563
STDEV: 497.5779871494874
CCDSUM: 1 1
NAMPS: 16
DATASEC: '[11:522,1:2002]'
TRIMSEC: '[50:622,1:2048]'
ORIGSEC: '[1:572,1:2048]'
CCDSEC: '[1:572,1:2048]'
DETSEC: '[4096:3585,4004:2003]'
DTV1: 0.0
ATV1: 0.0
ATV2: 0.0
LTM1_1: -1.0
LTM2_2: -1.0
ATM1_1: 1.0
ATM2_2: 1.0
DTM1_1: -9.93626100783522e-42
DTM2_2: -2.89322161349291e-42
DETECTOR: E2V-CCD250-112-04
DTV2: 0.0
LTV1: 4096
LTV2: 4004
DTM1_2: 0.0
DTM2_1: 0.0
LTM1_2: 0.0
LTM2_1: 0.0
ATM1_2: 0.0
ATM2_1: 0.0

173 changes: 86 additions & 87 deletions tests/headers/UCD-ITL-3800C-002_flat_flat_100_20180530080354.yaml
@@ -1,88 +1,87 @@
!!python/object/apply:collections.OrderedDict
- - [SIMPLE, true]
- [BITPIX, -64]
- [NAXIS, 2]
- [EXTEND, true]
- [ORIGIN, UCDAVIS]
- [DATE, 'Wed May 30 15:03:56 GMT 2018']
- [DATE-OBS, 'Wed May 30 15:03:56 GMT 2018']
- [MJD, '58268.62773']
- [JD, '2458269.12773']
- [IMAGETAG, NONE]
- [TSTAND, LSST_OPTICAL_SIMULATOR]
- [INSTRUME, SAO]
- [CONTROLL, SAO]
- [CONTNUM, AY0094]
- [CCD_MANU, ITL]
- [CCD_TYPE, STA3800C]
- [CCD_SERN, ITL-3800C-002]
- [LSST_NUM, ITL-3800C-002]
- [TESTTYPE, flat]
- [IMGTYPE, flat]
- [SEQNUM, '100']
- [TEMP_SET, -100.0]
- [CCDTEMP, -99.85]
- [MONDIODE, 1.3513e-10]
- [MONOWL, -999999.99]
- [FILTER, R]
- [MASK_TYP, none]
- [MASK_SER, N/A]
- [EXPTIME, '0.5']
- [SHUT_DEL, '100.0']
- [CTLRCFG, /sandbox/lsst/lsst/GUI/UCDavis.cfg]
- [FILENAME, testdata/ITL-3800C-002_flat_flat_100_20180530080354.fits]
- [DETSIZE, '[1:4072,1:4000]']
- [BINNING, 1]
- [BINX, 1]
- [BINY, 1]
- [PRE_COLS, 3]
- [IMG_COLS, 509]
- [OVR_COLS, 30]
- [PRE_ROWS, 0]
- [IMG_ROWS, 2000]
- [OVR_ROWS, 22]
- [HEADVER, 1]
- [CCDGAIN, '5.0']
- [CCDNOISE, UNKNOWN]
- [CHECKSUM, dgjjdfggdfggdfgg]
- [DATASUM, '0']
- [BZERO, 32768.0]
- [BSCALE, 1.0]
- [NEXTEND, 16]
- [HISTORY, Updated via LSST FITS Header Conformance Tool]
- [XTENSION, IMAGE]
- [NAXIS1, 0]
- [NAXIS2, 0]
- [PCOUNT, 0]
- [GCOUNT, 1]
- [CHANNEL, 1]
- [EXTNAME, SEGMENT13]
- [AVERAGE, 3732.408788383136]
- [STDEV, 392.7501935092445]
- [CCDSUM, 1 1]
- [NAMPS, 16]
- [DATASEC, '[4:512,1:2000]']
- [TRIMSEC, '[50:592,1:2022]']
- [ORIGSEC, '[1:542,1:2022]']
- [CCDSEC, '[1:542,1:2022]']
- [DETSEC, '[2036:1528,1:2000]']
- [DTV1, 0.0]
- [DTV2, 0.0]
- [LTV1, 2040]
- [LTV2, 0]
- [ATV1, 0.0]
- [ATV2, 0.0]
- [LTM1_1, -1.0]
- [LTM2_2, 1.0]
- [LTM1_2, 0.0]
- [LTM2_1, 0.0]
- [ATM1_1, 1.0]
- [ATM1_2, 0.0]
- [ATM2_1, 0.0]
- [ATM2_2, 1.0]
- [DTM1_1, -1.37740711001817e-41]
- [DTM1_2, 0.0]
- [DTM2_1, 0.0]
- [DTM2_2, -4.23846813924473e-42]
- [DETECTOR, ITL-3800C-002]
SIMPLE: true
BITPIX: -64
NAXIS: 2
EXTEND: true
ORIGIN: UCDAVIS
DATE: Wed May 30 15:03:56 GMT 2018
DATE-OBS: Wed May 30 15:03:56 GMT 2018
MJD: '58268.62773'
JD: '2458269.12773'
IMAGETAG: NONE
TSTAND: LSST_OPTICAL_SIMULATOR
INSTRUME: SAO
CONTROLL: SAO
CONTNUM: AY0094
CCD_MANU: ITL
CCD_TYPE: STA3800C
CCD_SERN: ITL-3800C-002
LSST_NUM: ITL-3800C-002
TESTTYPE: flat
IMGTYPE: flat
SEQNUM: '100'
TEMP_SET: -100.0
CCDTEMP: -99.85
MONDIODE: 1.3513e-10
MONOWL: -999999.99
FILTER: R
MASK_TYP: none
MASK_SER: N/A
EXPTIME: '0.5'
SHUT_DEL: '100.0'
CTLRCFG: /sandbox/lsst/lsst/GUI/UCDavis.cfg
FILENAME: testdata/ITL-3800C-002_flat_flat_100_20180530080354.fits
DETSIZE: '[1:4072,1:4000]'
BINNING: 1
BINX: 1
BINY: 1
PRE_COLS: 3
IMG_COLS: 509
OVR_COLS: 30
PRE_ROWS: 0
IMG_ROWS: 2000
OVR_ROWS: 22
HEADVER: 1
CCDGAIN: '5.0'
CCDNOISE: UNKNOWN
CHECKSUM: dgjjdfggdfggdfgg
DATASUM: '0'
BZERO: 32768.0
BSCALE: 1.0
NEXTEND: 16
HISTORY: Updated via LSST FITS Header Conformance Tool
XTENSION: IMAGE
NAXIS1: 0
NAXIS2: 0
PCOUNT: 0
GCOUNT: 1
CHANNEL: 1
EXTNAME: SEGMENT13
AVERAGE: 3732.408788383136
STDEV: 392.7501935092445
CCDSUM: 1 1
NAMPS: 16
DATASEC: '[4:512,1:2000]'
TRIMSEC: '[50:592,1:2022]'
ORIGSEC: '[1:542,1:2022]'
CCDSEC: '[1:542,1:2022]'
DETSEC: '[2036:1528,1:2000]'
DTV1: 0.0
DTV2: 0.0
LTV1: 2040
LTV2: 0
ATV1: 0.0
ATV2: 0.0
LTM1_1: -1.0
LTM2_2: 1.0
LTM1_2: 0.0
LTM2_1: 0.0
ATM1_1: 1.0
ATM1_2: 0.0
ATM2_1: 0.0
ATM2_2: 1.0
DTM1_1: -1.37740711001817e-41
DTM1_2: 0.0
DTM2_1: 0.0
DTM2_2: -4.23846813924473e-42
DETECTOR: ITL-3800C-002

0 comments on commit 0190d27

Please sign in to comment.