Index: /tags/ipp-ps1-20210510/ippconfig/gpc1/psphot.config =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/gpc1/psphot.config (revision 41699) +++ /tags/ipp-ps1-20210510/ippconfig/gpc1/psphot.config (revision 41700) @@ -117,2 +117,8 @@ CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE END + +SWEETSPOT_DENSE METADATA + PEAKS_NSIGMA_LIMIT F32 200.0 # peak significance threshold + PEAKS_NSIGMA_LIMIT_2 F32 100.0 # peak significance threshold + FULL_FIT_SN_LIM F32 200.0 +END Index: /tags/ipp-ps1-20210510/ippconfig/gpc2/format_mef.config =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/gpc2/format_mef.config (revision 41699) +++ /tags/ipp-ps1-20210510/ippconfig/gpc2/format_mef.config (revision 41700) @@ -3,7 +3,4 @@ # How to identify this type RULE METADATA -# TELESCOP STR PS1 -# DETECTOR STR GPC1 -# INSTRUME STR gpc2 DETECTOR STR gpc2 # having this forces / allows asm files to be correctly loaded? CONTROLR STR STARGRASP @@ -20,65 +17,69 @@ # What's in the FITS file? CONTENTS METADATA - # CONTENT = chip name : type - CCID58-2-15a1 STR XY01:GPCChip - CCID58-2-18a1 STR XY02:GPCChip - CCID58-1-13a1 STR XY03:GPCChip - CCID58-1-09a1 STR XY04:GPCChip - CCID58-2-16b1 STR XY05:GPCChip - CCID58-2-09b1 STR XY06:GPCChip - CCID58-2-22a1 STR XY10:GPCChip - CCID58-2-13a2 STR XY11:GPCChip - CCID58-1-17a2 STR XY12:GPCChip - CCID58-1-14a2 STR XY13:GPCChip - CCID58-1-09a2 STR XY14:GPCChip - CCID58-2-13b1 STR XY15:GPCChip - CCID58-1-09b1 STR XY16:GPCChip - CCID58-2-10b2 STR XY17:GPCChip - CCID58-1-19a1 STR XY20:GPCChip - CCID58-1-04a1 STR XY21:GPCChip - CCID58-2-09a2 STR XY22:GPCChip - CCID58-1-02a1 STR XY23:GPCChip - CCID58-1-04a2 STR XY24:GPCChip - CCID58-1-01b1 STR XY25:GPCChip - CCID58-2-07b2 STR XY26:GPCChip - CCID58-1-18b1 STR XY27:GPCChip - CCID58-1-12a1 STR XY30:GPCChip - CCID58-2-01a1 STR XY31:GPCChip - CCID58-2-01a2 STR XY32:GPCChip - CCID58-1-02a2 STR XY33:GPCChip - CCID58-2-04a1 STR XY34:GPCChip - CCID58-1-01b2 STR XY35:GPCChip - CCID58-1-02b1 STR XY36:GPCChip - CCID58-2-16b2 STR XY37:GPCChip - CCID58-2-18b2 STR XY40:GPCChip - CCID58-1-03b2 STR XY41:GPCChip - CCID58-1-07b1 STR XY42:GPCChip - CCID58-2-11b2 STR XY43:GPCChip - CCID58-1-05a2 STR XY44:GPCChip - CCID58-1-21a2 STR XY45:GPCChip - CCID58-2-07a2 STR XY46:GPCChip - CCID58-1-21a1 STR XY47:GPCChip - CCID58-1-17b1 STR XY50:GPCChip - CCID58-2-09b2 STR XY51:GPCChip - CCID58-1-04b1 STR XY52:GPCChip - CCID58-1-05b2 STR XY53:GPCChip - CCID58-2-09a1 STR XY54:GPCChip - CCID58-2-12a2 STR XY55:GPCChip - CCID58-1-10a2 STR XY56:GPCChip - CCID58-2-12a1 STR XY57:GPCChip - CCID58-2-22b2 STR XY60:GPCChip - CCID58-1-03b1 STR XY61:GPCChip - CCID58-2-23b2 STR XY62:GPCChip - CCID58-1-02b2 STR XY63:GPCChip - CCID58-1-07a1 STR XY64:GPCChip - CCID58-2-17a2 STR XY65:GPCChip - CCID58-2-14a1 STR XY66:GPCChip - CCID58-2-16a2 STR XY67:GPCChip - CCID58-2-04b2 STR XY71:GPCChip - CCID58-1-14b1 STR XY72:GPCChip - CCID58-1-25b1 STR XY73:GPCChip - CCID58-1-18a1 STR XY74:GPCChip - CCID58-2-16a1 STR XY75:GPCChip - CCID58-2-05a1 STR XY76:GPCChip + # 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 @@ -165,45 +166,78 @@ # How to translate PS concepts into FITS headers +## EAM: since this format is used for smf and for the MEF fl 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.AIRMASS STR AIRMASS - FPA.POSANGLE STR POSANGLE + 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 MJD-OBS - FPA.ALT STR ALT - FPA.AZ STR AZ - FPA.TEMP STR DETTEM - FPA.ZP STR MAG_ZP - 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 - FPA.EXPOSURE STR EXPREQ # Requested exposure time, presumably camera exposure time - CELL.EXPOSURE STR EXPTIME # Exposure time measured by shutter - CELL.DARKTIME STR DARKTIME # Exposure time for camera - CELL.TIME STR MJD-OBS - CELL.GAIN STR GAIN - CELL.READNOISE STR RDNOISE - CELL.BAD STR LOWLEVEL - CELL.SATURATION STR SATLEVEL + 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 PS1 - FPA.INSTRUMENT STR GPC1 - FPA.DETECTOR STR GPC1 - FPA.OBS S32 12345 - FPA.TIMESYS STR TAI + 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 4846 CHIP.YSIZE S32 4868 Index: /tags/ipp-ps1-20210510/ippconfig/recipes/psphot.config =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/recipes/psphot.config (revision 41699) +++ /tags/ipp-ps1-20210510/ippconfig/recipes/psphot.config (revision 41700) @@ -1037,4 +1037,7 @@ END +SWEETSPOT_DENSE METADATA +END + M31_DEEP METADATA END Index: /tags/ipp-ps1-20210510/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/recipes/reductionClasses.mdc (revision 41699) +++ /tags/ipp-ps1-20210510/ippconfig/recipes/reductionClasses.mdc (revision 41700) @@ -2016,2 +2016,25 @@ END +# for localhost test without bias, dark, flat, mask - ccl 2019.11.06 +SWEETSPOT_DENSE METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR SWEETSPOT_DENSE + WARP_PSWARP STR WARP + STACK_PPSTACK STR QUICKSTACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR SSTF_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 +END