Index: /branches/eam_branches/ipp-20121219/ippScripts/scripts/nightly_science.pl =================================================================== --- /branches/eam_branches/ipp-20121219/ippScripts/scripts/nightly_science.pl (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippScripts/scripts/nightly_science.pl (revision 34902) @@ -1025,5 +1025,5 @@ } foreach my $skycell (sort (keys (%skycells))) { - $skycell_select .= " -skycell $skycell "; + $skycell_select .= " -select_skycell_id $skycell "; } $cmd .= " -select_label $science_config{$target}{ADDITIONAL_STACK_LABEL} $skycell_select "; Index: /branches/eam_branches/ipp-20121219/ippTasks/nightly_science.pro =================================================================== --- /branches/eam_branches/ipp-20121219/ippTasks/nightly_science.pro (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippTasks/nightly_science.pro (revision 34902) @@ -370,5 +370,5 @@ periods -poll $LOADPOLL periods -exec $LOADEXEC - periods -timeout 120 + periods -timeout 480 npending 1 Index: /branches/eam_branches/ipp-20121219/ippToPsps/config/IN/tables.vot =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/config/IN/tables.vot (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/config/IN/tables.vot (revision 34902) @@ -161,24 +161,4 @@ 3PS_MODEL_EXPExponential Fit 4PS_MODEL_SERSICSersic Fit - - - - - VOTable description of PSPS table PhotozRecipe - - - recipe index - - - string describing the recipe - - - - - - - - - @@ -102112,4 +102092,84 @@
0Spectroscopic Redshift
1Le Phere photoz software
2HyperZ photoz software
3ANNz photoz software
4EAZY software
5Support vector machine (SVM) software
+ + VOTable description of PSPS table DetectionFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DEFAULT0Initial value: resets all bits
PSFMODEL1Source fitted with a psf model (linear or non-linear)
EXTMODEL2Source fitted with an extended-source model
FITTED4Source fitted with non-linear model (PSF or EXT; good or bad)
FAIL8Fit (non-linear) failed (non-converge, off-edge, run to zero)
POOR16Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
PAIR32Source fitted with a double psf
PSFSTAR64Source used to define PSF model
SATSTAR128Source model peak is above saturation
BLEND256Source is a blend with other sources
EXTERNAL512Source based on supplied input position
BADPSF1024Failed to get good estimate of object's PSF
DEFECT2048Source is thought to be a defect
SATURATED4096Source is thought to be saturated pixels (bleed trail)
CR_LIMIT8192Source has crNsigma above limit
EXT_LIMIT16384Source has extNsigma above limit
MOMENTS_FAILURE32768could not measure the moments
SKY_FAILURE65536could not measure the local sky
SKYVAR_FAILURE131072could not measure the local sky variance
BELOW_MOMENTS_SN262144moments not measured due to low S/N
BIG_RADIUS1048576poor moments for small radius, try large radius
AP_MAGS2097152source has an aperture magnitude
BLEND_FIT4194304source was fitted as a blend
EXTENDED_FIT8388608full extended fit was used
EXTENDED_STATS16777216extended aperture stats calculated
LINEAR_FIT33554432source fitted with the linear fit
NONLINEAR_FIT67108864source fitted with the non-linear fit
RADIAL_FLUX134217728radial flux measurements calculated
SIZE_SKIPPED268435456size could not be determined
ON_SPIKE536870912peak lands on diffraction spike
ON_GHOST1073741824peak lands on ghost or glint
OFF_CHIP2147483648peak lands off edge of chip
DIFF_WITH_SINGLE4294967296diff source matched to a single positive detection
DIFF_WITH_DOUBLE8589934592diff source matched to positive detections in both images
MATCHED17179869184diff source matched to positive detections in both images
ON_SPIKE34359738368>25% of (PSF-weighted) pixels land on diffraction spike
ON_STARCORE68719476736>25% of (PSF-weighted) pixels land on starcore
ON_BURNTOOL137438953472>25% of (PSF-weighted) pixels land on burntool
ON_CONVPOOR274877906944>25% of (PSF-weighted) pixels land on convpoor
PASS1_SRC549755813888source detected in first pass analysis
HAS_BRIGHTER_NEIGHBOR1099511627776peak is not the brightest in its footprint
BRIGHT_NEIGHBOR_12199023255552flux_n / (r^2 flux_p) >1
BRIGHT_NEIGHBOR_104398046511104flux_n / (r^2 flux_p) >10
DIFF_SELF_MATCH8796093022208positive detection match is probably this source
SATSTAR_PROFILE17592186044416saturated source is modeled with a radial profile
NOCAL35184372088832detection ignored for this analysis (photcode, time range) -- internal only
POOR_PHOTOM70368744177664detection is photometry outlier
SKIP_PHOTOM140737488355328detection was ignored for photometry measurement
AREA281474976710656detection near image edge
POOR_ASTROM562949953421312detection is astrometry outlier
SKIP_ASTROM1125899906842624detection was ignored for astrometry measurement
USED_OBJ2251799813685248detection was used during update objects
USED_CHIP4503599627370496detection was used during update chips (XXX this probably does not make it into the db)
BLEND_MEAS9007199254740992detection is within radius of multiple objects
BLEND_OBJ18014398509481984multiple detections within radius of object
UNDEF_336028797018963968unused
UNDEF_472057594037927936unused
BLEND_MEAS_X144115188075855872detection is within radius of multiple objects across catalogs
ARTIFACT288230376151711744detection is thought to be non-astronomical
UNDEF_5576460752303423488unused
PHOTOM_UBERCAL1152921504606846976externally-supplied zero point from ubercal analysis
STACK_PRIMARY2305843009213693952externally-supplied zero point from ubercal analysis
STACK_PHOT_SRC4611686018427387904this measurement supplied the stack photometry
VOTable description of PSPS table DetectionFlags @@ -102129,48 +102189,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PSFMODEL1Source fitted with a psf model (linear or non-linear)
EXTMODEL2Source fitted with an extended-source model
FITTED4Source fitted with non-linear model (PSF or EXT; good or bad)
FITFAIL8Fit (non-linear) failed (non-converge, off-edge, run to zero)
POORFIT16Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
PAIR32Source fitted with a double psf
PSFSTAR64Source used to define PSF model
SATSTAR128Source model peak is above saturation
BLEND256Source is a blend with other sourcers
EXTERNALPOS512Source based on supplied input position
BADPSF1024Failed to get good estimate of object's PSF
DEFECT2048Source is thought to be a defect
SATURATED4096Source is thought to be saturated pixels (bleed trail)
CR_LIMIT8192Source has crNsigma above limit
EXT_LIMIT16384Source has extNsigma above limit
MOMENTS_FAILURE32768could not measure the moments
SKY_FAILURE65536could not measure the local sky
SKYVAR_FAILURE131072could not measure the local sky variance
MOMENTS_SN262144moments not measured due to low S/N
BIG_RADIUS1048576poor moments for small radius, try large radius
AP_MAGS2097152source has an aperture magnitude
BLEND_FIT4194304source was fitted as a blend
EXTENDED_FIT8388608full extended fit was used
EXTENDED_STATS16777216extended aperture stats calculated
LINEAR_FIT33554432source fitted with the linear fit
NONLINEAR_FIT67108864source fitted with the non-linear fit
RADIAL_FLUX134217728radial flux measurements calculated
SIZE_SKIPPED268435456size could not be determined
ON_SPIKE536870912peak lands on diffraction spike
ON_GHOST1073741824peak lands on ghost or glint
OFF_CHIP2147483648peak lands off edge of chip
NOCAL4294967296detection ignored for this analysis (photcode, time range) -- internal only
POOR_PHOTOM8589934592detection is photometry outlier
SKIP_PHOTOM17179869184detection was ignored for photometry measurement
MEAS_AREA34359738368detection near image edge
POOR_ASTROM68719476736detection is astrometry outlier
SKIP_ASTROM137438953472detection was ignored for astrometry measurement
USED_OBJ274877906944detection was used during opdate objects
USED_CHIP549755813888detection was used during update chips
BLEND_MEAS1099511627776detection is within radius of multiple objects
BLEND_OBJ2199023255552multiple detections within radius of object
BLEND_MEAS_X17592186044416detection is within radius of multiple objects across catalogs
ARTIFACT35184372088832detection is thought to be non-astronomical
FITTED4Source fitted with non-linear model (PSF or EXT; good or bad)
FAIL8Fit (non-linear) failed (non-converge, off-edge, run to zero)
POOR16Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
PAIR32Source fitted with a double psf
PSFSTAR64Source used to define PSF model
SATSTAR128Source model peak is above saturation
BLEND256Source is a blend with other sources
EXTERNAL512Source based on supplied input position
BADPSF1024Failed to get good estimate of object's PSF
DEFECT2048Source is thought to be a defect
SATURATED4096Source is thought to be saturated pixels (bleed trail)
CR_LIMIT8192Source has crNsigma above limit
EXT_LIMIT16384Source has extNsigma above limit
MOMENTS_FAILURE32768could not measure the moments
SKY_FAILURE65536could not measure the local sky
SKYVAR_FAILURE131072could not measure the local sky variance
BELOW_MOMENTS_SN262144moments not measured due to low S/N
BIG_RADIUS1048576poor moments for small radius, try large radius
AP_MAGS2097152source has an aperture magnitude
BLEND_FIT4194304source was fitted as a blend
EXTENDED_FIT8388608full extended fit was used
EXTENDED_STATS16777216extended aperture stats calculated
LINEAR_FIT33554432source fitted with the linear fit
NONLINEAR_FIT67108864source fitted with the non-linear fit
RADIAL_FLUX134217728radial flux measurements calculated
SIZE_SKIPPED268435456size could not be determined
ON_SPIKE536870912peak lands on diffraction spike
ON_GHOST1073741824peak lands on ghost or glint
OFF_CHIP2147483648peak lands off edge of chip
DIFF_WITH_SINGLE4294967296diff source matched to a single positive detection
DIFF_WITH_DOUBLE8589934592diff source matched to positive detections in both images
MATCHED17179869184diff source matched to positive detections in both images
ON_SPIKE34359738368>25% of (PSF-weighted) pixels land on diffraction spike
ON_STARCORE68719476736>25% of (PSF-weighted) pixels land on starcore
ON_BURNTOOL137438953472>25% of (PSF-weighted) pixels land on burntool
ON_CONVPOOR274877906944>25% of (PSF-weighted) pixels land on convpoor
PASS1_SRC549755813888source detected in first pass analysis
HAS_BRIGHTER_NEIGHBOR1099511627776peak is not the brightest in its footprint
BRIGHT_NEIGHBOR_12199023255552flux_n / (r^2 flux_p) >1
BRIGHT_NEIGHBOR_104398046511104flux_n / (r^2 flux_p) >10
DIFF_SELF_MATCH8796093022208positive detection match is probably this source
SATSTAR_PROFILE17592186044416saturated source is modeled with a radial profile
NOCAL35184372088832detection ignored for this analysis (photcode, time range) -- internal only
POOR_PHOTOM70368744177664detection is photometry outlier
SKIP_PHOTOM140737488355328detection was ignored for photometry measurement
AREA281474976710656detection near image edge
POOR_ASTROM562949953421312detection is astrometry outlier
SKIP_ASTROM1125899906842624detection was ignored for astrometry measurement
USED_OBJ2251799813685248detection was used during update objects
USED_CHIP4503599627370496detection was used during update chips (XXX this probably does not make it into the db)
BLEND_MEAS9007199254740992detection is within radius of multiple objects
BLEND_OBJ18014398509481984multiple detections within radius of object
UNDEF_336028797018963968unused
UNDEF_472057594037927936unused
BLEND_MEAS_X144115188075855872detection is within radius of multiple objects across catalogs
ARTIFACT288230376151711744detection is thought to be non-astronomical
UNDEF_5576460752303423488unused
PHOTOM_UBERCAL1152921504606846976externally-supplied zero point from ubercal analysis
STACK_PRIMARY2305843009213693952externally-supplied zero point from ubercal analysis
STACK_PHOT_SRC4611686018427387904this measurement supplied the stack photometry
+ + VOTable description of PSPS table ObjectInfoFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + + + + + + + +
FEW1used within relphot: skip star
POOR2used within relphot: skip star
FIT_AVE65536average position fitted
FIT_PM131072proper motion fitted
FIT_PAR262144parallax fitted
USE_AVE524288average position used (not PM or PAR)
USE_PM1048576proper motion used (not AVE or PAR)
USE_PAR2097152parallax used (not AVE or PM)
NO_ASTROM4194304mean astrometry could not be measured
EXT16777216extended in our data (eg, PS)
EXT_ALT33554432extended in external data (eg, 2MASS)
GOOD67108864good-quality measurement in our data (eg,PS)
GOOD_ALT134217728good-quality measurement in external data (eg, 2MASS)
+ + VOTable description of PSPS table ObjectInfoFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + + + + + + +
SECF_STAR_FEW1used within relphot: skip star
SECF_STAR_POOR2used within relphot: skip star
SECF_USE_SYNTH4synthetic photometry used in average measurement
SECF_USE_UBERCAL8synthetic photometry used in average measurement
SECF_HAS_PS116PS1 photometry used in average measurement
SECF_HAS_STACK32PS1 stack photometry exists
PHOTOM_PASS_0256average magnitude calculated in 0th pass
PHOTOM_PASS_1512average magnitude calculated in 1th pass
PHOTOM_PASS_21024average magnitude calculated in 2th pass
PHOTOM_PASS_32048average magnitude calculated in 3th pass
PHOTOM_PASS_44096average magnitude calculated in 4th pass
PSPS_OBJ_EXT8192extended in this band (PSPS only)
+ + VOTable description of PSPS table ObjectInfoFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + +
QF_OBJ_EXT1extended in our data (eg, PS)
QF_OBJ_EXT_ALT2extended in external data (eg, 2MASS)
QF_OBJ_GOOD4good-quality measurement in our data (eg,PS)
QF_OBJ_GOOD_ALT8good-quality measurement in external data (eg, 2MASS)
QF_OBJ_GOOD_STACK16good-quality object in the stack (> 1 good stack)
QF_OBJ_SUSPECT_STACK32suspect object in the stack (> 1 good or suspect stack, less tham 2 good)
QF_OBJ_BAD_STACK64good-quality object in the stack (> 1 good stack)
Index: /branches/eam_branches/ipp-20121219/ippToPsps/config/P2/tables.vot =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/config/P2/tables.vot (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/config/P2/tables.vot (revision 34902) @@ -511,32 +511,4 @@ - - VOTable description of PSPS table ObjectCalColor - - - ODM object identifier - - - ipp object identifier - - - filter identifier - - - color adopted for magnitude calculation - - - error in calibrating color - - - calibration modification number - - - Data release when this color calibration was established - - - - -
VOTable description of PSPS table DetectionCalib Index: /branches/eam_branches/ipp-20121219/ippToPsps/config/ST/tables.vot =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/config/ST/tables.vot (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/config/ST/tables.vot (revision 34902) @@ -1212,33 +1212,5 @@
- - VOTable description of PSPS table ObjectCalColor - - - ODM object identifier - - - ipp object identifier - - - filter identifier - - - color adopted for magnitude calculation (unit = mag) - - - error in calibrating color (unit = mag) - - - calibration modification number - - - Data release when this color calibration was established - - - - -
- +
VOTable description of PSPS table StackDetectionCalib Index: /branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py (revision 34902) @@ -766,5 +766,5 @@ self.populateSkinnyObjectTable(ota) #self.logger.info("updated skinnyobject") - self.populateObjectCalColorTable(ota) + #self.populateObjectCalColorTable(ota) #self.logger.info("updated objectcalcolor") self.populateDetectionCalibTable(ota) @@ -775,5 +775,5 @@ self.tablesToExport.append("Detection_" + ota) self.tablesToExport.append("SkinnyObject_" + ota) - self.tablesToExport.append("ObjectCalColor_" + ota) + #self.tablesToExport.append("ObjectCalColor_" + ota) self.tablesToExport.append("DetectionCalib_" + ota) tables.append("Detection_" + ota) Index: /branches/eam_branches/ipp-20121219/ippToPsps/jython/gpc1db.py =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/jython/gpc1db.py (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/jython/gpc1db.py (revision 34902) @@ -61,8 +61,10 @@ JOIN rawExp USING (exp_id) \ JOIN mergedvodbRun using (minidvodb_id) \ + JOIN mergedvodbProcessed using (merge_id) \ WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \ AND minidvodbRun.state = 'merged' \ AND mergedvodbRun.state = 'full' \ AND minidvodbProcessed.fault = 0 \ + AND mergedvodbProcessed.fault = 0 \ AND addRun.stage = '" + stage + "' \ AND addRun.state = 'full' \ @@ -77,13 +79,17 @@ JOIN minidvodbRun USING(minidvodb_name) \ JOIN minidvodbProcessed USING(minidvodb_id) \ + JOIN mergedvodbRun USING(minidvodb_id) \ + JOIN mergedvodbProcessed USING (merge_id) \ JOIN stackRun USING(stack_id) JOIN skycell USING(skycell_id) \ - WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \ + WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \ AND minidvodbRun.state = 'merged' \ AND minidvodbProcessed.fault = 0 \ + AND mergedvodbRun.state = 'full' \ + AND mergedvodbProcessed.fault = 0 \ AND addRun.stage = '" + stage + "' \ AND addRun.state = 'full' \ AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \ AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) - + try: rs = self.executeQuery(sql) Index: /branches/eam_branches/ipp-20121219/ippToPsps/jython/stackbatch.py =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/jython/stackbatch.py (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/jython/stackbatch.py (revision 34902) @@ -93,5 +93,5 @@ self.scratchDb.dropTable("StackToImage") self.scratchDb.dropTable("SkinnyObject") - self.scratchDb.dropTable("ObjectCalColor") + #self.scratchDb.dropTable("ObjectCalColor") self.scratchDb.dropTable("StackDetectionCalib") @@ -828,5 +828,5 @@ self.populateSkinnyObject() #self.logger.infoPair("populating","ObjectCalColor") - self.populateObjectCalColor() + #self.populateObjectCalColor() #self.logger.infoPair("populating","StackDetectionCalib") self.populateStackDetectionCalib() Index: /branches/eam_branches/ipp-20121219/ippToPsps/perl/pspsSchema2xml.pl =================================================================== --- /branches/eam_branches/ipp-20121219/ippToPsps/perl/pspsSchema2xml.pl (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippToPsps/perl/pspsSchema2xml.pl (revision 34902) @@ -118,5 +118,5 @@ parseTable("Filter"); parseTable("FitModel"); - parseTable("PhotozRecipe"); + # parseTable("PhotozRecipe"); parseTable("Survey"); parseTable("CameraConfig"); @@ -141,5 +141,5 @@ parseTable("Detection"); parseTable("SkinnyObject"); - parseTable("ObjectCalColor"); + # parseTable("ObjectCalColor"); } @@ -153,7 +153,7 @@ parseTable("StackMeta"); parseTable("StackToImage"); - parseTable("StackLowSigDelta"); - parseTable("StackHighSigDelta"); - parseTable("ObjectCalColor"); + # parseTable("StackLowSigDelta"); + # parseTable("StackHighSigDelta"); + # parseTable("ObjectCalColor"); } @@ -171,5 +171,5 @@ parseTable("StackToImage"); parseTable("SkinnyObject"); - parseTable("ObjectCalColor"); + # parseTable("ObjectCalColor"); } Index: /branches/eam_branches/ipp-20121219/ippTools/src/warptoolConfig.c =================================================================== --- /branches/eam_branches/ipp-20121219/ippTools/src/warptoolConfig.c (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippTools/src/warptoolConfig.c (revision 34902) @@ -402,4 +402,5 @@ psMetadataAddS64(tofullskyfileArgs, PS_LIST_TAIL, "-set_magicked", 0, "new value for magicked", 0); psMetadataAddS16(tofullskyfileArgs, PS_LIST_TAIL, "-set_quality", 0, "new value for quality", 0); + psMetadataAddS16(tofullskyfileArgs, PS_LIST_TAIL, "-set_background_model", 0, "new value for background_model", 0); // -updateskyfile Index: /branches/eam_branches/ipp-20121219/ippconfig/recipes/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20121219/ippconfig/recipes/ppStack.config (revision 34901) +++ /branches/eam_branches/ipp-20121219/ippconfig/recipes/ppStack.config (revision 34902) @@ -32,4 +32,6 @@ TARGET.FRAC F32 0.1 # Minimum flux fraction for target PSF TARGET.MINMAG F32 3.0 # Minimum magnitude difference to tolerate in stamp + +BACKGROUND.MODEL BOOL FALSE # Construct a stacked version of the warp stage background RENORM BOOL TRUE # Renormalise weight maps? Index: /branches/eam_branches/ipp-20121219/ppStack/src/ppStackCombinePrepare.c =================================================================== --- /branches/eam_branches/ipp-20121219/ppStack/src/ppStackCombinePrepare.c (revision 34901) +++ /branches/eam_branches/ipp-20121219/ppStack/src/ppStackCombinePrepare.c (revision 34902) @@ -34,10 +34,13 @@ /* options->expRO = NULL; */ /* } */ - pmCell *bkgCell; - int bkg_r0,bkg_c0; - int bkg_nC,bkg_nR; + int bkg_r0 = 0,bkg_c0 = 0; + int bkg_nC = 0,bkg_nR = 0; if (bkgName) { ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, true, 0); pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", 0); + if (!file) { + psError(PPSTACK_ERR_ARGUMENTS, false, "Output background model selected but no inputs provided."); + return false; + } pmFPAview *view = ppStackFilesIterateDown(config); pmReadout *ro = pmFPAviewThisReadout(view,file->fpa); @@ -47,5 +50,5 @@ bkg_nC = ro->image->numCols; bkg_nR = ro->image->numRows; - bkgCell = pmFPAfileThisCell(config->files, view, bkgName); // Bkg cell + pmCell *bkgCell = pmFPAfileThisCell(config->files, view, bkgName); // Bkg cell options->bkgRO = pmReadoutAlloc(bkgCell); // BKG readout Index: /branches/eam_branches/ipp-20121219/ppStack/src/ppStackLoop.c =================================================================== --- /branches/eam_branches/ipp-20121219/ppStack/src/ppStackLoop.c (revision 34901) +++ /branches/eam_branches/ipp-20121219/ppStack/src/ppStackLoop.c (revision 34902) @@ -41,8 +41,9 @@ if (options->quality) return true; // Can't do anything else + psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe + // Ensure sufficient inputs { int numGood = stackSummary(options, "initial combination"); - psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe bool safe = psMetadataLookupBool(NULL, recipe, "SAFE"); // Be safe when combining if (safe && numGood <= 1) { @@ -62,6 +63,8 @@ } + bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL"); + // Prepare for combination - if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", "PPSTACK.OUTPUT.BKGMODEL", PPSTACK_FILES_STACK, stack, options, config)) { + if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) { psError(psErrorCodeLast(), false, "Unable to prepare for combination."); psFree(stack); @@ -143,5 +146,5 @@ // Generate median background stack here. - if (!ppStackCombineBackground(stack, options, config)) { + if (doBackground && !ppStackCombineBackground(stack, options, config)) { psError(psErrorCodeLast(), false, "Unable to generate median of background images."); psFree(stack); Index: /branches/eam_branches/ipp-20121219/tools/queuessky.lap =================================================================== --- /branches/eam_branches/ipp-20121219/tools/queuessky.lap (revision 34902) +++ /branches/eam_branches/ipp-20121219/tools/queuessky.lap (revision 34902) @@ -0,0 +1,183 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt ); +use Pod::Usage qw( pod2usage ); +use POSIX qw(strftime); + +# The rest of this is some subroutines for setting up the filter combinations +my @filter = qw( +g.00000 +r.00000 +i.00000 +z.00000 +y.00000 +); + + +my ($ramin, $ramax, $decmin, $decmax, $absglatmin, $go); +my $combos = 5; +my $verbose = 0; + +GetOptions( + 'ra_min=s' => \$ramin, + 'ra_max=s' => \$ramax, + 'dec_min=s' => \$decmin, + 'dec_max=s' => \$decmax, +# 'absglatmin=s' => \$absglatmin, # not yet + 'nfilters=s' => \$combos, + 'go' => \$go, + 'verbose|v' => \$verbose, +) or pod2usage(2); + +unless (defined $ramin and defined $ramax) { + warn ("ramin and ramax are required\n"); + pod2usage(2); +}; + +my $pretend = $go ? "" : " -pretend"; + +my $filter_combos = setup_filter_combos($combos); + +# printcombos($filter_combos) if $verbose; + +my $label='LAP.ThreePi.20120706'; + +my $datestr = strftime "%Y/%m/%d", gmtime; + +my $command="staticskytool -definebyquery -set_workdir neb://\@HOST\@.0/gpc1/$label/$datestr" + . " -set_label $label -select_label $label -set_data_group $label -set_dist_group LAP.ThreePi" + . " -ra_min $ramin -ra_max $ramax" + . " -simple" + . $pretend; + +$command .= " -dec_min $decmin" if defined $decmin; +$command .= " -dec_max $decmax" if defined $decmax; + +# XXX TODO: implement absglatmin + +foreach my $filter_combo (@$filter_combos) { + my $cmd = $command; + foreach my $f (@$filter_combo) { + $cmd .= " -select_filter $f"; + } + print "$cmd\n" if $verbose; + my $rc = system $cmd ; #. " -glat_min 10"; + if ($rc) { + my $status = $rc >> 8; + print STDERR "$cmd returned $rc $status\n"; + exit $status; + } +} + + + +exit 0; + + + + +sub setup_filter_combos { + my $combos = shift; + + die "invalid combos arg: $combos\n" unless defined $combos and ($combos eq "5" or $combos eq "4" or $combos eq "3" or $combos eq "2" or $combos eq "1"); + + if ($combos eq 5) { + my @ary; + push @ary, \@filter; + return \@ary; + } elsif ($combos eq 4) { + return makecombo4(); + } elsif ($combos eq 3) { + return makecombo3(); + } elsif ($combos eq 2) { + return makecombo2(); + } elsif ($combos eq 1) { + my @ary; + foreach my $f (@filter) { + my @ary2 = ($f); + push @ary, \@ary2 + } + return \@ary; + } else { + die "how did we get here?"; + } +} + + + +sub printcombos { + my $combos = shift; + foreach my $c (@$combos) { + my $str; + foreach my $f (@$c) { + $str .= " -select_filter $f"; + } + print "$str\n"; + } +} + + +sub makecombo4 { + my $numFilters = scalar @filter; + my @combos; + + for (my $i = 0; $i < $numFilters; $i++) { + for (my $j = $i + 1; $j < $numFilters; $j++) { + for (my $k = $j + 1; $k < $numFilters; $k++) { + for (my $l = $k + 1; $l < $numFilters; $l++) { + my @combo = ($filter[$i], $filter[$j], $filter[$k], $filter[$l]); + push @combos, \@combo; + } + } + } + } + return \@combos; +} + +sub makecombo3 { + my $numFilters = scalar @filter; + my @combos; + + for (my $i = 0; $i < $numFilters; $i++) { + for (my $j = $i + 1; $j < $numFilters; $j++) { + for (my $k = $j + 1; $k < $numFilters; $k++) { + my @combo = ($filter[$i], $filter[$j], $filter[$k]); + push @combos, \@combo; + } + } + } + return \@combos; +} + +sub makecombo2 { + my $numFilters = scalar @filter; + my @combos; + + for (my $i = 0; $i < $numFilters; $i++) { + for (my $j = $i + 1; $j < $numFilters; $j++) { + my @combo = ($filter[$i], $filter[$j]); + push @combos, \@combo; + } + } + return \@combos; +} + + +__END__ + +=pod + +=head1 NAME + +queuesskylap - queue LAP staticsky runs + +=head1 SYNOPSIS + + XXX: pod TODO + + queuesskylap --ra_min --ra_max --dec_min --dec_max [--go] + + Index: /branches/eam_branches/ipp-20121219/tools/run.relastro =================================================================== --- /branches/eam_branches/ipp-20121219/tools/run.relastro (revision 34902) +++ /branches/eam_branches/ipp-20121219/tools/run.relastro (revision 34902) @@ -0,0 +1,67 @@ +#!/bin/csh -f + +if ($#argv != 5) then + echo "USAGE: run.relastro (catdir) (Rmin) (Rmax) (Dmin) (Dmax)" + exit 2 +endif + +set REALRUN = 0 + +set catdir = $argv[1] +set ra_min = $argv[2] +set ra_max = $argv[3] +set dec_min = $argv[4] +set dec_max = $argv[5] + +alias run.relastro \ + 'echo -n "--- starting relastro $catdir --- "; date; \ + echo relastro $options $region -D CATDIR $catdir; \ + if ($REALRUN) relastro $options $region -D CATDIR $catdir' + +# -update-chips : determine improved astrometry calibrations +# try 1000 meas per deg^2, but if memory if available, go to more +if (1) then + set options = "-update-chips" + set options = "$options -D RELASTRO_SRC_MEAS_TOOFEW 1" + set options = "$options -D RELASTRO_SIGMA_LIM 0.1" + set options = "$options -nloop 6" + set options = "$options -basic-image-search" + set options = "$options -reset" + set options = "$options -update" + set options = "$options -max-density 3000" + set options = "$options -threads 4" + set options = "$options -v" + + # enable parallel operations for parallel databases + # set options = "$options -parallel" + + set region = "-region $ra_min $ra_max $dec_min $dec_max" + run.relastro + if ($status) then + echo "ERROR : failure running relastro" + echo -n "--- done with relastro --- "; date + exit 1 + endif +endif + +# -update-objects : determine improved positions, including parallax and proper motions +if (1) then + set options = "-update-objects -pmpar" + set options = "$options -D PM_DT_MIN 1.0" + set options = "$options -D PAR_FACTOR_MIN 0.25" + set options = "$options -update" + set options = "$options -v" + + # enable parallel operations for parallel databases + # set options = "$options -parallel" + + set region = "-region $ra_min $ra_max $dec_min $dec_max" + run.relastro + if ($status) then + echo "ERROR : failure running relastro" + echo -n "--- done with relastro --- "; date + exit 1 + endif +endif + +echo -n "--- done with relastro --- "; date Index: /branches/eam_branches/ipp-20121219/tools/run.relphot =================================================================== --- /branches/eam_branches/ipp-20121219/tools/run.relphot (revision 34902) +++ /branches/eam_branches/ipp-20121219/tools/run.relphot (revision 34902) @@ -0,0 +1,57 @@ +#!/bin/csh -f + +if ($#argv != 5) then + echo "USAGE: run.relphot (catdir) (Rmin) (Rmax) (Dmin) (Dmax)" + exit 2 +endif + +set REALRUN = 1 + +set catdir = $argv[1] +set ra_min = $argv[2] +set ra_max = $argv[3] +set dec_min = $argv[4] +set dec_max = $argv[5] + +alias run.relphot \ + 'echo -n "--- starting relphot $catdir --- "; date; \ + echo relphot $options $region -D CATDIR $catdir; \ + if ($REALRUN) relphot $options $region -D CATDIR $catdir' + +# try 2000 meas per deg^2 +if (1) then + set filters = "g,r,i,z,y" + + set options = "$filters -imfreeze -mosaic" + set options = "$options -D MAG_LIM 32.0" + set options = "$options -D SIGMA_LIM 0.1" + set options = "$options -D STAR_TOOFEW 1" + set options = "$options -D STAR_CHISQ 20.0" + set options = "$options -D IMAGE_OFFSET 2.0" + + set options = "$options -nloop 25" + + set options = "$options -D CAMERA gpc1" + set options = "$options -basic-image-search" + set options = "$options -update" + set options = "$options -threads 4" + set options = "$options -statmode WT_MEAN" + set options = "$options -max-density 2000" + + # activate parallel mode when catdir is parallel + # set options = "$options -parallel" + + # option to change the schema + # set options = "$options -update-catformat PS1_V3" + + set region = "-region $ra_min $ra_max $dec_min $dec_max" + run.relphot + if ($status) then + echo "ERROR : failure running relphot" + echo -n "--- done with relphot --- "; date + exit 1 + endif +endif + +echo -n "--- done with relphot --- "; date +exit 0 Index: /branches/eam_branches/ipp-20121219/tools/run.setphot =================================================================== --- /branches/eam_branches/ipp-20121219/tools/run.setphot (revision 34902) +++ /branches/eam_branches/ipp-20121219/tools/run.setphot (revision 34902) @@ -0,0 +1,40 @@ +#!/bin/csh -f + +if ($#argv != 1) then + echo "USAGE: run.setphot (catdir)" + exit 2 +endif + +set REALRUN = 0 + +set catdir = $argv[1] +set ubercal = ~ipp/ucalqw_noref.fits + +alias run.setphot \ + 'echo -n "--- starting setphot $catdir --- "; date; \ + echo setphot $options -D CATDIR $catdir $ubercal; \ + if ($REALRUN) setphot $options -D CATDIR $catdir $ubercal' + +set options = "" +set options = "$options -update" +set options = "$options -ubercal" +set options = "$options -no-metadata" + +# activate parallel mode when catdir is parallel +# set options = "$options -parallel" + +# the new ubercal file includes Eddie's offsets relative to JT (so, no need to supply -zpt-offsets) +run.setphot +if ($status) then + echo "failed setphot" + echo -n "--- done with setphot ---"; date + exit 1 +endif +echo -n "--- done with setphot ---"; date +exit 0 + + +# old command lines with zpt offsets +# setphot -parallel -reset -zpt-offsets g,r,i,z,y -0.013,+0.012,+0.001,-0.016,-0.021 -update -ubercal -no-metadata -D CATDIR $catdir_3pi $ubercal +# setphot -images-only -parallel -reset -zpt-offsets g,r,i,z,y -0.013,+0.012,+0.001,-0.016,-0.021 -update -ubercal -no-metadata -D CATDIR $catdir_3pi $ubercal +