Index: /branches/czw_branch/20170908/ippconfig/gpc1/psastro.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc1/psastro.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc1/psastro.config (revision 40481) @@ -124,5 +124,6 @@ # PSASTRO.CATDIR STR PS1.REF.20120524 # PSASTRO.CATDIR STR PS1.REF.20140605 -PSASTRO.CATDIR STR PS1.REF.20140713 +#PSASTRO.CATDIR STR PS1.REF.20140713 +PSASTRO.CATDIR STR PS1.REF.20170919 DVO.GETSTAR.PHOTCODE STR i @@ -366,5 +367,6 @@ # PSASTRO.CATDIR STR PS1.REF.20120524 # PSASTRO.CATDIR STR PS1.REF.20140605 - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 ZERO.POINT.USE.MEAN BOOL TRUE END @@ -381,5 +383,6 @@ # PSASTRO.CATDIR STR PS1.REF.20120524 # PSASTRO.CATDIR STR PS1.REF.20140605 - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 ZERO.POINT.USE.MEAN BOOL TRUE END @@ -401,5 +404,6 @@ ZERO.POINT.USE.MEAN BOOL TRUE PSASTRO.MAX.ALLOWED.FWHM F32 16 - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 END @@ -407,5 +411,6 @@ ZERO.POINT.USE.MEAN BOOL TRUE PSASTRO.MAX.ALLOWED.FWHM F32 16 - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 END @@ -418,5 +423,6 @@ DVO.GETSTAR.MIN.MAG F32 12.0 # leave similar to default, MD in marginal weather and can lose 1-3 mags DVO.GETSTAR.MIN.MAG.INST F32 -25.0 - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 ## refcat may be okay astrom but not faint phot -- so need to be able to further limit by ZP ## -- concern w/ new refcat >20 extra sources w/ larger merr over-dominating scatter in ZP @@ -597,5 +603,6 @@ # PSASTRO.CATDIR STR PS1.REF.20120524 # PSASTRO.CATDIR STR PS1.REF.20140605 - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 ZERO.POINT.USE.MEAN BOOL TRUE @@ -619,5 +626,6 @@ # PSASTRO.CATDIR STR PS1.REF.20120524 # reset here to ensure same catalog is used when reprocessing set uniformly # PSASTRO.CATDIR STR PS1.REF.20140605 (BAD catalog) - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 REFSTAR_MASK BOOL FALSE PSASTRO.SAVE.REFMATCH BOOL FALSE @@ -657,5 +665,6 @@ #PSASTRO.CATDIR STR PS1.REF.20120524 # reset here to ensure same catalog is used when reprocessing set uniformly #PSASTRO.CATDIR STR PS1.REF.20140605 # ensure same catalog is used when reprocessing MD set uniformly (BAD catalog) - PSASTRO.CATDIR STR PS1.REF.20140713 +# PSASTRO.CATDIR STR PS1.REF.20140713 + PSASTRO.CATDIR STR PS1.REF.20170919 REFSTAR_MASK BOOL FALSE PSASTRO.SAVE.REFMATCH BOOL FALSE Index: /branches/czw_branch/20170908/ippconfig/gpc1/psphot.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc1/psphot.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc1/psphot.config (revision 40481) @@ -89,4 +89,18 @@ END +SSTF_WS_DIFF METADATA + PSPHOT.EXT.NSIGMA.LIMIT F32 0.0 + PSPHOT.EXT.DIFF.ALTERNATE BOOL TRUE + PSPHOT.EXT.DIFF.ALTERNATE.THRESH F32 1.25 + + PSPHOT.EXT.FIT.ALL.SOURCES BOOL TRUE + PSPHOT.EXT.FIT.ALL.THRESH F32 1000 +# Lower threshold as requested by MOPS + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + TRAIL_RAW EXTENDED_SOURCE_MODEL PS_MODEL_TRAIL 4.75 FALSE + END +END + # Recipe overrides for PR reduction PR METADATA Index: /branches/czw_branch/20170908/ippconfig/gpc2/Makefile.am =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/Makefile.am (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/Makefile.am (revision 40481) @@ -5,7 +5,7 @@ dvo.config \ camera.config \ - format_raw.config \ + format_default.config \ format_mef.config \ - format_20140521.config \ + format_20180131.config \ ppImage.config \ ppMerge.config \ Index: /branches/czw_branch/20170908/ippconfig/gpc2/camera.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/camera.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/camera.config (revision 40481) @@ -5,6 +5,9 @@ MEF STR gpc2/format_mef.config # RELPHOT STR gpc2/format_relphot.config - FORMAT_20140521 STR gpc2/format_20140521.config - FORMAT_RAW STR gpc2/format_raw.config # default config from the lab (missing MJD, and maybe other stuff) + FORMAT_20180131 STR gpc2/format_20180131.config + FORMAT_DEFAULT STR gpc2/format_default.config +# FORMAT_20180111 STR gpc2/format_20180111.config +# FORMAT_20140521 STR gpc2/format_20140521.config +# FORMAT_RAW STR gpc2/format_raw.config # default config from the lab (missing MJD, and maybe other stuff) END @@ -12,4 +15,5 @@ # Description of camera --- all the chips and the cells that comprise them FPA METADATA + XY00 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY01 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY02 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 @@ -18,4 +22,5 @@ XY05 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY06 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + XY07 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY10 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY11 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 @@ -66,4 +71,5 @@ XY66 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY67 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + XY70 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY71 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY72 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 @@ -72,16 +78,44 @@ XY75 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 XY76 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + XY77 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 END # internal to external filter names FILTER.ID METADATA - r MULTI - r STR Not available - r STR g.00002 - r STR r.00002 - r STR i.00002 - r STR z.00002 - r STR y.00002 - r STR w.00002 +# r MULTI +# r STR Not available +# r STR g.00002 +# r STR r.00002 +# r STR i.00002 +# r STR z.00002 +# r STR y.00002 +# r STR w.00002 + + g MULTI + g STR g.00002 + g STR g + r MULTI + r STR r.00002 + r STR r + i MULTI + i STR i.00002 + i STR i + z MULTI + z STR z.00002 + z STR z + y MULTI + y STR y.00002 + y STR y + + w MULTI + w STR w.00002 + w STR w +# the block below allows the w-band filter to be used by other filters +# w STR g.00002 +# w STR r.00002 +# w STR i.00002 +# w STR z.00002 +# w STR y.00002 + # the following were needed for detrend.correct because input and output images seem to be inconsistent sometimes: # g STR g @@ -91,5 +125,7 @@ # y STR y # w STR w - OPEN STR OPEN + OPEN MULTI + OPEN STR OPEN + OPEN STR CLEAR.00002 END Index: /branches/czw_branch/20170908/ippconfig/gpc2/format_20180111.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/format_20180111.config (revision 40481) +++ /branches/czw_branch/20170908/ippconfig/gpc2/format_20180111.config (revision 40481) @@ -0,0 +1,632 @@ +# Refurbished GPC2 +# Change effective from 11 January 2018 (TJD=58129): different device arrangement. +# This could be pushed back to 2017-12-21, but many of the exposures on the datastore do not exist. + +# How to identify this type +RULE METADATA + ORIGIN STR PS2 + TELESCOP STR PS2 + INSTRUME STR gpc2 + CONTROLR STR STARGRASP + NAMPS S32 64 + MJD-OBS F64 58129.0 # OP: >= +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents a single chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.OBS STR FILENAME # A PHU keyword for unique identifier within the hierarchy level + CONTENT STR DETECTOR # How to determine content of FITS file +# CONTENT STR FPPOS # Alternate CONTENT keyword in case DETECTOR is unreliable + CONTENT.RULE STR {CHIP.ID} # How to derive the CONTENT when writing +END + +# What's in the FITS file? +CONTENTS METADATA + # CONTENT = chip name : type + CCID71-2-11-4 STR XY00:GPCChip + CCID71-2-06-1 STR XY01:GPCChip + CCID71-7-04-5 STR XY02:GPCChip + CCID71-7-07-5 STR XY03:GPCChip + CCID71-7-16-7 STR XY04:GPCChip + CCID71-7-08-7 STR XY05:GPCChip + CCID71-7-04-7 STR XY06:GPCChip + CCID71-7-08-4 STR XY07:GPCChip + CCID71-2-06-2 STR XY10:GPCChip + CCID71-7-03-6 STR XY11:GPCChip + CCID71-7-05-1 STR XY12:GPCChip + CCID71-7-07-6 STR XY13:GPCChip + CCID71-7-16-4 STR XY14:GPCChip + CCID71-7-03-3 STR XY15:GPCChip + CCID71-7-02-3 STR XY16:GPCChip + CCID71-7-05-3 STR XY17:GPCChip + CCID71-7-02-1 STR XY20:GPCChip + CCID71-7-05-4 STR XY21:GPCChip + CCID71-7-13-7 STR XY22:GPCChip + CCID71-7-07-3 STR XY23:GPCChip + CCID71-7-16-2 STR XY24:GPCChip + CCID71-7-08-5 STR XY25:GPCChip + CCID71-7-02-4 STR XY26:GPCChip + CCID71-3-11-2 STR XY27:GPCChip + CCID71-7-02-5 STR XY30:GPCChip + CCID71-7-14-7 STR XY31:GPCChip + CCID71-1-11-2 STR XY32:GPCChip + CCID71-7-07-1 STR XY33:GPCChip + CCID71-7-13-3 STR XY34:GPCChip + CCID71-7-08-6 STR XY35:GPCChip + CCID71-7-08-4 STR XY36:GPCChip + CCID71-7-15-5 STR XY37:GPCChip + CCID71-7-06-6 STR XY40:GPCChip + CCID71-7-12-6 STR XY41:GPCChip + CCID71-7-03-7 STR XY42:GPCChip + CCID71-7-03-1 STR XY43:GPCChip + CCID71-7-12-1 STR XY44:GPCChip + CCID71-7-09-4 STR XY45:GPCChip + CCID71-1-03-2 STR XY46:GPCChip + CCID71-2-08-2 STR XY47:GPCChip + CCID71-7-14-5 STR XY50:GPCChip + CCID71-3-06-2 STR XY51:GPCChip + CCID71-7-03-5 STR XY52:GPCChip + CCID71-7-06-3 STR XY53:GPCChip + CCID71-7-14-2 STR XY54:GPCChip + CCID71-7-05-7 STR XY55:GPCChip + CCID71-1-09-2 STR XY56:GPCChip + CCID71-3-09-2 STR XY57:GPCChip + CCID71-1-06-2 STR XY60:GPCChip + CCID71-7-12-4 STR XY61:GPCChip + CCID71-7-16-3 STR XY62:GPCChip + CCID71-7-01-7 STR XY63:GPCChip + CCID71-7-12-5 STR XY64:GPCChip + CCID71-7-09-5 STR XY65:GPCChip + CCID71-1-03-3 STR XY66:GPCChip + CCID71-7-06-5 STR XY67:GPCChip + CCID71-7-04-2 STR XY70:GPCChip + CCID71-3-03-3 STR XY71:GPCChip + CCID71-7-01-1 STR XY72:GPCChip + CCID71-7-01-6 STR XY73:GPCChip + CCID71-3-06-4 STR XY74:GPCChip + CCID71-7-15-7 STR XY75:GPCChip + CCID71-1-07-4 STR XY76:GPCChip + CCID71-1-01-2 STR XY77:GPCChip +END + +# CONTENTS METADATA +# # CONTENT = chip name : type +# xy00 STR XY00:GPCChip +# xy01 STR XY01:GPCChip +# xy02 STR XY02:GPCChip +# xy03 STR XY03:GPCChip +# xy04 STR XY04:GPCChip +# xy05 STR XY05:GPCChip +# xy06 STR XY06:GPCChip +# xy07 STR XY07:GPCChip +# xy10 STR XY10:GPCChip +# xy11 STR XY11:GPCChip +# xy12 STR XY12:GPCChip +# xy13 STR XY13:GPCChip +# xy14 STR XY14:GPCChip +# xy15 STR XY15:GPCChip +# xy16 STR XY16:GPCChip +# xy17 STR XY17:GPCChip +# xy20 STR XY20:GPCChip +# xy21 STR XY21:GPCChip +# xy22 STR XY22:GPCChip +# xy23 STR XY23:GPCChip +# xy24 STR XY24:GPCChip +# xy25 STR XY25:GPCChip +# xy26 STR XY26:GPCChip +# xy27 STR XY27:GPCChip +# xy30 STR XY30:GPCChip +# xy31 STR XY31:GPCChip +# xy32 STR XY32:GPCChip +# xy33 STR XY33:GPCChip +# xy34 STR XY34:GPCChip +# xy35 STR XY35:GPCChip +# xy36 STR XY36:GPCChip +# xy37 STR XY37:GPCChip +# xy40 STR XY40:GPCChip +# xy41 STR XY41:GPCChip +# xy42 STR XY42:GPCChip +# xy43 STR XY43:GPCChip +# xy44 STR XY44:GPCChip +# xy45 STR XY45:GPCChip +# xy46 STR XY46:GPCChip +# xy47 STR XY47:GPCChip +# xy50 STR XY50:GPCChip +# xy51 STR XY51:GPCChip +# xy52 STR XY52:GPCChip +# xy53 STR XY53:GPCChip +# xy54 STR XY54:GPCChip +# xy55 STR XY55:GPCChip +# xy56 STR XY56:GPCChip +# xy57 STR XY57:GPCChip +# xy60 STR XY60:GPCChip +# xy61 STR XY61:GPCChip +# xy62 STR XY62:GPCChip +# xy63 STR XY63:GPCChip +# xy64 STR XY64:GPCChip +# xy65 STR XY65:GPCChip +# xy66 STR XY66:GPCChip +# xy67 STR XY67:GPCChip +# xy70 STR XY70:GPCChip +# xy71 STR XY71:GPCChip +# xy72 STR XY72:GPCChip +# xy73 STR XY73:GPCChip +# xy74 STR XY74:GPCChip +# xy75 STR XY75:GPCChip +# xy76 STR XY76:GPCChip +# xy77 STR XY77:GPCChip +# END + +CHIPS METADATA + GPCChip METADATA + # Extension name, cellName:cellType + xy00 STR xy00:GPCCell + xy10 STR xy10:GPCCell + xy20 STR xy20:GPCCell + xy30 STR xy30:GPCCell + xy40 STR xy40:GPCCell + xy50 STR xy50:GPCCell + xy60 STR xy60:GPCCell + xy70 STR xy70:GPCCell + xy01 STR xy01:GPCCell + xy11 STR xy11:GPCCell + xy21 STR xy21:GPCCell + xy31 STR xy31:GPCCell + xy41 STR xy41:GPCCell + xy51 STR xy51:GPCCell + xy61 STR xy61:GPCCell + xy71 STR xy71:GPCCell + xy02 STR xy02:GPCCell + xy12 STR xy12:GPCCell + xy22 STR xy22:GPCCell + xy32 STR xy32:GPCCell + xy42 STR xy42:GPCCell + xy52 STR xy52:GPCCell + xy62 STR xy62:GPCCell + xy72 STR xy72:GPCCell + xy03 STR xy03:GPCCell + xy13 STR xy13:GPCCell + xy23 STR xy23:GPCCell + xy33 STR xy33:GPCCell + xy43 STR xy43:GPCCell + xy53 STR xy53:GPCCell + xy63 STR xy63:GPCCell + xy73 STR xy73:GPCCell + xy04 STR xy04:GPCCell + xy14 STR xy14:GPCCell + xy24 STR xy24:GPCCell + xy34 STR xy34:GPCCell + xy44 STR xy44:GPCCell + xy54 STR xy54:GPCCell + xy64 STR xy64:GPCCell + xy74 STR xy74:GPCCell + xy05 STR xy05:GPCCell + xy15 STR xy15:GPCCell + xy25 STR xy25:GPCCell + xy35 STR xy35:GPCCell + xy45 STR xy45:GPCCell + xy55 STR xy55:GPCCell + xy65 STR xy65:GPCCell + xy75 STR xy75:GPCCell + xy06 STR xy06:GPCCell + xy16 STR xy16:GPCCell + xy26 STR xy26:GPCCell + xy36 STR xy36:GPCCell + xy46 STR xy46:GPCCell + xy56 STR xy56:GPCCell + xy66 STR xy66:GPCCell + xy76 STR xy76:GPCCell + xy07 STR xy07:GPCCell + xy17 STR xy17:GPCCell + xy27 STR xy27:GPCCell + xy37 STR xy37:GPCCell + xy47 STR xy47:GPCCell + xy57 STR xy57:GPCCell + xy67 STR xy67:GPCCell + xy77 STR xy77:GPCCell + END +END + +# Specify the cell data +CELLS METADATA + GPCCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR DATASEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.FILTERID STR FILTERID +# FPA.FILTER STR FILTERID + FPA.FILTER STR FILTER + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR EQUINOX + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.OBS.MODE STR OBS_MODE + FPA.COMMENT STR CMMTOBS + FPA.AIRMASS STR AIRMASS + FPA.POSANGLE STR POSANGLE + FPA.ROTANGLE STR ROT + FPA.FOCUS STR M2Z + FPA.TIME STR SHUTOUTC + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.TEMP STR DETTEM + FPA.M1X STR M1X + FPA.M1Y STR M1Y + FPA.M1Z STR M1Z + FPA.M1TIP STR M1TIP + FPA.M1TILT STR M1TILT + FPA.M2X STR M2X + FPA.M2Y STR M2Y + FPA.M2Z STR M2Z + FPA.M2TIP STR M2TIP + FPA.M2TILT STR M2TILT + FPA.ENV.TEMP STR ENVTEM + FPA.ENV.HUMID STR ENVHUM + FPA.ENV.WIND STR ENVWIN + FPA.ENV.DIR STR ENVDIR + + FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + FPA.TELTEMP.M1CELL STR TELTEMLC # Primary mirror support temps (C) CZW: Confirm + FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C) + FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR TELTEMTR # Mid truss temperatures (C) + FPA.TELTEMP.EXTRA STR TELTEMEX # Miscellaneous temperatures (C) + + FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE + + FPA.PON.TIME STR PONTIME + + CHIP.ID STR DETECTOR + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR ATM1_1 + CELL.YPARITY STR ATM2_2 + CHIP.TEMP STR CDETTEM #CZW: Confirm + CHIP.TEMPERATURE STR DETTEM + FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time + CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter CZW: Not found in cell extensions/nor GPC1 + CELL.DARKTIME STR DARKTIME # Exposure time for camera + CELL.TIME STR SHUTOUTC # Observation time CZW: Not found in cell extensions/nor GPC1 + CELL.GAIN STR GAIN # Cell gain (e/ADU) CZW: Not found in cell extensions + CELL.READNOISE STR RDNOISE # Cell read noise (ADU) +# CELL.SATURATION STR MAXLIN # Saturation point (ADU) +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR PS2 + FPA.INSTRUMENT STR GPC2 + FPA.LONGITUDE STR 10:25:01.417 # West Longitude in Hours 10.4170608521 + FPA.LATITUDE STR 20:42:26.21 # North Latitude in Degrees 20.7070999146 + FPA.ELEVATION F32 3048.0 # altitude in meters + FPA.DETECTOR STR GPC2 + FPA.TIMESYS STR UTC + CHIP.XSIZE S32 4862 + CHIP.YSIZE S32 4870 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + XY00 S32 4971 + XY01 S32 4971 + XY02 S32 4971 + XY03 S32 4971 + XY04 S32 4971 + XY05 S32 4971 + XY06 S32 4971 + XY07 S32 4971 + XY10 S32 9942 + XY11 S32 9942 + XY12 S32 9942 + XY13 S32 9942 + XY14 S32 9942 + XY15 S32 9942 + XY16 S32 9942 + XY17 S32 9942 + XY20 S32 14913 + XY21 S32 14913 + XY22 S32 14913 + XY23 S32 14913 + XY24 S32 14913 + XY25 S32 14913 + XY26 S32 14913 + XY27 S32 14913 + XY30 S32 19884 + XY31 S32 19884 + XY32 S32 19884 + XY33 S32 19884 # should be 19872 + XY34 S32 19884 + XY35 S32 19884 + XY36 S32 19884 + XY37 S32 19884 + XY40 S32 20041 + XY41 S32 20041 + XY42 S32 20041 + XY43 S32 20041 # should be 20029 + XY44 S32 20041 + XY45 S32 20041 + XY46 S32 20041 + XY47 S32 20041 + XY50 S32 25012 + XY51 S32 25012 + XY52 S32 25012 + XY53 S32 25012 + XY54 S32 25012 + XY55 S32 25012 + XY56 S32 25012 + XY57 S32 25012 + XY60 S32 29983 + XY61 S32 29983 + XY62 S32 29983 + XY63 S32 29983 + XY64 S32 29983 + XY65 S32 29983 + XY66 S32 29983 + XY67 S32 29983 + XY70 S32 34954 + XY71 S32 34954 + XY72 S32 34954 + XY73 S32 34954 + XY74 S32 34954 + XY75 S32 34954 + XY76 S32 34954 + XY77 S32 34954 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + XY00 S32 5143 + XY01 S32 10286 + XY02 S32 15429 + XY03 S32 20572 + XY04 S32 25715 + XY05 S32 30858 + XY06 S32 36001 + XY07 S32 41144 + XY10 S32 5143 + XY11 S32 10286 + XY12 S32 15429 + XY13 S32 20572 + XY14 S32 25715 + XY15 S32 30858 + XY16 S32 36001 + XY17 S32 41144 + XY20 S32 5143 + XY21 S32 10286 + XY22 S32 15429 + XY23 S32 20572 + XY24 S32 25715 + XY25 S32 30858 + XY26 S32 36001 + XY27 S32 41144 + XY30 S32 5143 + XY31 S32 10286 + XY32 S32 15429 + XY33 S32 20572 + XY34 S32 25715 # should be 25755 + XY35 S32 30858 + XY36 S32 36001 + XY37 S32 41144 + XY40 S32 306 + XY41 S32 5449 + XY42 S32 10592 + XY43 S32 15735 # should be 15707 + XY44 S32 20878 # should be 20890 + XY45 S32 26021 + XY46 S32 31164 + XY47 S32 36307 + XY50 S32 306 + XY51 S32 5449 + XY52 S32 10592 + XY53 S32 15735 + XY54 S32 20878 + XY55 S32 26021 + XY56 S32 31164 + XY57 S32 36307 + XY60 S32 306 + XY61 S32 5449 + XY62 S32 10592 + XY63 S32 15735 + XY64 S32 20878 + XY65 S32 26021 + XY66 S32 31164 + XY67 S32 36307 + XY70 S32 306 + XY71 S32 5449 + XY72 S32 10592 + XY73 S32 15735 + XY74 S32 20878 + XY75 S32 26021 + XY76 S32 31164 + XY77 S32 36307 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY07 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY70 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + XY77 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY07 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY70 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + XY77 S32 1 + END + CELL.READDIR S32 1 +# CELL.BAD S32 0 + CELL.BAD S32 -1000 + CELL.XSIZE S32 592 + CELL.YSIZE S32 600 + CELL.TIMESYS STR UTC + CELL.SATURATION F32 60000 # Saturation point (ADU) +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + # this rule is fragile : does not match the camera +# FPA.TEMP STR SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.LONGITUDE STR HOURS + FPA.LATITUDE STR DEGREES + FPA.TIME STR YEAR.FIRST + CELL.TIME STR YEAR.FIRST + CELL.BINNING STR TOGETHER + # CELL.X0 STR FORTRAN + # CELL.Y0 STR FORTRAN + CELL.READNOISE STR ADU +END + +# Pattern correction information: + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction +# XY02 STR 0000000000000000000000000000000000000000000000000000000000000001 # xy77 +# XY02 BOOL FALSE +END + +PATTERN.CONTINUITY BOOL TRUE +# PATTERN.CELL BOOL FALSE # by default, do not do any cell pattern correction +# PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction +# XY06 STR 0101000000010000000110000100000000000000000000000000000000000000 +# XY06 BOOL FALSE +# END Index: /branches/czw_branch/20170908/ippconfig/gpc2/format_20180131.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/format_20180131.config (revision 40481) +++ /branches/czw_branch/20170908/ippconfig/gpc2/format_20180131.config (revision 40481) @@ -0,0 +1,631 @@ +# Refurbished GPC2 +# Change effective from 31 January 2018 (TJD=58149): different device arrangement. + +# How to identify this type +RULE METADATA + ORIGIN STR PS2 + TELESCOP STR PS2 + INSTRUME STR gpc2 + CONTROLR STR STARGRASP + NAMPS S32 64 + MJD-OBS F64 58149.0 # OP: >= +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents a single chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.OBS STR FILENAME # A PHU keyword for unique identifier within the hierarchy level + CONTENT STR DETECTOR # How to determine content of FITS file +# CONTENT STR FPPOS # Alternate CONTENT keyword in case DETECTOR is unreliable + CONTENT.RULE STR {CHIP.ID} # How to derive the CONTENT when writing +END + +# What's in the FITS file? +CONTENTS METADATA + # CONTENT = chip name : type + CCID71-2-11-4 STR XY00:GPCChip + CCID71-2-06-1 STR XY01:GPCChip + CCID71-7-04-5 STR XY02:GPCChip + CCID71-7-07-5 STR XY03:GPCChip + CCID71-7-16-7 STR XY04:GPCChip + CCID71-7-08-7 STR XY05:GPCChip + CCID71-7-04-7 STR XY06:GPCChip + CCID71-7-08-4 STR XY07:GPCChip + CCID71-2-06-2 STR XY10:GPCChip + CCID71-7-03-6 STR XY11:GPCChip + CCID71-7-05-1 STR XY12:GPCChip + CCID71-7-07-6 STR XY13:GPCChip + CCID71-7-16-4 STR XY14:GPCChip + CCID71-7-03-3 STR XY15:GPCChip + CCID71-7-02-3 STR XY16:GPCChip + CCID71-7-05-3 STR XY17:GPCChip + CCID71-7-02-1 STR XY20:GPCChip + CCID71-7-05-4 STR XY21:GPCChip + CCID71-7-13-7 STR XY22:GPCChip + CCID71-7-07-3 STR XY23:GPCChip + CCID71-7-16-2 STR XY24:GPCChip + CCID71-7-08-5 STR XY25:GPCChip + CCID71-7-02-4 STR XY26:GPCChip + CCID71-3-11-2 STR XY27:GPCChip + CCID71-7-02-5 STR XY30:GPCChip + CCID71-7-14-7 STR XY31:GPCChip + CCID71-1-11-2 STR XY32:GPCChip + CCID71-7-07-1 STR XY33:GPCChip + CCID71-7-13-3 STR XY34:GPCChip + CCID71-7-08-6 STR XY35:GPCChip + CCID71-7-01-4 STR XY36:GPCChip + CCID71-7-15-5 STR XY37:GPCChip + CCID71-7-06-6 STR XY40:GPCChip + CCID71-7-12-6 STR XY41:GPCChip + CCID71-7-03-7 STR XY42:GPCChip + CCID71-7-03-1 STR XY43:GPCChip + CCID71-7-12-1 STR XY44:GPCChip + CCID71-7-09-4 STR XY45:GPCChip + CCID71-1-03-2 STR XY46:GPCChip + CCID71-2-08-2 STR XY47:GPCChip + CCID71-7-14-5 STR XY50:GPCChip + CCID71-3-06-2 STR XY51:GPCChip + CCID71-7-03-5 STR XY52:GPCChip + CCID71-7-06-3 STR XY53:GPCChip + CCID71-7-14-2 STR XY54:GPCChip + CCID71-7-05-7 STR XY55:GPCChip + CCID71-1-09-2 STR XY56:GPCChip + CCID71-3-09-2 STR XY57:GPCChip + CCID71-1-06-2 STR XY60:GPCChip + CCID71-7-12-4 STR XY61:GPCChip + CCID71-7-16-3 STR XY62:GPCChip + CCID71-7-01-7 STR XY63:GPCChip + CCID71-7-12-5 STR XY64:GPCChip + CCID71-7-09-5 STR XY65:GPCChip + CCID71-1-03-3 STR XY66:GPCChip + CCID71-7-06-5 STR XY67:GPCChip + CCID71-7-04-2 STR XY70:GPCChip + CCID71-3-03-3 STR XY71:GPCChip + CCID71-7-01-1 STR XY72:GPCChip + CCID71-7-01-6 STR XY73:GPCChip + CCID71-3-06-4 STR XY74:GPCChip + CCID71-7-15-7 STR XY75:GPCChip + CCID71-1-07-4 STR XY76:GPCChip + CCID71-1-01-2 STR XY77:GPCChip +END + +# CONTENTS METADATA +# # CONTENT = chip name : type +# xy00 STR XY00:GPCChip +# xy01 STR XY01:GPCChip +# xy02 STR XY02:GPCChip +# xy03 STR XY03:GPCChip +# xy04 STR XY04:GPCChip +# xy05 STR XY05:GPCChip +# xy06 STR XY06:GPCChip +# xy07 STR XY07:GPCChip +# xy10 STR XY10:GPCChip +# xy11 STR XY11:GPCChip +# xy12 STR XY12:GPCChip +# xy13 STR XY13:GPCChip +# xy14 STR XY14:GPCChip +# xy15 STR XY15:GPCChip +# xy16 STR XY16:GPCChip +# xy17 STR XY17:GPCChip +# xy20 STR XY20:GPCChip +# xy21 STR XY21:GPCChip +# xy22 STR XY22:GPCChip +# xy23 STR XY23:GPCChip +# xy24 STR XY24:GPCChip +# xy25 STR XY25:GPCChip +# xy26 STR XY26:GPCChip +# xy27 STR XY27:GPCChip +# xy30 STR XY30:GPCChip +# xy31 STR XY31:GPCChip +# xy32 STR XY32:GPCChip +# xy33 STR XY33:GPCChip +# xy34 STR XY34:GPCChip +# xy35 STR XY35:GPCChip +# xy36 STR XY36:GPCChip +# xy37 STR XY37:GPCChip +# xy40 STR XY40:GPCChip +# xy41 STR XY41:GPCChip +# xy42 STR XY42:GPCChip +# xy43 STR XY43:GPCChip +# xy44 STR XY44:GPCChip +# xy45 STR XY45:GPCChip +# xy46 STR XY46:GPCChip +# xy47 STR XY47:GPCChip +# xy50 STR XY50:GPCChip +# xy51 STR XY51:GPCChip +# xy52 STR XY52:GPCChip +# xy53 STR XY53:GPCChip +# xy54 STR XY54:GPCChip +# xy55 STR XY55:GPCChip +# xy56 STR XY56:GPCChip +# xy57 STR XY57:GPCChip +# xy60 STR XY60:GPCChip +# xy61 STR XY61:GPCChip +# xy62 STR XY62:GPCChip +# xy63 STR XY63:GPCChip +# xy64 STR XY64:GPCChip +# xy65 STR XY65:GPCChip +# xy66 STR XY66:GPCChip +# xy67 STR XY67:GPCChip +# xy70 STR XY70:GPCChip +# xy71 STR XY71:GPCChip +# xy72 STR XY72:GPCChip +# xy73 STR XY73:GPCChip +# xy74 STR XY74:GPCChip +# xy75 STR XY75:GPCChip +# xy76 STR XY76:GPCChip +# xy77 STR XY77:GPCChip +# END + +CHIPS METADATA + GPCChip METADATA + # Extension name, cellName:cellType + xy00 STR xy00:GPCCell + xy10 STR xy10:GPCCell + xy20 STR xy20:GPCCell + xy30 STR xy30:GPCCell + xy40 STR xy40:GPCCell + xy50 STR xy50:GPCCell + xy60 STR xy60:GPCCell + xy70 STR xy70:GPCCell + xy01 STR xy01:GPCCell + xy11 STR xy11:GPCCell + xy21 STR xy21:GPCCell + xy31 STR xy31:GPCCell + xy41 STR xy41:GPCCell + xy51 STR xy51:GPCCell + xy61 STR xy61:GPCCell + xy71 STR xy71:GPCCell + xy02 STR xy02:GPCCell + xy12 STR xy12:GPCCell + xy22 STR xy22:GPCCell + xy32 STR xy32:GPCCell + xy42 STR xy42:GPCCell + xy52 STR xy52:GPCCell + xy62 STR xy62:GPCCell + xy72 STR xy72:GPCCell + xy03 STR xy03:GPCCell + xy13 STR xy13:GPCCell + xy23 STR xy23:GPCCell + xy33 STR xy33:GPCCell + xy43 STR xy43:GPCCell + xy53 STR xy53:GPCCell + xy63 STR xy63:GPCCell + xy73 STR xy73:GPCCell + xy04 STR xy04:GPCCell + xy14 STR xy14:GPCCell + xy24 STR xy24:GPCCell + xy34 STR xy34:GPCCell + xy44 STR xy44:GPCCell + xy54 STR xy54:GPCCell + xy64 STR xy64:GPCCell + xy74 STR xy74:GPCCell + xy05 STR xy05:GPCCell + xy15 STR xy15:GPCCell + xy25 STR xy25:GPCCell + xy35 STR xy35:GPCCell + xy45 STR xy45:GPCCell + xy55 STR xy55:GPCCell + xy65 STR xy65:GPCCell + xy75 STR xy75:GPCCell + xy06 STR xy06:GPCCell + xy16 STR xy16:GPCCell + xy26 STR xy26:GPCCell + xy36 STR xy36:GPCCell + xy46 STR xy46:GPCCell + xy56 STR xy56:GPCCell + xy66 STR xy66:GPCCell + xy76 STR xy76:GPCCell + xy07 STR xy07:GPCCell + xy17 STR xy17:GPCCell + xy27 STR xy27:GPCCell + xy37 STR xy37:GPCCell + xy47 STR xy47:GPCCell + xy57 STR xy57:GPCCell + xy67 STR xy67:GPCCell + xy77 STR xy77:GPCCell + END +END + +# Specify the cell data +CELLS METADATA + GPCCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR DATASEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.FILTERID STR FILTERID + FPA.FILTER STR FILTERID +# FPA.FILTER STR FILTER + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR EQUINOX + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.OBS.MODE STR OBS_MODE + FPA.COMMENT STR CMMTOBS + FPA.AIRMASS STR AIRMASS + FPA.POSANGLE STR POSANGLE + FPA.ROTANGLE STR ROT + FPA.FOCUS STR M2Z + FPA.TIME STR SHUTOUTC + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.TEMP STR DETTEM + FPA.M1X STR M1X + FPA.M1Y STR M1Y + FPA.M1Z STR M1Z + FPA.M1TIP STR M1TIP + FPA.M1TILT STR M1TILT + FPA.M2X STR M2X + FPA.M2Y STR M2Y + FPA.M2Z STR M2Z + FPA.M2TIP STR M2TIP + FPA.M2TILT STR M2TILT + FPA.ENV.TEMP STR ENVTEM + FPA.ENV.HUMID STR ENVHUM + FPA.ENV.WIND STR ENVWIN + FPA.ENV.DIR STR ENVDIR + + FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + FPA.TELTEMP.M1CELL STR TELTEMLC # Primary mirror support temps (C) CZW: Confirm + FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C) + FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR TELTEMTR # Mid truss temperatures (C) + FPA.TELTEMP.EXTRA STR TELTEMEX # Miscellaneous temperatures (C) + + FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE + + FPA.PON.TIME STR PONTIME + + CHIP.ID STR DETECTOR + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR ATM1_1 + CELL.YPARITY STR ATM2_2 + CHIP.TEMP STR CDETTEM #CZW: Confirm + CHIP.TEMPERATURE STR DETTEM + FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time + CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter CZW: Not found in cell extensions/nor GPC1 + CELL.DARKTIME STR DARKTIME # Exposure time for camera + CELL.TIME STR SHUTOUTC # Observation time CZW: Not found in cell extensions/nor GPC1 + CELL.GAIN STR GAIN # Cell gain (e/ADU) CZW: Not found in cell extensions + CELL.READNOISE STR RDNOISE # Cell read noise (ADU) +# CELL.SATURATION STR MAXLIN # Saturation point (ADU) +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR PS2 + FPA.INSTRUMENT STR GPC2 + FPA.LONGITUDE STR 10:25:01.417 # West Longitude in Hours 10.4170608521 + FPA.LATITUDE STR 20:42:26.21 # North Latitude in Degrees 20.7070999146 + FPA.ELEVATION F32 3048.0 # altitude in meters + FPA.DETECTOR STR GPC2 + FPA.TIMESYS STR UTC + CHIP.XSIZE S32 4862 + CHIP.YSIZE S32 4870 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + XY00 S32 4971 + XY01 S32 4971 + XY02 S32 4971 + XY03 S32 4971 + XY04 S32 4971 + XY05 S32 4971 + XY06 S32 4971 + XY07 S32 4971 + XY10 S32 9942 + XY11 S32 9942 + XY12 S32 9942 + XY13 S32 9942 + XY14 S32 9942 + XY15 S32 9942 + XY16 S32 9942 + XY17 S32 9942 + XY20 S32 14913 + XY21 S32 14913 + XY22 S32 14913 + XY23 S32 14913 + XY24 S32 14913 + XY25 S32 14913 + XY26 S32 14913 + XY27 S32 14913 + XY30 S32 19884 + XY31 S32 19884 + XY32 S32 19884 + XY33 S32 19884 # should be 19872 + XY34 S32 19884 + XY35 S32 19884 + XY36 S32 19884 + XY37 S32 19884 + XY40 S32 20041 + XY41 S32 20041 + XY42 S32 20041 + XY43 S32 20041 # should be 20029 + XY44 S32 20041 + XY45 S32 20041 + XY46 S32 20041 + XY47 S32 20041 + XY50 S32 25012 + XY51 S32 25012 + XY52 S32 25012 + XY53 S32 25012 + XY54 S32 25012 + XY55 S32 25012 + XY56 S32 25012 + XY57 S32 25012 + XY60 S32 29983 + XY61 S32 29983 + XY62 S32 29983 + XY63 S32 29983 + XY64 S32 29983 + XY65 S32 29983 + XY66 S32 29983 + XY67 S32 29983 + XY70 S32 34954 + XY71 S32 34954 + XY72 S32 34954 + XY73 S32 34954 + XY74 S32 34954 + XY75 S32 34954 + XY76 S32 34954 + XY77 S32 34954 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + XY00 S32 5143 + XY01 S32 10286 + XY02 S32 15429 + XY03 S32 20572 + XY04 S32 25715 + XY05 S32 30858 + XY06 S32 36001 + XY07 S32 41144 + XY10 S32 5143 + XY11 S32 10286 + XY12 S32 15429 + XY13 S32 20572 + XY14 S32 25715 + XY15 S32 30858 + XY16 S32 36001 + XY17 S32 41144 + XY20 S32 5143 + XY21 S32 10286 + XY22 S32 15429 + XY23 S32 20572 + XY24 S32 25715 + XY25 S32 30858 + XY26 S32 36001 + XY27 S32 41144 + XY30 S32 5143 + XY31 S32 10286 + XY32 S32 15429 + XY33 S32 20572 + XY34 S32 25715 # should be 25755 + XY35 S32 30858 + XY36 S32 36001 + XY37 S32 41144 + XY40 S32 306 + XY41 S32 5449 + XY42 S32 10592 + XY43 S32 15735 # should be 15707 + XY44 S32 20878 # should be 20890 + XY45 S32 26021 + XY46 S32 31164 + XY47 S32 36307 + XY50 S32 306 + XY51 S32 5449 + XY52 S32 10592 + XY53 S32 15735 + XY54 S32 20878 + XY55 S32 26021 + XY56 S32 31164 + XY57 S32 36307 + XY60 S32 306 + XY61 S32 5449 + XY62 S32 10592 + XY63 S32 15735 + XY64 S32 20878 + XY65 S32 26021 + XY66 S32 31164 + XY67 S32 36307 + XY70 S32 306 + XY71 S32 5449 + XY72 S32 10592 + XY73 S32 15735 + XY74 S32 20878 + XY75 S32 26021 + XY76 S32 31164 + XY77 S32 36307 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY07 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY70 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + XY77 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY07 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY70 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + XY77 S32 1 + END + CELL.READDIR S32 1 +# CELL.BAD S32 0 + CELL.BAD S32 -1000 + CELL.XSIZE S32 592 + CELL.YSIZE S32 600 + CELL.TIMESYS STR UTC + CELL.SATURATION F32 60000 # Saturation point (ADU) +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + # this rule is fragile : does not match the camera +# FPA.TEMP STR SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.LONGITUDE STR HOURS + FPA.LATITUDE STR DEGREES + FPA.TIME STR YEAR.FIRST + CELL.TIME STR YEAR.FIRST + CELL.BINNING STR TOGETHER + # CELL.X0 STR FORTRAN + # CELL.Y0 STR FORTRAN + CELL.READNOISE STR ADU +END + +# Pattern correction information: + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction +# XY02 STR 0000000000000000000000000000000000000000000000000000000000000001 # xy77 +# XY02 BOOL FALSE +END + +PATTERN.CONTINUITY BOOL TRUE +# PATTERN.CELL BOOL FALSE # by default, do not do any cell pattern correction +# PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction +# XY06 STR 0101000000010000000110000100000000000000000000000000000000000000 +# XY06 BOOL FALSE +# END Index: /branches/czw_branch/20170908/ippconfig/gpc2/format_default.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/format_default.config (revision 40481) +++ /branches/czw_branch/20170908/ippconfig/gpc2/format_default.config (revision 40481) @@ -0,0 +1,633 @@ +# Refurbished GPC2 +# Copy of the format_20180131.config, with the MJD restriction removed. This will allow data with bad +# MJD-OBS values to be registered without complication. +# + +# How to identify this type +RULE METADATA + ORIGIN STR PS2 + TELESCOP STR PS2 + INSTRUME STR gpc2 + CONTROLR STR STARGRASP + NAMPS S32 64 +# MJD-OBS F64 58149.0 # OP: >= +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents a single chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.OBS STR FILENAME # A PHU keyword for unique identifier within the hierarchy level + CONTENT STR DETECTOR # How to determine content of FITS file +# CONTENT STR FPPOS # Alternate CONTENT keyword in case DETECTOR is unreliable + CONTENT.RULE STR {CHIP.ID} # How to derive the CONTENT when writing +END + +# What's in the FITS file? +CONTENTS METADATA + # CONTENT = chip name : type + CCID71-2-11-4 STR XY00:GPCChip + CCID71-2-06-1 STR XY01:GPCChip + CCID71-7-04-5 STR XY02:GPCChip + CCID71-7-07-5 STR XY03:GPCChip + CCID71-7-16-7 STR XY04:GPCChip + CCID71-7-08-7 STR XY05:GPCChip + CCID71-7-04-7 STR XY06:GPCChip + CCID71-7-08-4 STR XY07:GPCChip + CCID71-2-06-2 STR XY10:GPCChip + CCID71-7-03-6 STR XY11:GPCChip + CCID71-7-05-1 STR XY12:GPCChip + CCID71-7-07-6 STR XY13:GPCChip + CCID71-7-16-4 STR XY14:GPCChip + CCID71-7-03-3 STR XY15:GPCChip + CCID71-7-02-3 STR XY16:GPCChip + CCID71-7-05-3 STR XY17:GPCChip + CCID71-7-02-1 STR XY20:GPCChip + CCID71-7-05-4 STR XY21:GPCChip + CCID71-7-13-7 STR XY22:GPCChip + CCID71-7-07-3 STR XY23:GPCChip + CCID71-7-16-2 STR XY24:GPCChip + CCID71-7-08-5 STR XY25:GPCChip + CCID71-7-02-4 STR XY26:GPCChip + CCID71-3-11-2 STR XY27:GPCChip + CCID71-7-02-5 STR XY30:GPCChip + CCID71-7-14-7 STR XY31:GPCChip + CCID71-1-11-2 STR XY32:GPCChip + CCID71-7-07-1 STR XY33:GPCChip + CCID71-7-13-3 STR XY34:GPCChip + CCID71-7-08-6 STR XY35:GPCChip + CCID71-7-01-4 STR XY36:GPCChip + CCID71-7-15-5 STR XY37:GPCChip + CCID71-7-06-6 STR XY40:GPCChip + CCID71-7-12-6 STR XY41:GPCChip + CCID71-7-03-7 STR XY42:GPCChip + CCID71-7-03-1 STR XY43:GPCChip + CCID71-7-12-1 STR XY44:GPCChip + CCID71-7-09-4 STR XY45:GPCChip + CCID71-1-03-2 STR XY46:GPCChip + CCID71-2-08-2 STR XY47:GPCChip + CCID71-7-14-5 STR XY50:GPCChip + CCID71-3-06-2 STR XY51:GPCChip + CCID71-7-03-5 STR XY52:GPCChip + CCID71-7-06-3 STR XY53:GPCChip + CCID71-7-14-2 STR XY54:GPCChip + CCID71-7-05-7 STR XY55:GPCChip + CCID71-1-09-2 STR XY56:GPCChip + CCID71-3-09-2 STR XY57:GPCChip + CCID71-1-06-2 STR XY60:GPCChip + CCID71-7-12-4 STR XY61:GPCChip + CCID71-7-16-3 STR XY62:GPCChip + CCID71-7-01-7 STR XY63:GPCChip + CCID71-7-12-5 STR XY64:GPCChip + CCID71-7-09-5 STR XY65:GPCChip + CCID71-1-03-3 STR XY66:GPCChip + CCID71-7-06-5 STR XY67:GPCChip + CCID71-7-04-2 STR XY70:GPCChip + CCID71-3-03-3 STR XY71:GPCChip + CCID71-7-01-1 STR XY72:GPCChip + CCID71-7-01-6 STR XY73:GPCChip + CCID71-3-06-4 STR XY74:GPCChip + CCID71-7-15-7 STR XY75:GPCChip + CCID71-1-07-4 STR XY76:GPCChip + CCID71-1-01-2 STR XY77:GPCChip +END + +# CONTENTS METADATA +# # CONTENT = chip name : type +# xy00 STR XY00:GPCChip +# xy01 STR XY01:GPCChip +# xy02 STR XY02:GPCChip +# xy03 STR XY03:GPCChip +# xy04 STR XY04:GPCChip +# xy05 STR XY05:GPCChip +# xy06 STR XY06:GPCChip +# xy07 STR XY07:GPCChip +# xy10 STR XY10:GPCChip +# xy11 STR XY11:GPCChip +# xy12 STR XY12:GPCChip +# xy13 STR XY13:GPCChip +# xy14 STR XY14:GPCChip +# xy15 STR XY15:GPCChip +# xy16 STR XY16:GPCChip +# xy17 STR XY17:GPCChip +# xy20 STR XY20:GPCChip +# xy21 STR XY21:GPCChip +# xy22 STR XY22:GPCChip +# xy23 STR XY23:GPCChip +# xy24 STR XY24:GPCChip +# xy25 STR XY25:GPCChip +# xy26 STR XY26:GPCChip +# xy27 STR XY27:GPCChip +# xy30 STR XY30:GPCChip +# xy31 STR XY31:GPCChip +# xy32 STR XY32:GPCChip +# xy33 STR XY33:GPCChip +# xy34 STR XY34:GPCChip +# xy35 STR XY35:GPCChip +# xy36 STR XY36:GPCChip +# xy37 STR XY37:GPCChip +# xy40 STR XY40:GPCChip +# xy41 STR XY41:GPCChip +# xy42 STR XY42:GPCChip +# xy43 STR XY43:GPCChip +# xy44 STR XY44:GPCChip +# xy45 STR XY45:GPCChip +# xy46 STR XY46:GPCChip +# xy47 STR XY47:GPCChip +# xy50 STR XY50:GPCChip +# xy51 STR XY51:GPCChip +# xy52 STR XY52:GPCChip +# xy53 STR XY53:GPCChip +# xy54 STR XY54:GPCChip +# xy55 STR XY55:GPCChip +# xy56 STR XY56:GPCChip +# xy57 STR XY57:GPCChip +# xy60 STR XY60:GPCChip +# xy61 STR XY61:GPCChip +# xy62 STR XY62:GPCChip +# xy63 STR XY63:GPCChip +# xy64 STR XY64:GPCChip +# xy65 STR XY65:GPCChip +# xy66 STR XY66:GPCChip +# xy67 STR XY67:GPCChip +# xy70 STR XY70:GPCChip +# xy71 STR XY71:GPCChip +# xy72 STR XY72:GPCChip +# xy73 STR XY73:GPCChip +# xy74 STR XY74:GPCChip +# xy75 STR XY75:GPCChip +# xy76 STR XY76:GPCChip +# xy77 STR XY77:GPCChip +# END + +CHIPS METADATA + GPCChip METADATA + # Extension name, cellName:cellType + xy00 STR xy00:GPCCell + xy10 STR xy10:GPCCell + xy20 STR xy20:GPCCell + xy30 STR xy30:GPCCell + xy40 STR xy40:GPCCell + xy50 STR xy50:GPCCell + xy60 STR xy60:GPCCell + xy70 STR xy70:GPCCell + xy01 STR xy01:GPCCell + xy11 STR xy11:GPCCell + xy21 STR xy21:GPCCell + xy31 STR xy31:GPCCell + xy41 STR xy41:GPCCell + xy51 STR xy51:GPCCell + xy61 STR xy61:GPCCell + xy71 STR xy71:GPCCell + xy02 STR xy02:GPCCell + xy12 STR xy12:GPCCell + xy22 STR xy22:GPCCell + xy32 STR xy32:GPCCell + xy42 STR xy42:GPCCell + xy52 STR xy52:GPCCell + xy62 STR xy62:GPCCell + xy72 STR xy72:GPCCell + xy03 STR xy03:GPCCell + xy13 STR xy13:GPCCell + xy23 STR xy23:GPCCell + xy33 STR xy33:GPCCell + xy43 STR xy43:GPCCell + xy53 STR xy53:GPCCell + xy63 STR xy63:GPCCell + xy73 STR xy73:GPCCell + xy04 STR xy04:GPCCell + xy14 STR xy14:GPCCell + xy24 STR xy24:GPCCell + xy34 STR xy34:GPCCell + xy44 STR xy44:GPCCell + xy54 STR xy54:GPCCell + xy64 STR xy64:GPCCell + xy74 STR xy74:GPCCell + xy05 STR xy05:GPCCell + xy15 STR xy15:GPCCell + xy25 STR xy25:GPCCell + xy35 STR xy35:GPCCell + xy45 STR xy45:GPCCell + xy55 STR xy55:GPCCell + xy65 STR xy65:GPCCell + xy75 STR xy75:GPCCell + xy06 STR xy06:GPCCell + xy16 STR xy16:GPCCell + xy26 STR xy26:GPCCell + xy36 STR xy36:GPCCell + xy46 STR xy46:GPCCell + xy56 STR xy56:GPCCell + xy66 STR xy66:GPCCell + xy76 STR xy76:GPCCell + xy07 STR xy07:GPCCell + xy17 STR xy17:GPCCell + xy27 STR xy27:GPCCell + xy37 STR xy37:GPCCell + xy47 STR xy47:GPCCell + xy57 STR xy57:GPCCell + xy67 STR xy67:GPCCell + xy77 STR xy77:GPCCell + END +END + +# Specify the cell data +CELLS METADATA + GPCCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR DATASEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.FILTERID STR FILTERID + FPA.FILTER STR FILTERID +# FPA.FILTER STR FILTER + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR EQUINOX + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.OBS.MODE STR OBS_MODE + FPA.COMMENT STR CMMTOBS + FPA.AIRMASS STR AIRMASS + FPA.POSANGLE STR POSANGLE + FPA.ROTANGLE STR ROT + FPA.FOCUS STR M2Z + FPA.TIME STR SHUTOUTC + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.TEMP STR DETTEM + FPA.M1X STR M1X + FPA.M1Y STR M1Y + FPA.M1Z STR M1Z + FPA.M1TIP STR M1TIP + FPA.M1TILT STR M1TILT + FPA.M2X STR M2X + FPA.M2Y STR M2Y + FPA.M2Z STR M2Z + FPA.M2TIP STR M2TIP + FPA.M2TILT STR M2TILT + FPA.ENV.TEMP STR ENVTEM + FPA.ENV.HUMID STR ENVHUM + FPA.ENV.WIND STR ENVWIN + FPA.ENV.DIR STR ENVDIR + + FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + FPA.TELTEMP.M1CELL STR TELTEMLC # Primary mirror support temps (C) CZW: Confirm + FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C) + FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR TELTEMTR # Mid truss temperatures (C) + FPA.TELTEMP.EXTRA STR TELTEMEX # Miscellaneous temperatures (C) + + FPA.BURNTOOL.APPLIED STR BTOOLAPP + CHIP.VIDEOCELL STR CELLMODE + + FPA.PON.TIME STR PONTIME + + CHIP.ID STR DETECTOR + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR ATM1_1 + CELL.YPARITY STR ATM2_2 + CHIP.TEMP STR CDETTEM #CZW: Confirm + CHIP.TEMPERATURE STR DETTEM + FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time + CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter CZW: Not found in cell extensions/nor GPC1 + CELL.DARKTIME STR DARKTIME # Exposure time for camera + CELL.TIME STR SHUTOUTC # Observation time CZW: Not found in cell extensions/nor GPC1 + CELL.GAIN STR GAIN # Cell gain (e/ADU) CZW: Not found in cell extensions + CELL.READNOISE STR RDNOISE # Cell read noise (ADU) +# CELL.SATURATION STR MAXLIN # Saturation point (ADU) +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR PS2 + FPA.INSTRUMENT STR GPC2 + FPA.LONGITUDE STR 10:25:01.417 # West Longitude in Hours 10.4170608521 + FPA.LATITUDE STR 20:42:26.21 # North Latitude in Degrees 20.7070999146 + FPA.ELEVATION F32 3048.0 # altitude in meters + FPA.DETECTOR STR GPC2 + FPA.TIMESYS STR UTC + CHIP.XSIZE S32 4862 + CHIP.YSIZE S32 4870 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + XY00 S32 4971 + XY01 S32 4971 + XY02 S32 4971 + XY03 S32 4971 + XY04 S32 4971 + XY05 S32 4971 + XY06 S32 4971 + XY07 S32 4971 + XY10 S32 9942 + XY11 S32 9942 + XY12 S32 9942 + XY13 S32 9942 + XY14 S32 9942 + XY15 S32 9942 + XY16 S32 9942 + XY17 S32 9942 + XY20 S32 14913 + XY21 S32 14913 + XY22 S32 14913 + XY23 S32 14913 + XY24 S32 14913 + XY25 S32 14913 + XY26 S32 14913 + XY27 S32 14913 + XY30 S32 19884 + XY31 S32 19884 + XY32 S32 19884 + XY33 S32 19884 # should be 19872 + XY34 S32 19884 + XY35 S32 19884 + XY36 S32 19884 + XY37 S32 19884 + XY40 S32 20041 + XY41 S32 20041 + XY42 S32 20041 + XY43 S32 20041 # should be 20029 + XY44 S32 20041 + XY45 S32 20041 + XY46 S32 20041 + XY47 S32 20041 + XY50 S32 25012 + XY51 S32 25012 + XY52 S32 25012 + XY53 S32 25012 + XY54 S32 25012 + XY55 S32 25012 + XY56 S32 25012 + XY57 S32 25012 + XY60 S32 29983 + XY61 S32 29983 + XY62 S32 29983 + XY63 S32 29983 + XY64 S32 29983 + XY65 S32 29983 + XY66 S32 29983 + XY67 S32 29983 + XY70 S32 34954 + XY71 S32 34954 + XY72 S32 34954 + XY73 S32 34954 + XY74 S32 34954 + XY75 S32 34954 + XY76 S32 34954 + XY77 S32 34954 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + XY00 S32 5143 + XY01 S32 10286 + XY02 S32 15429 + XY03 S32 20572 + XY04 S32 25715 + XY05 S32 30858 + XY06 S32 36001 + XY07 S32 41144 + XY10 S32 5143 + XY11 S32 10286 + XY12 S32 15429 + XY13 S32 20572 + XY14 S32 25715 + XY15 S32 30858 + XY16 S32 36001 + XY17 S32 41144 + XY20 S32 5143 + XY21 S32 10286 + XY22 S32 15429 + XY23 S32 20572 + XY24 S32 25715 + XY25 S32 30858 + XY26 S32 36001 + XY27 S32 41144 + XY30 S32 5143 + XY31 S32 10286 + XY32 S32 15429 + XY33 S32 20572 + XY34 S32 25715 # should be 25755 + XY35 S32 30858 + XY36 S32 36001 + XY37 S32 41144 + XY40 S32 306 + XY41 S32 5449 + XY42 S32 10592 + XY43 S32 15735 # should be 15707 + XY44 S32 20878 # should be 20890 + XY45 S32 26021 + XY46 S32 31164 + XY47 S32 36307 + XY50 S32 306 + XY51 S32 5449 + XY52 S32 10592 + XY53 S32 15735 + XY54 S32 20878 + XY55 S32 26021 + XY56 S32 31164 + XY57 S32 36307 + XY60 S32 306 + XY61 S32 5449 + XY62 S32 10592 + XY63 S32 15735 + XY64 S32 20878 + XY65 S32 26021 + XY66 S32 31164 + XY67 S32 36307 + XY70 S32 306 + XY71 S32 5449 + XY72 S32 10592 + XY73 S32 15735 + XY74 S32 20878 + XY75 S32 26021 + XY76 S32 31164 + XY77 S32 36307 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY07 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY70 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + XY77 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY04 S32 -1 + XY05 S32 -1 + XY06 S32 -1 + XY07 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY14 S32 -1 + XY15 S32 -1 + XY16 S32 -1 + XY17 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY24 S32 -1 + XY25 S32 -1 + XY26 S32 -1 + XY27 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + XY34 S32 -1 + XY35 S32 -1 + XY36 S32 -1 + XY37 S32 -1 + XY40 S32 1 + XY41 S32 1 + XY42 S32 1 + XY43 S32 1 + XY44 S32 1 + XY45 S32 1 + XY46 S32 1 + XY47 S32 1 + XY50 S32 1 + XY51 S32 1 + XY52 S32 1 + XY53 S32 1 + XY54 S32 1 + XY55 S32 1 + XY56 S32 1 + XY57 S32 1 + XY60 S32 1 + XY61 S32 1 + XY62 S32 1 + XY63 S32 1 + XY64 S32 1 + XY65 S32 1 + XY66 S32 1 + XY67 S32 1 + XY70 S32 1 + XY71 S32 1 + XY72 S32 1 + XY73 S32 1 + XY74 S32 1 + XY75 S32 1 + XY76 S32 1 + XY77 S32 1 + END + CELL.READDIR S32 1 +# CELL.BAD S32 0 + CELL.BAD S32 -1000 + CELL.XSIZE S32 592 + CELL.YSIZE S32 600 + CELL.TIMESYS STR UTC + CELL.SATURATION F32 60000 # Saturation point (ADU) +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + # this rule is fragile : does not match the camera +# FPA.TEMP STR SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.LONGITUDE STR HOURS + FPA.LATITUDE STR DEGREES + FPA.TIME STR YEAR.FIRST + CELL.TIME STR YEAR.FIRST + CELL.BINNING STR TOGETHER + # CELL.X0 STR FORTRAN + # CELL.Y0 STR FORTRAN + CELL.READNOISE STR ADU +END + +# Pattern correction information: + +# PATTERN.ROW BOOL TRUE # Do any row pattern correction at all? +PATTERN.ROW.SUBSET METADATA # List of chips and whether to do row pattern correction +# XY02 STR 0000000000000000000000000000000000000000000000000000000000000001 # xy77 +# XY02 BOOL FALSE +END + +PATTERN.CONTINUITY BOOL TRUE +# PATTERN.CELL BOOL FALSE # by default, do not do any cell pattern correction +# PATTERN.CELL.SUBSET METADATA # List of chips and whether to do cell pattern correction +# XY06 STR 0101000000010000000110000100000000000000000000000000000000000000 +# XY06 BOOL FALSE +# END Index: /branches/czw_branch/20170908/ippconfig/gpc2/format_mef.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/format_mef.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/format_mef.config (revision 40481) @@ -5,5 +5,6 @@ # TELESCOP STR PS1 # DETECTOR STR GPC1 - INSTRUME STR gpc2 +# INSTRUME STR gpc2 + DETECTOR STR gpc2 CONTROLR STR STARGRASP PSFORMAT STR MEF Index: /branches/czw_branch/20170908/ippconfig/gpc2/ppImage.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/ppImage.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/ppImage.config (revision 40481) @@ -1,3 +1,3 @@ - +BACKGROUND BOOL FALSE # binned output image options BIN1.XBIN S32 16 @@ -641,5 +641,5 @@ DETREND.CONSTRAINTS METADATA DARK METADATA - DETTYPE STR DARK + DETTYPE STR DARK_PREMASK EXPTIME STR FPA.EXPOSURE END @@ -696,5 +696,5 @@ DETREND.CONSTRAINTS METADATA DARK METADATA - DETTYPE STR DARK + DETTYPE STR DARK_PREMASK EXPTIME STR FPA.EXPOSURE END @@ -1688,4 +1688,31 @@ END +# CZW 2018-02-14 +# The default PPIMAGE_N includes BACKGROUND=T, and that breaks detrend construction +PPIMAGE_N METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BACKGROUND BOOL FALSE # Subtract background? +END + + # test recipes # currently : default CHIP recipe @@ -1795,2 +1822,34 @@ END +PPIMAGE_BKGCONT METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels + MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels + BACKGROUND.CONTINUITY BOOL FALSE + PATTERN.CONTINUITY.WIDTH S32 2 +END Index: /branches/czw_branch/20170908/ippconfig/gpc2/ppMerge.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/ppMerge.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/ppMerge.config (revision 40481) @@ -1,5 +1,5 @@ # Mask generation --- already included in default, above PPMERGE_DARKMASK METADATA - ITER S32 3 + ITER S32 1 MASK.SUSPECT.SIGMA F32 8.0 # Threshold for suspect pixels (sigma) MASK.BAD F32 0.1 # Threshold for bad pixels @@ -9,5 +9,5 @@ PPMERGE_FLATMASK METADATA - ITER S32 3 + ITER S32 1 MASK.SUSPECT.SIGMA F32 3.0 # Threshold for suspect pixels (sigma) MASK.BAD F32 0.1 # Threshold for bad pixels (sigma) @@ -27,7 +27,15 @@ # Ordinates for fitting dark current # example for linear in darktime only -DARK.ORDINATES METADATA - CELL.EXPOSURE S32 1 -END +#DARK.ORDINATES METADATA +# CELL.EXPOSURE S32 1 +#END + +DARK.ORDINATES METADATA + CELL.EXPOSURE S32 1 + TEMP METADATA + ORDER S32 1 + RULE STR CHIP.TEMPERATURE * CELL.EXPOSURE + END +END ## Dark for 2010-07-02 with new temp concept. Index: /branches/czw_branch/20170908/ippconfig/gpc2/psastro.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/psastro.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/psastro.config (revision 40481) @@ -113,10 +113,10 @@ # maximum accepted fwhm_major (moved from camera.config -PSASTRO.MAX.ALLOWED.FWHM F32 12 +PSASTRO.MAX.ALLOWED.FWHM F32 100 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below # PSASTRO.CATDIR STR SYNTH.GRIZY # PSASTRO.CATDIR STR PS1.REF.20120503 -PSASTRO.CATDIR STR PS1.REF.20120524 +PSASTRO.CATDIR STR PS1.REF.20170919 @@ -209,5 +209,5 @@ # ghost model file is relative to PATH (eg, ippconfig directory) -GHOST_MODEL STR gpc1/ghost.model.mdc +#GHOST_MODEL STR gpc1/ghost.model.mdc # GHOST_MAX_MAG F32 -20.0 @@ -359,5 +359,5 @@ DEFAULT_RECIPE METADATA # PSASTRO.CATDIR STR PS1.REF.20120503 - PSASTRO.CATDIR STR PS1.REF.20120524 + PSASTRO.CATDIR STR PS1.REF.20170919 ZERO.POINT.USE.MEAN BOOL TRUE END Index: /branches/czw_branch/20170908/ippconfig/gpc2/psphot.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/gpc2/psphot.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/gpc2/psphot.config (revision 40481) @@ -94,4 +94,18 @@ END +SSTF_WS_DIFF METADATA + PSPHOT.EXT.NSIGMA.LIMIT F32 0.0 + PSPHOT.EXT.DIFF.ALTERNATE BOOL TRUE + PSPHOT.EXT.DIFF.ALTERNATE.THRESH F32 1.25 + + PSPHOT.EXT.FIT.ALL.SOURCES BOOL TRUE + PSPHOT.EXT.FIT.ALL.THRESH F32 1000 +# Lower threshold as requested by MOPS + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + TRAIL_RAW EXTENDED_SOURCE_MODEL PS_MODEL_TRAIL 4.75 FALSE + END +END + # Recipe overrides for PR reduction PR METADATA Index: /branches/czw_branch/20170908/ippconfig/hsc/ghost.model.mdc =================================================================== --- /branches/czw_branch/20170908/ippconfig/hsc/ghost.model.mdc (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/hsc/ghost.model.mdc (revision 40481) @@ -1,20 +1,20 @@ - - # The R_TERMS polynomials have been converted from um units to mm units to be consistent with C_TERMS polynomials. GHOST.MODEL.HSC MULTI -GHOST.MODEL.HSC METADATA + GHOST.MODEL.HSC METADATA FILTER STR g @C_TERMS F32 3.86129097e-04 -4.56480396e+02 5.94514717e+02 -8.20984903e+03 4.35455723e+04 -1.19834803e+05 1.60789252e+05 -8.66581086e+04 # a comment @R_TERMS F32 2.80257250e+00 -1.14163334e+01 6.25378363e+02 -6.59305008e+03 3.21678893e+04 -7.68658356e+04 8.71449290e+04 -3.66203193e+04 # a comment + LIMIT F32 12.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -8.66581086e+04 1.60789252e+05 -1.19834803e+05 4.35455723e+04 -8.20984903e+03 5.94514717e+02 -4.56480396e+02 3.86129097e-04 # @R_TERMS F32 -3.66203193e+04 8.71449290e+04 -7.68658356e+04 3.21678893e+04 -6.59305008e+03 6.25378363e+02 -1.14163334e+01 2.80257250e+00 -END -GHOST.MODEL.HSC METADATA + END + GHOST.MODEL.HSC METADATA FILTER STR r @C_TERMS F32 1.10217740e-03 -4.13994264e+02 -1.08162329e+02 -1.75333116e+02 -1.44358813e+03 7.03878935e+03 -1.55470840e+04 1.05167578e+04 # a comment @R_TERMS F32 7.84632263e+00 -1.34007061e-02 9.57272709e+01 -9.45421731e+02 5.64254906e+03 -1.97396910e+04 3.55382290e+04 -2.46004825e+04 # a comment + LIMIT F32 11.5 SCALE F32 3.49794238e-06 # @C_TERMS for original r 8.14947896e+03 -1.24163720e+04 5.41143508e+03 -1.02024286e+03 -2.39667209e+02 -1.00805716e+02 -4.16757016e+02 -1.48799186e-03 @@ -23,9 +23,10 @@ # @C_TERMS F32 1.05167578e+04 -1.55470840e+04 7.03878935e+03 -1.44358813e+03 -1.75333116e+02 -1.08162329e+02 -4.13994264e+02 1.10217740e-03 # @R_TERMS F32 -2.46004825e+04 3.55382290e+04 -1.97396910e+04 5.64254906e+03 -9.45421731e+02 9.57272709e+01 -1.34007061e-02 7.84632263e+00 -END -GHOST.MODEL.HSC METADATA + END + GHOST.MODEL.HSC METADATA FILTER STR i @C_TERMS F32 -3.95203567e-03 -4.55641159e+02 5.73358984e+02 -8.75512267e+03 5.43205903e+04 -1.74052246e+05 2.70933733e+05 -1.66554502e+05 # a comment @R_TERMS F32 2.24351724e+00 -1.59383063e+01 8.56547254e+02 -1.09461298e+04 6.86646484e+04 -2.19342516e+05 3.46712176e+05 -2.15706075e+05 # a comment + LIMIT F32 11.0 SCALE F32 3.49794238e-06 # @C_TERMS for original i 7.09135701e+03 -1.08899009e+04 4.53311864e+03 -7.45070274e+02 -2.86196488e+02 -9.58537252e+01 -4.15997892e+02 -2.10038501e-03 @@ -34,40 +35,44 @@ # @C_TERMS F32 -1.66554502e+05 2.70933733e+05 -1.74052246e+05 5.43205903e+04 -8.75512267e+03 5.73358984e+02 -4.55641159e+02 -3.95203567e-03 # @R_TERMS F32 -2.15706075e+05 3.46712176e+05 -2.19342516e+05 6.86646484e+04 -1.09461298e+04 8.56547254e+02 -1.59383063e+01 2.24351724e+00 -END -GHOST.MODEL.HSC METADATA + END + GHOST.MODEL.HSC METADATA FILTER STR z @C_TERMS F32 -1.79546522e-03 -4.13201008e+02 -1.08898155e+02 -1.51535018e+02 -1.51139264e+03 6.94362981e+03 -1.47396976e+04 9.59579373e+03 # a comment @R_TERMS F32 7.39449641e+00 7.28959803e-01 1.06569049e+02 -1.18036333e+03 7.42160510e+03 -2.62797780e+04 4.70124953e+04 -3.23514338e+04 # a comment + LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 9.59579373e+03 -1.47396976e+04 6.94362981e+03 -1.51139264e+03 -1.51535018e+02 -1.08898155e+02 -4.13201008e+02 -1.79546522e-03 # @R_TERMS F32 -3.23514338e+04 4.70124953e+04 -2.62797780e+04 7.42160510e+03 -1.18036333e+03 1.06569049e+02 7.28959803e-01 7.39449641e+00 -END -GHOST.MODEL.HSC METADATA + END + GHOST.MODEL.HSC METADATA FILTER STR y @C_TERMS F32 -2.04774887e-03 -4.50571358e+02 3.73884700e+02 -6.38727141e+03 4.28067607e+04 -1.47306815e+05 2.42465240e+05 -1.56137979e+05 # a comment @R_TERMS F32 2.04967838e+00 -8.92675213e+00 6.03954493e+02 -7.97354793e+03 5.32635002e+04 -1.79071587e+05 2.94475198e+05 -1.88924528e+05 # a comment + LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -1.56137979e+05 2.42465240e+05 -1.47306815e+05 4.28067607e+04 -6.38727141e+03 3.73884700e+02 -4.50571358e+02 -2.04774887e-03 # @R_TERMS F32 -1.88924528e+05 2.94475198e+05 -1.79071587e+05 5.32635002e+04 -7.97354793e+03 6.03954493e+02 -8.92675213e+00 2.04967838e+00 -END -GHOST.MODEL.HSC METADATA + END + GHOST.MODEL.HSC METADATA FILTER STR NB816 @C_TERMS F32 -3.52735759e-03 -4.54174618e+02 5.11013724e+02 -8.05597593e+03 5.11417991e+04 -1.67422366e+05 2.65225596e+05 -1.65501517e+05 # a comment @R_TERMS F32 2.17954931e+00 -1.39611991e+01 7.88077371e+02 -1.01750660e+04 6.49121728e+04 -2.10323885e+05 3.36261570e+05 -2.11111649e+05 # a comment + LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -1.65501517e+05 2.65225596e+05 -1.67422366e+05 5.11417991e+04 -8.05597593e+03 5.11013724e+02 -4.54174618e+02 -3.52735759e-03 # @R_TERMS F32 -2.11111649e+05 3.36261570e+05 -2.10323885e+05 6.49121728e+04 -1.01750660e+04 7.88077371e+02 -1.39611991e+01 2.17954931e+00 -END -GHOST.MODEL.HSC METADATA + END + GHOST.MODEL.HSC METADATA FILTER STR NB921 @C_TERMS F32 -2.99761113e-03 -4.52301392e+02 4.49346634e+02 -7.38661211e+03 4.83455130e+04 -1.62550708e+05 2.63017929e+05 -1.66995347e+05 # a comment @R_TERMS F32 2.11290612e+00 -1.15228777e+01 7.02729746e+02 -9.20923423e+03 6.01493518e+04 -1.98625679e+05 3.22255104e+05 -2.04640222e+05 # a comment + LIMIT F32 11.0 SCALE F32 3.49794238e-06 # WRONG ORDER # @C_TERMS F32 -1.66995347e+05 2.63017929e+05 -1.62550708e+05 4.83455130e+04 -7.38661211e+03 4.49346634e+02 -4.52301392e+02 -2.99761113e-03 # @R_TERMS F32 -2.04640222e+05 3.22255104e+05 -1.98625679e+05 6.01493518e+04 -9.20923423e+03 7.02729746e+02 -1.15228777e+01 2.11290612e+00 + END END - Index: /branches/czw_branch/20170908/ippconfig/hsc/psastro.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/hsc/psastro.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/hsc/psastro.config (revision 40481) @@ -294,2 +294,46 @@ END + +M31_SHALLOW METADATA + PSASTRO.GRID.SCALE F32 100 + PSASTRO.PIXEL.SCALE F32 5.9 + + PSASTRO.GRID.MAX.INST.MAG.RAW F32 -8 + + # single-chip radius match in pixels + PSASTRO.MATCH.RADIUS.N0 F32 10 + PSASTRO.MATCH.RADIUS.N1 F32 5 + PSASTRO.MATCH.RADIUS.N2 F32 5 + PSASTRO.MATCH.RADIUS.N3 F32 3 + PSASTRO.MATCH.RADIUS.N4 F32 3 + PSASTRO.MATCH.RADIUS.N5 F32 2 # was 5 + PSASTRO.MATCH.RADIUS.N6 F32 1 + PSASTRO.MATCH.RADIUS.N7 F32 0 + PSASTRO.MATCH.FIT.NITER S32 6 # was 7 +END + +M31_DEEP METADATA + PSASTRO.GRID.SCALE F32 100 + PSASTRO.PIXEL.SCALE F32 5.9 + + PSASTRO.GRID.MAX.INST.MAG.RAW F32 -10.5 + + # single-chip radius match in pixels + PSASTRO.MATCH.RADIUS.N0 F32 10 + PSASTRO.MATCH.RADIUS.N1 F32 5 + PSASTRO.MATCH.RADIUS.N2 F32 5 + PSASTRO.MATCH.RADIUS.N3 F32 3 + PSASTRO.MATCH.RADIUS.N4 F32 3 + PSASTRO.MATCH.RADIUS.N5 F32 2 # was 5 + PSASTRO.MATCH.RADIUS.N6 F32 1 + PSASTRO.MATCH.RADIUS.N7 F32 0 + PSASTRO.MATCH.FIT.NITER S32 6 # was 7 + + # XXX REMOVE later + PSASTRO.GRID.MIN.ANGLE F32 0.0 # start angle (degrees) + PSASTRO.GRID.MAX.ANGLE F32 0.1 + PSASTRO.GRID.MIN.SCALE F32 1.00 + PSASTRO.GRID.MAX.SCALE F32 1.01 + +END + Index: /branches/czw_branch/20170908/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/czw_branch/20170908/ippconfig/recipes/filerules-split.mdc (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/recipes/filerules-split.mdc (revision 40481) @@ -309,7 +309,7 @@ SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE -PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE -PPSUB.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE NONE FPA TRUE NONE +PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_SUB FPA TRUE NONE +PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE +PPSUB.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT FPA TRUE NONE PPSUB.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE PPSUB.OUTPUT.KERNELS OUTPUT {OUTPUT}.subkernel SUBKERNEL NONE FPA TRUE NONE @@ -317,7 +317,7 @@ PPSUB.OUTPUT.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE PPSUB.OUTPUT.RESID.JPEG OUTPUT {OUTPUT}.res.jpg JPEG NONE FPA TRUE NONE -PPSUB.INVERSE OUTPUT {OUTPUT}.inv.fits IMAGE NONE FPA TRUE NONE -PPSUB.INVERSE.MASK OUTPUT {OUTPUT}.inv.mask.fits MASK NONE FPA TRUE NONE -PPSUB.INVERSE.VARIANCE OUTPUT {OUTPUT}.inv.wt.fits VARIANCE NONE FPA TRUE NONE +PPSUB.INVERSE OUTPUT {OUTPUT}.inv.fits IMAGE COMP_SUB FPA TRUE NONE +PPSUB.INVERSE.MASK OUTPUT {OUTPUT}.inv.mask.fits MASK COMP_MASK FPA TRUE NONE +PPSUB.INVERSE.VARIANCE OUTPUT {OUTPUT}.inv.wt.fits VARIANCE COMP_WT FPA TRUE NONE PPSUB.INVERSE.SOURCES OUTPUT {OUTPUT}.inv.cmf CMF NONE FPA TRUE NONE PPSUB.CONFIG OUTPUT {OUTPUT}.ppSub.mdc TEXT NONE FPA TRUE NONE Index: /branches/czw_branch/20170908/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/recipes/nightly_science.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/recipes/nightly_science.config (revision 40481) @@ -8,10 +8,10 @@ MODE STR WARP COMMAND STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ - RETENTION_TIME U16 3 + RETENTION_TIME U16 -1 END CLEAN_MODES METADATA MODE STR DIFF COMMAND STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ - RETENTION_TIME S16 2 + RETENTION_TIME S16 3 END CLEAN_MODES METADATA @@ -47,10 +47,10 @@ FILTERS MULTI -FILTERS STR g.00000 -FILTERS STR r.00000 -FILTERS STR i.00000 -FILTERS STR z.00000 -FILTERS STR y.00000 -FILTERS STR w.00000 +FILTERS STR g.00002 +FILTERS STR r.00002 +FILTERS STR i.00002 +FILTERS STR z.00002 +FILTERS STR y.00002 +FILTERS STR w.00002 UNRECOVERABLE_QUALITY MULTI @@ -67,4 +67,5 @@ END +# 2018-04-30 CZW: Comment out all targets to allow commissioning training and tests to skip processing. TARGETS MULTI TARGETS METADATA @@ -120,5 +121,4 @@ REDUCTION STR SWEETSPOT CHIP S16 5 - WARP S16 300 DIFF S16 300 END @@ -133,8 +133,16 @@ DESPERATE_DIFFS BOOL TRUE COMMENT STR %3PI% -# CHIP S16 7 -# DIFF S16 7 -# CHIP S16 10 -# DIFF S16 12 +END +TARGETS METADATA + NAME STR Bright + DISTRIBUTION STR NODIST + TESS STR RINGS.V3 + OBSMODE STR BRIGHT + STACKABLE BOOL FALSE + DIFFABLE BOOL FALSE + OFFNIGHT_DIFFS BOOL FALSE + DESPERATE_DIFFS BOOL FALSE + COMMENT STR Euclid% + DIFF S16 7 END TARGETS METADATA @@ -149,5 +157,4 @@ OFFNIGHT_DIFFS BOOL FALSE REDUCTION STR MD_DEFAULT -# DIST S16 30 END TARGETS METADATA @@ -163,7 +170,4 @@ ## change days till cleanup DIST S16 20 - CHIP S16 2 - WARP S16 2 - DIFF S16 2 END TARGETS METADATA @@ -178,6 +182,4 @@ COMMENT STR ICECUBE% DIST S16 15 - CHIP S16 5 - WARP S16 300 DIFF S16 300 END @@ -194,11 +196,9 @@ COMMENT STR G%.R%.P% DIST S16 15 - CHIP S16 5 - WARP S16 300 DIFF S16 300 END TARGETS METADATA NAME STR K2 - DISTRIBUTION STR NODIST + DISTRIBUTION STR K2 TESS STR RINGS.V3 OBSMODE STR K2 @@ -208,8 +208,6 @@ # REDUCTION STR SWEETSPOT COMMENT STR K2% - DIST S16 15 - CHIP S16 5 - WARP S16 300 - DIFF S16 300 + DIST S16 30 + DIFF S16 10 END TARGETS METADATA @@ -225,5 +223,4 @@ DIST S16 300 CHIP S16 300 - WARP S16 300 DIFF S16 300 END @@ -467,6 +464,6 @@ END -# This is a hack, and I freely admit it. -# Removed the rest because we do not regularly run microtests. +#This is a hack, and I freely admit it. +#Removed the rest because we do not regularly run microtests. # TARGETS METADATA # NAME STR microtestMD01 Index: /branches/czw_branch/20170908/ippconfig/recipes/psastro.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/recipes/psastro.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/recipes/psastro.config (revision 40481) @@ -345,2 +345,8 @@ GLINT_TEST METADATA END + +M31_SHALLOW METADATA +END + +M31_DEEP METADATA +END Index: /branches/czw_branch/20170908/ippconfig/recipes/psphot.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/recipes/psphot.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/recipes/psphot.config (revision 40481) @@ -771,4 +771,25 @@ END +SSTF_WS_DIFF METADATA + PEAKS_NSIGMA_LIMIT_2 F32 3.5 # peak significance threshold -- MOPS would like to see 4.0->3.5 since ppMops fixed + DIFF_STATS BOOL TRUE # Calculate diff-specific stats + OUTPUT.FORMAT STR PS1_DV5 # Format of output file + + PSF_FIT_MODEL_SUM_FRAC_CUT F32 0.5 + PSF_FIT_MASKED_SUM_FRAC_CUT F32 0.1 + + # Extended source fit parameters + # these models are used for high-quality shape analysis after all sources have been removed + EXTENDED_SOURCE_FITS BOOL TRUE # perform the detailed extended sourc fits? + EXT_MODEL STR PS_MODEL_TRAIL + + # extended source models applied to sources + EXTENDED_SOURCE_MODELS METADATA + TYPE EXTENDED_SOURCE_MODEL MODEL SNLIM PSF_CONVOLVED + TRAIL_RAW EXTENDED_SOURCE_MODEL PS_MODEL_TRAIL 10.0 FALSE + END +END + + # Recipe overrides for PR reduction PR METADATA @@ -838,2 +859,7 @@ OUTPUT.FORMAT STR PS1_V5 END + +CHIP_SHALLOW METADATA + PEAKS_NSIGMA_LIMIT F32 25.0 # peak significance threshold + PEAKS_NSIGMA_LIMIT_2 F32 15.0 # peak significance threshold +END Index: /branches/czw_branch/20170908/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/czw_branch/20170908/ippconfig/recipes/reductionClasses.mdc (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/recipes/reductionClasses.mdc (revision 40481) @@ -469,5 +469,5 @@ STACK_PSPHOT STR STACK DIFF_PPSUB STR WARPSTACK - DIFF_PSPHOT STR SSTF_DIFF + DIFF_PSPHOT STR SSTF_WS_DIFF JPEG_BIN1 STR PPIMAGE_J1 JPEG_BIN2 STR PPIMAGE_J2 @@ -1434,4 +1434,28 @@ END +M31_HSC_DEEP METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR M31_DEEP + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + M31_BG_SUBTRACT METADATA CHIP_PPIMAGE STR CHIP_AUXMASK @@ -1478,4 +1502,28 @@ BACKGROUND_PPBACKGROUND STR BACKGROUND BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + +BG_PRESERVE_SHALLOW METADATA + CHIP_PPIMAGE STR CHIP_PRESERVE_BG + CHIP_PSPHOT STR CHIP_SHALLOW + WARP_PSWARP STR WARP + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND PSVIDEOPHOT STR PSVIDEOPHOT STATICSKY_CALIBRATION STR STATICSKY_CAL Index: /branches/czw_branch/20170908/ippconfig/system.config =================================================================== --- /branches/czw_branch/20170908/ippconfig/system.config (revision 40480) +++ /branches/czw_branch/20170908/ippconfig/system.config (revision 40481) @@ -67,4 +67,4 @@ PSVIDEOPHOT STR recipes/psvideophot.config # video cell photometry PSTAMP STR recipes/pstamp.config # postage stamp server - REMOTE STR recipes/remote_hosts.config # Remote supercomputer processing +# REMOTE STR recipes/remote_hosts.config # Remote supercomputer processing END