Changeset 32677

Timestamp:

Nov 16, 2011, 11:00:18 AM (14 years ago)

Author:

eugene

Message:

updates to ppSub to fix NOCONVOLVE mode

Location:

tags/ipp-20111110/ppSub/src

Files:

• ppSubLoop.c (modified) (10 diffs, 1 prop)
• ppSubMakePSF.c (modified) (1 diff, 1 prop)
• ppSubMatchPSFs.c (modified) (3 diffs, 1 prop)

tags/ipp-20111110/ppSub/src/ppSubLoop.c

@@ -23 +23 @@
 bool dumpout(pmConfig *config, char *name) 
 {
-  pmFPAview *view = ppSubViewReadout(); // View to readout
-  pmReadout *out = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
-  psphotSaveImage (NULL, out->image, name);
-  psFree(view);
-  return true;
+    pmFPAview *view = ppSubViewReadout(); // View to readout
+    pmReadout *out = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
+    psphotSaveImage (NULL, out->image, name);
+    psFree(view);
+    return true;
 }
 
@@ -33 +33 @@
 bool ppSubLoop(ppSubData *data)
 {
+    bool mdok = false;
+    bool success = true;
+
     psAssert(data, "Require processing data");
     pmConfig *config = data->config;    // Configuration
     psAssert(config, "Require configuration.");
 
-    bool success = true;
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
+    psAssert(recipe, "We checked this earlier, so it should be here.");
+    bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
 
     pmConfigCamerasCull(config, NULL);
     pmConfigRecipesCull(config, "PPSUB,PPSTATS,PSPHOT,PSASTRO,MASKS,JPEG");
-
 
     pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT");
@@ -75 +79 @@
     if (data->forcedPhot2) {
         // Change the recipe to use a higher nsigma limit and quit after pass1
-        psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
-
-        psF32 nsigma_peak_save = psMetadataLookupF32 (NULL, recipe, "PEAKS_NSIGMA_LIMIT");
-        char *breakPt_save =  psMetadataLookupStr (NULL, recipe, "BREAK_POINT");
-
-        bool mdok;
-        psF32 pos2_nsigma_peak = psMetadataLookupF32 (&mdok, recipe, "PEAKS_POS2_NSIGMA_LIMIT");
+        psMetadata *psphotRecipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+
+        psF32 nsigma_peak_save = psMetadataLookupF32 (NULL, psphotRecipe, "PEAKS_NSIGMA_LIMIT");
+        char *breakPt_save =  psMetadataLookupStr (NULL, psphotRecipe, "BREAK_POINT");
+
+        psF32 pos2_nsigma_peak = psMetadataLookupF32 (&mdok, psphotRecipe, "PEAKS_POS2_NSIGMA_LIMIT");
         if (!mdok) {
-            psWarning("PEAKS_POS2_NSIGMA_LIMIT not found in recipe. Will use 25.\n");
+            psWarning("PEAKS_POS2_NSIGMA_LIMIT not found in psphotRecipe. Will use 25.\n");
             pos2_nsigma_peak = 25.;
         }
-        psMetadataAddF32(recipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", pos2_nsigma_peak);
-        psMetadataAddStr(recipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", "PASS1");
+        psMetadataAddF32(psphotRecipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", pos2_nsigma_peak);
+        psMetadataAddStr(psphotRecipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", "PASS1");
 
         bool foundDetections = false;
         if (!ppSubInputDetections(&foundDetections, "PPSUB.POS2.SOURCES", "PPSUB.REF", data)) {
             psError(psErrorCodeLast(), false, "Unable to measure positive detections (2)");
-            psMetadataAddF32(recipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", nsigma_peak_save);
-            psMetadataAddStr(recipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", breakPt_save);
-            success = false;
-            goto ESCAPE;
-        }
-        psMetadataAddF32(recipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", nsigma_peak_save);
-        psMetadataAddStr(recipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", breakPt_save);
+            psMetadataAddF32(psphotRecipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", nsigma_peak_save);
+            psMetadataAddStr(psphotRecipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", breakPt_save);
+            success = false;
+            goto ESCAPE;
+        }
+        psMetadataAddF32(psphotRecipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", nsigma_peak_save);
+        psMetadataAddStr(psphotRecipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", breakPt_save);
         // if nothing was found, don't bother doing the forced photometry below
         if (!foundDetections) {
@@ -107 +110 @@
 
     // XXX if it exists, use the POS1, POS2 successs for the FWHMs
-    psMetadata *recipe = psMetadataLookupPtr(NULL, config->recipes, PPSUB_RECIPE);
-    bool noConvolve = psMetadataLookupBool(NULL, recipe, "NOCONVOLVE"); // Do not use convolved images.
-    if (noConvolve) {
-      psWarning("not matching PSFs because NOCONVOLVE is TRUE\n");
-    } else {
-      if (!ppSubMatchPSFs(data)) {
-        psError(psErrorCodeLast(), false, "Unable to match PSFs.");
-        success = false;
-        goto ESCAPE;
-      }
-    }
-
+    if (!ppSubMatchPSFs(data)) {
+        psError(psErrorCodeLast(), false, "Unable to match PSFs.");
+        success = false;
+        goto ESCAPE;
+    }
 
     if (data->quality) {
@@ -138 +134 @@
                      psTimerClear("PPSUB_MATCH"));
 
-    // Close input files
+    // Close input files (freeing up space) : for the noConvolve case, we cannot close the
+    // inputs since we will use them for subtraction below.  wait until later to do the work
     if (!noConvolve) {
-    if (!ppSubFilesIterateUp(config, PPSUB_FILES_INPUT)) {
-        psError(PPSUB_ERR_IO, false, "Unable to close input files.");
-        success = false;
-        goto ESCAPE;
-    }
+        if (!ppSubFilesIterateUp(config, PPSUB_FILES_INPUT)) {
+            psError(PPSUB_ERR_IO, false, "Unable to close input files.");
+            success = false;
+            goto ESCAPE;
+        }
     }
     if (!ppSubLowThreshold(data)) {
@@ -165 +162 @@
     }
 
-    if (!noConvolve) {
     if (!data->quality && !ppSubMakePSF(data)) {
         psError(psErrorCodeLast(), false, "Unable to generate PSF.");
@@ -171 +167 @@
         goto ESCAPE;
     }
-    }
+
     // Now we've got a PSF, blow away detections in case they're confused with real output detections
     {
@@ -197 +193 @@
     // dumpout(config, "diff.2a.fits");
     if (noConvolve) {
-      if (!ppSubFilesIterateUp(config, PPSUB_FILES_INPUT)) {
-        psError(PPSUB_ERR_IO, false, "Unable to close input files.");
-        success = false;
-        goto ESCAPE;
-      }
+        if (!ppSubFilesIterateUp(config, PPSUB_FILES_INPUT)) {
+            psError(PPSUB_ERR_IO, false, "Unable to close input files.");
+            success = false;
+            goto ESCAPE;
+        }
     }
     
@@ -271 +267 @@
     // Do Mask Stats
     {
-      pmFPAview *view = ppSubViewReadout(); // View to readout
-      if (!ppSubMaskStats(config, view,data->stats)) {
-        psError(psErrorCodeLast(), false, "Unable to generate mask statistics");
-        success = false;
-        psFree(view);
-        goto ESCAPE;
-      }
-      psFree(view);
+        pmFPAview *view = ppSubViewReadout(); // View to readout
+        if (!ppSubMaskStats(config, view,data->stats)) {
+            psError(psErrorCodeLast(), false, "Unable to generate mask statistics");
+            success = false;
+            psFree(view);
+            goto ESCAPE;
+        }
+        psFree(view);
     }
     // dumpout(config, "diff.4.fits");
@@ -344 +340 @@
     }
 
-ESCAPE:
+ ESCAPE:
     pmFPAfileDropInternal(config->files, "PSPHOT.BACKGND");
     pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL");

tags/ipp-20111110/ppSub/src/ppSubMakePSF.c

@@ -46 +46 @@
     bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
 
-    if (!noConvolve) {
-      printf("Using Convolved images because NOCONVOLVE is FALSE\n");
-      if (reverse) {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF.CONV");
-      } else {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT.CONV");
-      }
-    }
-    else {
-      psWarning("Not using Convolved images because NOCONVOLVE  is TRUE\n");
-      if (reverse) {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF");
-      } else {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT");
-      }
+    if (noConvolve) {
+        // if we do not convolve, we need to copy the detections to the image for analysis
+        pmReadout *psfSourcesRO = NULL; // readout containing loaded sources for psf model
+        psWarning("Not using Convolved images because NOCONVOLVE  is TRUE\n");
+        if (reverse) {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF");
+            psfSourcesRO = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.SOURCES");
+        } else {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT");
+            psfSourcesRO = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.SOURCES");
+        }
+        psAssert (psfSourcesRO, "missing readout with sources");
+        pmDetections *psfDetections = psMetadataLookupPtr(&mdok, psfSourcesRO->analysis,  "PSPHOT.DETECTIONS");
+        psMetadataAddPtr(minuend->analysis,  PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "Merged source list", psfDetections);
+    } else {
+        printf("Using Convolved images because NOCONVOLVE is FALSE\n");
+        if (reverse) {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF.CONV");
+        } else {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT.CONV");
+        }
     }
 

tags/ipp-20111110/ppSub/src/ppSubMatchPSFs.c

@@ -201 +201 @@
 bool ppSubMatchPSFs(ppSubData *data)
 {
+    bool mdok = false;
+
     psAssert(data, "Require processing data");
     pmConfig *config = data->config;    // Configuration
@@ -208 +210 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
     psAssert(recipe, "We checked this earlier, so it should be here.");
+
+    bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
+    if (noConvolve) {
+        psWarning("not matching PSFs because NOCONVOLVE is TRUE\n");
+        return true;
+    }
 
     pmFPAview *view = ppSubViewReadout(); // View to readout
@@ -228 +236 @@
         psFree(refConv);
     }
-
-    bool mdok;                          // Status of MD lookup
 
     // Load pre-calculated kernel, if available