Index: /branches/eam_branches/ipp-20130711/ippconfig/gpc1/format_orig.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/gpc1/format_orig.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/gpc1/format_orig.config (revision 36074) @@ -8,4 +8,5 @@ CONTROLR STR STARGRASP NAMPS S32 64 + MJD-OBS F64 54734.0 # OP: < END Index: /branches/eam_branches/ipp-20130711/ippconfig/gpc1/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/gpc1/ppImage.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/gpc1/ppImage.config (revision 36074) @@ -186,5 +186,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -216,5 +216,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -247,5 +247,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? DETREND.CONSTRAINTS METADATA @@ -304,5 +304,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? DETREND.CONSTRAINTS METADATA @@ -357,5 +357,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -389,5 +389,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -417,5 +417,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? TILTYSTREAK.APPLY BOOL TRUE # apply the 'tiltystreak' tool NOISEMAP BOOL TRUE # Apply read noise map @@ -447,5 +447,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? TILTYSTREAK.APPLY BOOL FALSE # apply the 'tiltystreak' tool NOISEMAP BOOL TRUE # Apply read noise map @@ -1141,5 +1141,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL FALSE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? DETREND.CONSTRAINTS METADATA @@ -1196,5 +1196,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL FALSE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1224,5 +1224,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL FALSE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1257,5 +1257,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? NO.COMPRESS BOOL TRUE # turn off image compression END @@ -1291,5 +1291,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL FALSE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1323,5 +1323,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1357,5 +1357,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL FALSE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? NO.COMPRESS BOOL TRUE # turn off image compression END @@ -1389,5 +1389,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1417,5 +1417,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? PATTERN.ROW BOOL TRUE # Subtract pattern noise PATTERN.CELL BOOL FALSE # Subtract pattern noise @@ -1513,5 +1513,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1544,5 +1544,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -1575,5 +1575,5 @@ ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? BACKGROUND BOOL TRUE # Subtract background? - CROSSTALK.MEASURE BOOL TRUE # Subtract model background? -END - + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? +END + Index: /branches/eam_branches/ipp-20130711/ippconfig/gpc1/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/gpc1/ppStack.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/gpc1/ppStack.config (revision 36074) @@ -63,4 +63,5 @@ PSF.INPUT.THRESH F32 10.0 PSF.INPUT.ASYMMETRY F32 0.2 + PSF.TARGET.AS.MAX BOOL TRUE MATCH.REJ F32 4.0 SAFE BOOL F @@ -124,4 +125,60 @@ END +STACK_NIGHTLY_1DG METADATA # Typically MD 8 input nightly stacks and using 1DG convolution + OUTPUT.NOCOMP BOOL FALSE + OUTPUT.LOGFLUX BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 +END + +STACK_MD_REF_1DG METADATA ## revised config for MD refstacks vs PS1_REFERENCE above after ppStack mods 5/03/13 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK ## needed? + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack + PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set even smaller?) + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE # Set the target PSF FWHM as the maximum of accepted input FWHM values. + PSF.TARGET.AS.MAX.EPSILON F32 0.1 # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input) +END + +STACK_MD_DEEP_1DG METADATA ## revised config for MD deepstack above after ppStack mods 5/03/13 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 10.0 + PSF.INPUT.CLIP.NSIGMA F32 100.0 + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 +END + +STACK_ALLDEEP_1DG METADATA # no cuts, everything in changes after ppStack mods 5/03/13 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 100.0 + PSF.INPUT.CLIP.NSIGMA F32 100.0 + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 +END + + # Recipe overrides for STACK STACKPHOT METADATA Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-mef.mdc (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-mef.mdc (revision 36074) @@ -153,4 +153,5 @@ PPSKYCELL.IMAGE INPUT @FILES CHIP IMAGE PPSKYCELL.MASK INPUT @FILES CHIP MASK +PPSKYCELL.WCSREF INPUT @FILES CHIP IMAGE PPSIM.INPUT INPUT @FILES FPA IMAGE Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-simple.mdc (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-simple.mdc (revision 36074) @@ -123,4 +123,5 @@ PPSKYCELL.IMAGE INPUT @FILES CHIP IMAGE PPSKYCELL.MASK INPUT @FILES CHIP MASK +PPSKYCELL.WCSREF INPUT @FILES CHIP IMAGE PPSIM.INPUT INPUT @FILES FPA IMAGE @@ -317,5 +318,5 @@ PPSTAMP.OUTPUT.VARIANCE.NOCOMP OUTPUT {OUTPUT}.wt.fits VARIANCE NONE FPA TRUE NONE PPSTAMP.OUTPUT.JPEG OUTPUT {OUTPUT}.jpg JPEG NONE FPA TRUE NONE -PPSTAMP.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF +PPSTAMP.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE NONE PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-split.mdc (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/filerules-split.mdc (revision 36074) @@ -143,4 +143,5 @@ PPSKYCELL.IMAGE INPUT @FILES CHIP IMAGE PPSKYCELL.MASK INPUT @FILES CHIP MASK +PPSKYCELL.WCSREF INPUT @FILES CHIP IMAGE PPSIM.INPUT INPUT @FILES CHIP IMAGE @@ -330,4 +331,5 @@ PPSTACK.OUTPUT.EXP OUTPUT {OUTPUT}.exp.fits IMAGE EXP FPA TRUE NONE +PPSTACK.OUTPUT.EXP.NOCOMP OUTPUT {OUTPUT}.exp.fits IMAGE NONE FPA TRUE NONE PPSTACK.OUTPUT.EXPNUM OUTPUT {OUTPUT}.num.fits MASK EXPNUM FPA TRUE NONE PPSTACK.OUTPUT.EXPWT.COMP OUTPUT {OUTPUT}.expwt.fits VARIANCE EXP FPA TRUE NONE @@ -340,4 +342,5 @@ PPSTACK.UNCONV.VARIANCE.NOCOMP OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE NONE FPA TRUE NONE PPSTACK.UNCONV.EXP OUTPUT {OUTPUT}.unconv.exp.fits IMAGE EXP FPA TRUE NONE +PPSTACK.UNCONV.EXP.NOCOMP OUTPUT {OUTPUT}.unconv.exp.fits IMAGE NONE FPA TRUE NONE PPSTACK.UNCONV.EXPNUM OUTPUT {OUTPUT}.unconv.num.fits MASK EXPNUM FPA TRUE NONE PPSTACK.UNCONV.EXPWT.COMP OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE EXP FPA TRUE NONE Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/nightly_science.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/nightly_science.config (revision 36074) @@ -3,5 +3,5 @@ MODE STR CHIP COMMAND STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ - RETENTION_TIME U16 21 + RETENTION_TIME U16 7 END CLEAN_MODES METADATA @@ -14,5 +14,5 @@ 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 21 + RETENTION_TIME S16 7 END CLEAN_MODES METADATA @@ -238,5 +238,5 @@ TESS STR RINGS.V3 OBSMODE STR OSS - STACKABLE BOOL TRUE + STACKABLE BOOL FALSE DIFFABLE BOOL TRUE REDUCTION STR SWEETSPOT @@ -249,5 +249,5 @@ TESS STR RINGS.V3 OBSMODE STR ESS - STACKABLE BOOL TRUE + STACKABLE BOOL FALSE DIFFABLE BOOL TRUE REDUCTION STR SWEETSPOT @@ -260,5 +260,5 @@ TESS STR RINGS.V3 OBSMODE STR MSS - STACKABLE BOOL TRUE + STACKABLE BOOL FALSE DIFFABLE BOOL TRUE REDUCTION STR SWEETSPOT Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/ppStack.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/ppStack.config (revision 36074) @@ -95,4 +95,7 @@ PSF.INPUT.THRESH F32 NAN # Set minimum limit below which we do not exclude an input (defaults to 0.0) PSF.INPUT.ASYMMETRY F32 NAN # Set difference in mixture model populations to consider equal. +PSF.TARGET.AS.MAX BOOL F # Set the target PSF FWHM as the maximum of accepted input FWHM values. +PSF.TARGET.AS.MAX.EPSILON F32 0.1 # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input) + TEMP.IMAGE STR conv.im.fits # Suffix for temporary convolved images @@ -173,4 +176,16 @@ END +STACK_MD_REF_1DG METADATA +END + +STACK_MD_DEEP_1DG METADATA +END + +STACK_ALLDEEP_1DG METADATA +END + +STACK_NIGHTLY_1DG METADATA + STACK.TYPE STR NIGHTLY_STACK +END Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/ppSub.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/ppSub.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/ppSub.config (revision 36074) @@ -55,6 +55,6 @@ RINGS.ORDER S32 2 # Polynomial order for RINGS kernels PENALTY F32 1.0 # 4.0e-6 for the updated code from 2010.09.19 -BIN1 S32 4 # Binning factor for first level -BIN2 S32 4 # Binning factor for second level +BIN1 S32 16 # Binning factor for first level +BIN2 S32 16 # Binning factor for second level OPTIMUM BOOL FALSE # Derive optimum parameters for ISIS and GUNK kernels Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/psphot.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/psphot.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/psphot.config (revision 36074) @@ -439,4 +439,7 @@ POISSON.ERRORS.PHOT.LMM BOOL TRUE + LMM_FIT_CHISQ_CONVERGENCE BOOL FALSE # use the (old) chisq convergence or the new parameter one + LMM_FIT_GAIN_FACTOR_MODE S32 2 # there are 3 options to determine the gain factor (0,1,2) + EXT_FIT_MAX_RADIUS F32 50.0 PSF_MODEL STR PS_MODEL_PS1_V1 Index: /branches/eam_branches/ipp-20130711/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/recipes/reductionClasses.mdc (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/recipes/reductionClasses.mdc (revision 36074) @@ -577,4 +577,12 @@ END +NIGHTLY_STACK_1DG METADATA + STACK_PPSTACK STR STACK_NIGHTLY_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_NIGHTCAL +END + # deep stacks DEEP_STACK METADATA @@ -614,4 +622,15 @@ END +MD_REF_STACK_1DG METADATA + STACK_PPSTACK STR STACK_MD_REF_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL +END + ## MD deepstack MD_DEEP_STACK METADATA @@ -623,4 +642,16 @@ END +MD_DEEP_STACK_1DG METADATA + STACK_PPSTACK STR STACK_MD_DEEP_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT_1DG + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL +END + + # quick stacks QUICKSTACK METADATA @@ -645,4 +676,14 @@ STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL END + +ALLDEEP_STACK_1DG METADATA + STACK_PPSTACK STR STACK_ALLDEEP_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL +END + + TESTSTACK METADATA Index: /branches/eam_branches/ipp-20130711/ippconfig/system.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/system.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/system.config (revision 36074) @@ -12,4 +12,5 @@ GPC1 STR gpc1/camera.config # Pan-STARRS GPC1 GPC1-TDI STR gpc1-tdi/camera.config # Pan-STARRS GPC1 with TDI guiding + TC3 STR tc3/camera.config # Pan-STARRS Test Camera III ESOWFI STR esowfi/camera.config # ESO Wide-Field Imager LBCRED STR lbc_red/camera.config # Large Binocular Camera Red @@ -27,5 +28,4 @@ # UCAM STR ucam/camera.config # LRIS_BLUE STR lris_blue/camera.config -# TC3 STR tc3/camera.config # Pan-STARRS Test Camera III # LRIS_RED STR lris_red/camera.config Index: /branches/eam_branches/ipp-20130711/ippconfig/tc3/Makefile.am =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/tc3/Makefile.am (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/tc3/Makefile.am (revision 36074) @@ -6,4 +6,5 @@ camera.config \ format.config \ + format_ps2.config \ ppImage.config Index: /branches/eam_branches/ipp-20130711/ippconfig/tc3/camera.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/tc3/camera.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/tc3/camera.config (revision 36074) @@ -4,4 +4,5 @@ FORMATS METADATA RAW STR tc3/format.config + PS2 STR tc3/format_ps2.config END @@ -16,4 +17,21 @@ CCID45-1-05A 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 CCID45-1-19A 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 + + 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 + XY03 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 + XY12 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 + XY13 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 + XY20 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 + XY21 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 + XY22 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 + XY23 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 + XY30 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 + XY31 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 + XY32 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 + XY33 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 Index: /branches/eam_branches/ipp-20130711/ippconfig/tc3/format.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/tc3/format.config (revision 36073) +++ /branches/eam_branches/ipp-20130711/ippconfig/tc3/format.config (revision 36074) @@ -6,4 +6,5 @@ ORIGIN STR PS1 CONTROLR STR STARGRASP + INSTRUME STR tc3 EXTEND BOOL T END Index: /branches/eam_branches/ipp-20130711/ippconfig/tc3/format_ps2.config =================================================================== --- /branches/eam_branches/ipp-20130711/ippconfig/tc3/format_ps2.config (revision 36074) +++ /branches/eam_branches/ipp-20130711/ippconfig/tc3/format_ps2.config (revision 36074) @@ -0,0 +1,315 @@ +# Camera format configuration for Pan-STARRS Test Camera 3 + +# How to recognise this type +RULE METADATA +# IMAGESWV STR GPC DaqCom v2.05 (Mar 08 2007) + ORIGIN STR PS2 + CONTROLR STR STARGRASP + INSTRUME STR tc3 + EXTEND BOOL T +END + +FILE METADATA + # How to read this data + PHU STR CHIP # The FITS file represents a chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.OBS STR OBSTYPE # A PHU keyword for unique identifier + CONTENT STR DETECTOR # How to determine content of FITS file + CONTENT.RULE STR {CHIP.NAME} # How to derive the CONTENT when writing +END + +# What's in the FITS file? +CONTENTS METADATA + # File identifier with corresponding file layout name + CCID58-1-09a2 STR XY00:CCD_10u + CCID58-1-18a1 STR XY01:CCD_10u + CCID58-2-18b2 STR XY02:CCD_10u + CCID58-2-16a2 STR XY03:CCD_10u + CCID58-2-17a2 STR XY10:CCD_10u + CCID58-2-16a1 STR XY11:CCD_10u + CCID58-2-10b2 STR XY12:CCD_10u + CCID58-1-12a1 STR XY13:CCD_10u + CCID58-2-07a2 STR XY20:CCD_10u + CCID58-2-07a1 STR XY21:CCD_10u + CCID58-1-06b2 STR XY22:CCD_10u + CCID58-2-14a1 STR XY23:CCD_10u + CCID58-1-13a1 STR XY30:CCD_10u + CCID58-3-14a2 STR XY31:CCD_10u + CCID58-1-04b2 STR XY32:CCD_10u + CCID58-1-14a2 STR XY33:CCD_10u +END + +# Specify the layout +CHIPS METADATA + CCD_10u METADATA + # Extension name, cellName:cellType + xy00 STR xy00:pitch10u + xy01 STR xy01:pitch10u + xy02 STR xy02:pitch10u + xy03 STR xy03:pitch10u + xy04 STR xy04:pitch10u + xy05 STR xy05:pitch10u + xy06 STR xy06:pitch10u + xy07 STR xy07:pitch10u + xy10 STR xy10:pitch10u + xy11 STR xy11:pitch10u + xy12 STR xy12:pitch10u + xy13 STR xy13:pitch10u + xy14 STR xy14:pitch10u + xy15 STR xy15:pitch10u + xy16 STR xy16:pitch10u + xy17 STR xy17:pitch10u + xy20 STR xy20:pitch10u + xy21 STR xy21:pitch10u + xy22 STR xy22:pitch10u + xy23 STR xy23:pitch10u + xy24 STR xy24:pitch10u + xy25 STR xy25:pitch10u + xy26 STR xy26:pitch10u + xy27 STR xy27:pitch10u + xy30 STR xy30:pitch10u + xy31 STR xy31:pitch10u + xy32 STR xy32:pitch10u + xy33 STR xy33:pitch10u + xy34 STR xy34:pitch10u + xy35 STR xy35:pitch10u + xy36 STR xy36:pitch10u + xy37 STR xy37:pitch10u + xy40 STR xy40:pitch10u + xy41 STR xy41:pitch10u + xy42 STR xy42:pitch10u + xy43 STR xy43:pitch10u + xy44 STR xy44:pitch10u + xy45 STR xy45:pitch10u + xy46 STR xy46:pitch10u + xy47 STR xy47:pitch10u + xy50 STR xy50:pitch10u + xy51 STR xy51:pitch10u + xy52 STR xy52:pitch10u + xy53 STR xy53:pitch10u + xy54 STR xy54:pitch10u + xy55 STR xy55:pitch10u + xy56 STR xy56:pitch10u + xy57 STR xy57:pitch10u + xy60 STR xy60:pitch10u + xy61 STR xy61:pitch10u + xy62 STR xy62:pitch10u + xy63 STR xy63:pitch10u + xy64 STR xy64:pitch10u + xy65 STR xy65:pitch10u + xy66 STR xy66:pitch10u + xy67 STR xy67:pitch10u + xy70 STR xy70:pitch10u + xy71 STR xy71:pitch10u + xy72 STR xy72:pitch10u + xy73 STR xy73:pitch10u + xy74 STR xy74:pitch10u + xy75 STR xy75:pitch10u + xy76 STR xy76:pitch10u + xy77 STR xy77:pitch10u + END +END + +# Specify the cell data +CELLS METADATA + pitch10u METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.FILTERID STR FILTERID + FPA.FILTER STR FILTERID + 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.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time + 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.PON.TIME STR PONTIME +# FPA.TELESCOPE STR TELESCOP -- hardwired for format +# FPA.INSTRUMENT STR INSTRUME -- hardwired for format +# FPA.DETECTOR STR DETECTOR -- hardwired for format + + FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + FPA.TELTEMP.M1CELL STR TELTEMMS # Primary mirror support temps (C) + 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.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 + CHIP.TEMPERATURE STR DETTEM + CHIP.VIDEOCELL STR CELLMODE + + CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter + CELL.DARKTIME STR DARKTIME # Exposure time for camera + CELL.TIME STR SHUTOUTC # Observation time + # XXX CELL.GAIN STR GAIN # Cell gain (e/ADU) + CELL.READNOISE STR RDNOISE # Cell read noise (ADU) + # XXX 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 TC3 + FPA.LONGITUDE STR 10:25:01.417 # West Longitude in Hours 10.4170608521 XXX need to fix... + FPA.LATITUDE STR 20:42:25.558 # North Latitude in Degrees 20.7070999146 XXX need to fix... + FPA.ELEVATION F32 3048.0 # altitude in meters XXX need to fix... + FPA.DETECTOR STR TC3 + FPA.TIMESYS STR UTC + + CHIP.XSIZE S32 4846 + CHIP.YSIZE S32 4868 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + + CELL.TIMESYS STR UTC + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + + # XXX these should come from the header, but not for now + CELL.GAIN F32 1.0 # Cell gain (e/ADU) + CELL.SATURATION F32 40000 # Saturation point (ADU) + + ### How to get FPA coordinates from chip coordinates + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + XY00 S32 4971 + XY01 S32 4971 + XY02 S32 4971 + XY03 S32 4971 + XY10 S32 9942 + XY11 S32 9942 + XY12 S32 9942 + XY13 S32 9942 + XY20 S32 14913 + XY21 S32 14913 + XY22 S32 14913 + XY23 S32 14913 + XY30 S32 19884 + XY31 S32 19884 + XY32 S32 19884 + XY33 S32 19884 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + XY00 S32 5143 + XY01 S32 10286 + XY02 S32 15429 + XY03 S32 20572 + XY10 S32 5143 + XY11 S32 10286 + XY12 S32 15429 + XY13 S32 20572 + XY20 S32 5143 + XY21 S32 10286 + XY22 S32 15429 + XY23 S32 20572 + XY30 S32 5143 + XY31 S32 10286 + XY32 S32 15429 + XY33 S32 20572 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + XY00 S32 -1 + XY01 S32 -1 + XY02 S32 -1 + XY03 S32 -1 + XY10 S32 -1 + XY11 S32 -1 + XY12 S32 -1 + XY13 S32 -1 + XY20 S32 -1 + XY21 S32 -1 + XY22 S32 -1 + XY23 S32 -1 + XY30 S32 -1 + XY31 S32 -1 + XY32 S32 -1 + XY33 S32 -1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.LONGITUDE STR HOURS + FPA.LATITUDE STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD + CELL.BINNING STR TOGETHER + CELL.READNOISE STR ADU +END +