Changeset 29937 for trunk/ppSub/src/ppSubReadoutPhotometry.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/ppSubReadoutPhotometry.c (modified) (4 diffs)

trunk/ppSub/src/ppSubReadoutPhotometry.c

@@ -31 +31 @@
 
     if (!data->photometry) {
-        return true;
-    }
-
-    // Look up recipe values
-    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
-    psAssert(recipe, "We checked this earlier, so it should be here.");
-
-    if (!psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) {
-        pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL");
-        pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL.STDEV");
         return true;
     }
@@ -81 +71 @@
     }
 
-    if (!psphotReadoutMinimal(config, view)) {
+    if (!psphotReadoutMinimal(config, view, "PSPHOT.INPUT")) {
         // This is likely a data quality issue
         // XXX Split into multiple cases using error codes?
@@ -90 +80 @@
 
     // If no sources were found, there's no error,  but we want to trigger 'bad quality'
+    psWarning("no sources found: why is this being set to bad quality??");
     pmDetections *detections = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.DETECTIONS"); // Sources
     if (!detections) {
@@ -136 +127 @@
         }
     }
-
-    pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL");
-    pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL.STDEV");
 
     return true;