Changeset 31441 for branches/eam_branches/ipp-20110404/ppSub/src/ppSubLoop.c

Timestamp:

May 5, 2011, 10:08:44 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ppSub/src/ppSubLoop.c (modified) (6 diffs)

branches/eam_branches/ipp-20110404/ppSub/src/ppSubLoop.c

@@ -107 +107 @@
 
     // XXX if it exists, use the POS1, POS2 successs for the FWHMs
-    if (!ppSubMatchPSFs(data)) {
+    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 (data->quality) {
@@ -132 +139 @@
 
     // Close input files
+    if (!noConvolve) {
     if (!ppSubFilesIterateUp(config, PPSUB_FILES_INPUT)) {
         psError(PPSUB_ERR_IO, false, "Unable to close input files.");
@@ -137 +145 @@
         goto ESCAPE;
     }
-
+    }
     if (!ppSubLowThreshold(data)) {
         psError(psErrorCodeLast(), false, "Unable to threshold images.");
@@ -157 +165 @@
     }
 
+    if (!noConvolve) {
     if (!data->quality && !ppSubMakePSF(data)) {
         psError(psErrorCodeLast(), false, "Unable to generate PSF.");
@@ -162 +171 @@
         goto ESCAPE;
     }
-
+    }
     // Now we've got a PSF, blow away detections in case they're confused with real output detections
     {
@@ -187 +196 @@
     }
     // 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;
+      }
+    }
+    
     // Higher order background subtraction using psphot
     if (!ppSubBackground(config)) {