Changeset 41414

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

Location:

branches/eam_branches/gDiff.20200202/src

Files:

• gDiffCamera.c (modified) (2 diffs)
• gDiffDefineOutput.c (modified) (1 diff)
• gDiffExtras.c (modified) (2 diffs)
• gDiffFiles.c (modified) (1 diff)
• gDiffLoop.c (modified) (12 diffs)
• gDiffMakePSF.c (modified) (1 diff)

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

@@ -475 +475 @@
     if (data->forcedPhot1) {
         // this pmFPAfile is used to carry sources detected in the positive image #1
-        pmFPAfile *posSources1 = defineOutputFile(config, input, true, "GDIFF.POS1.SOURCES", PM_FPA_FILE_CMF);
+        pmFPAfile *posSources1 = defineOutputFile(config, output, true, "GDIFF.POS1.SOURCES", PM_FPA_FILE_CMF);
         if (!posSources1) {
             psError(psErrorCodeLast(), false, "Unable to set up forced source file.");
@@ -483 +483 @@
 
         // this pmFPAfile is used to carry sources detected in the diff image @ the positions from positive image #1
-        pmFPAfile *frcSources1 = defineOutputFile(config, input, true, "GDIFF.FORCED1.SOURCES", PM_FPA_FILE_CMF);
+        pmFPAfile *frcSources1 = defineOutputFile(config, output, true, "GDIFF.FORCED1.SOURCES", PM_FPA_FILE_CMF);
         if (!frcSources1) {
             psError(psErrorCodeLast(), false, "Unable to set up forced source file.");

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

@@ -27 +27 @@
 
     // The output readout may already be present if we read in the convolution kernel
+    // NOTE: pmReadoutAlloc returns a reference and saves one on the supplied cell.  The
+    // psMemIncrRefCounter below is needed in the first block so we can free the
+    // reference.  (we should code this to drop the returned reference in the second block
     pmReadout *outRO = NULL;            // Output readout
     if (outCell->readouts && outCell->readouts->n > 0 && outCell->readouts->data[0]) {

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

@@ -21 +21 @@
     if (!targetRO) {
         pmCell *targetCell = pmFPAviewThisCell(view, target->fpa);
-        targetRO = pmReadoutAlloc(targetCell);
+        targetRO = pmReadoutAlloc(targetCell); // returns a reference and adds one to the cell
         psAssert(targetRO, "programming error: could not make target readout");
+        psFree (targetRO); // free the reference
     }
 
@@ -55 +56 @@
     if (hdu) {
         psMetadata *header = psMetadataLookupMetadata(NULL, targetRO->analysis, "PSPHOT.HEADER"); // Header
-        hdu->header = psMetadataCopy(hdu->header, header);
+        if (header) {
+          hdu->header = psMetadataCopy(hdu->header, header);
+        }
     }
 

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

@@ -31 +31 @@
 
 // Subtraction photometry
-static const char *subPhotFiles[] = { "GDIFF.OUTPUT.SOURCES", NULL };
+static const char *subPhotFiles[] = { "GDIFF.OUTPUT.SOURCES",
+                                      "GDIFF.POS1.SOURCES", "GDIFF.FORCED1.SOURCES",
+                                      "GDIFF.POS2.SOURCES", "GDIFF.FORCED2.SOURCES", NULL };
 
 // Inverse subtraction files

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

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

@@ -17 +17 @@
     psAssert(config, "Require configuration");
 
-    if (!data->photometry) {
+    if (!data->photometry && !data->forcedPhot1 && !data->forcedPhot2) {
         return true;
     }