Changeset 29937 for trunk/ppSub/src/ppSubLoop.c

Timestamp:

Dec 5, 2010, 9:45:46 PM (15 years ago)

Author:

eugene

Message:

add forced photometry of positive sources; generate a background model for PPSUB.OUTPUT even if PSPHOT.BACKMDL exists (is certain to be for the wrong image)

File:

• trunk/ppSub/src/ppSubLoop.c (modified) (4 diffs)

trunk/ppSub/src/ppSubLoop.c

@@ -57 +57 @@
     }
 
+    if (data->forcedPhot1) {
+        bool foundDetections = false;
+        if (!ppSubInputDetections(&foundDetections, "PPSUB.POS1.SOURCES", "PPSUB.INPUT", data)) {
+            psError(psErrorCodeLast(), false, "Unable to measure positive detections (1)");
+            return false;
+        }
+        // if nothing was found, don't bother doing the forced photometry below
+        if (!foundDetections) {
+            psWarning ("no sources found in positive image 1, skipping forced photometry");
+            data->forcedPhot1 = false;
+        }
+    }
+    if (data->forcedPhot2) {
+        bool foundDetections = false;
+        if (!ppSubInputDetections(&foundDetections, "PPSUB.POS2.SOURCES", "PPSUB.REF", data)) {
+            psError(psErrorCodeLast(), false, "Unable to measure positive detections (2)");
+            return false;
+        }
+        // if nothing was found, don't bother doing the forced photometry below
+        if (!foundDetections) {
+            psWarning ("no sources found in positive image 1, skipping forced photometry");
+            data->forcedPhot1 = false;
+        }
+    }
+
+    // XXX if it exists, use the POS1, POS2 results for the FWHMs
     if (!ppSubMatchPSFs(data)) {
         psError(psErrorCodeLast(), false, "Unable to match PSFs.");
@@ -70 +96 @@
         return false;
     }
+
+    // XXX add in a positive image detection step here (if needed)
+    
 
     psMetadataAddF32(data->stats, PS_LIST_TAIL, "TIME_MATCH", 0, "Time to match PSFs",
@@ -153 +182 @@
     }
     // dumpout(config, "diff.3.fits");
+
+    // forced photometry for positive image 1
+    if (data->forcedPhot1 && !data->quality) {
+        if (!ppSubReadoutForcedPhot("PPSUB.FORCED1.SOURCES", "PPSUB.OUTPUT", "PPSUB.POS1.SOURCES", data)) {
+            psError(psErrorCodeLast(), false, "Unable to perform photometry.");
+            return false;
+        }
+    }
+
+    // forced photometry for positive image 2
+    if (data->forcedPhot2 && !data->quality) {
+        if (!ppSubReadoutForcedPhot("PPSUB.FORCED2.SOURCES", "PPSUB.OUTPUT", "PPSUB.POS2.SOURCES", data)) {
+            psError(psErrorCodeLast(), false, "Unable to perform photometry.");
+            return false;
+        }
+    }
 
     if (!ppSubFilesIterateUp(config, PPSUB_FILES_PHOT_SUB)) {
@@ -227 +272 @@
     }
 
+    pmFPAfileDropInternal(config->files, "PSPHOT.BACKGND");
+    pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL");
+    pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL.STDEV");
+
     return true;
 }