Changeset 41414 for branches/eam_branches/gDiff.20200202/src/gDiffLoop.c

Timestamp:

Sep 17, 2020, 12:19:25 PM (6 years ago)

Author:

eugene

Message:

make a PSF if forced photometry is requested; plug a leak

File:

• branches/eam_branches/gDiff.20200202/src/gDiffLoop.c (modified) (12 diffs)

branches/eam_branches/gDiff.20200202/src/gDiffLoop.c

@@ -26 +26 @@
     psAssert(config, "Require configuration.");
 
-    HDUCHECK ("0a: start gDiffLoop");
-
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, GDIFF_RECIPE); // Recipe for ppSim
     psAssert(recipe, "We checked this earlier, so it should be here.");
@@ -49 +47 @@
     psTimerStart("GDIFF_MATCH");
 
-    HDUCHECK ("0b: gDiffSetMasks");
-
     if (!gDiffSetMasks(config)) {
         psError(psErrorCodeLast(), false, "Unable to set masks.");
@@ -56 +52 @@
     }
 
-    HDUCHECK ("0b.1: gDiffInputDetections");
     if (data->forcedPhot1) {
         bool foundDetections = false;
@@ -70 +65 @@
         }
     }
-    HDUCHECK ("0b.2: gDiffInputDetections");
+
     if (data->forcedPhot2) {
         // XXX why is this only done for Phot2 and not Phot1 ??
@@ -110 +105 @@
      **** This is the core of the PSF-matched image subtraction code.   ****/
 
-    HDUCHECK ("1: before gDiffMatchPSFs");
-
     if (!gDiffMatchPSFs(data)) {
         psError(psErrorCodeLast(), false, "Unable to match PSFs.");
@@ -152 +145 @@
     }
 
-    HDUCHECK ("2: after gDiffLowThreshold");
-
     // Set up subtraction files
     if (!gDiffFilesIterateDown(config, GDIFF_FILES_SUB)) {
@@ -166 +157 @@
         goto ESCAPE;
     }
-
-    HDUCHECK ("2a: gDiffMakePSF");
 
     // the functions in this block are not critical for initial testing, so block them out for now
@@ -186 +175 @@
     }
 
-    HDUCHECK ("3: before gDiffReadoutSubtract");
-
     if (!gDiffReadoutSubtract(config)) {
         psError(psErrorCodeLast(), false, "Unable to subtract images.");
@@ -208 +195 @@
     }
     
-    HDUCHECK ("4: before gDiffBackground");
-
     // Higher order background subtraction using psphot
     if (!gDiffBackground(config)) {
@@ -218 +203 @@
     // dumpout(config, "diff.2b.fits");
 
-    HDUCHECK ("5: before gDiffVarianceRescale");
-
     // Perform Variance correction (rescale within a modest range)
     if (!gDiffVarianceRescale(config, data)) {
@@ -240 +223 @@
     }
 
-    HDUCHECK ("6: before gDiffReadoutPhotometry");
-
     if (!data->quality && !gDiffReadoutPhotometry("GDIFF.OUTPUT", data)) {
         psError(psErrorCodeLast(), false, "Unable to perform photometry.");
@@ -248 +229 @@
     }
     // dumpout(config, "diff.3.fits");
-
-    HDUCHECK ("7: before gDiffReadoutForcedPhot (1)");
 
     // forced photometry for positive image 1