Changeset 37080 for trunk

Timestamp:

Jul 17, 2014, 2:28:55 PM (12 years ago)

Author:

eugene

Message:

added some commented-out lines

File:

• trunk/ppSub/src/ppSubMatchPSFs.c (modified) (9 diffs)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -167 +167 @@
     }
 
-    // we need to register the FWHM values for use downstream 
+    // we need to register the FWHM values for use downstream
     pmSubtractionSetFWHMs(inFWHM, refFWHM);
 
@@ -220 +220 @@
     bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
     if (noConvolve) {
-        psWarning("not matching PSFs because NOCONVOLVE is TRUE\n");
-        return true;
+        psWarning("not matching PSFs because NOCONVOLVE is TRUE\n");
+        return true;
     }
 
@@ -235 +235 @@
         pmCell *cell = pmFPAfileThisCell(config->files, view, "PPSUB.INPUT.CONV"); // Cell for convolved input
         inConv = pmReadoutAlloc(cell);
-        psFree(inConv);
+        psFree(inConv);
     }
     pmReadout *refConv = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); // Reference convolved
@@ -241 +241 @@
         pmCell *cell = pmFPAfileThisCell(config->files, view, "PPSUB.REF.CONV"); // Cell for convolved ref.
         refConv = pmReadoutAlloc(cell);
-        psFree(refConv);
+        psFree(refConv);
     }
 
@@ -269 +269 @@
         lists->data[0] = psMemIncrRefCounter(inSources);
         lists->data[1] = psMemIncrRefCounter(refSources);
-        // XXX MEH changed to get only match (true to cull single), no apparent need of unmatched sources and can cause trouble
+        // XXX MEH changed to get only match (true to cull single), no apparent need of unmatched sources and can cause trouble
         detections->allSources = pmSourceMatchMerge(lists, radius, true);
         psFree(lists);
@@ -365 +365 @@
         subMode = PM_SUBTRACTION_MODE_DUAL;
     } else {
-        char *convolveName = psMetadataLookupStr(&mdok, recipe, "CONVOLVE.TARGET"); // recipe value for target
+        char *convolveName = psMetadataLookupStr(&mdok, recipe, "CONVOLVE.TARGET"); // recipe value for target
         int convolve = psMetadataLookupS32(&mdok, config->arguments, "-convolve"); // override with command-line option
-        switch (convolve) {
-          case 0:
-            // convolve is 0 if it is not supplied on the command line
-            subMode = subModeFromString(convolveName);
-            break;
-          case 1:
-            subMode = PM_SUBTRACTION_MODE_1;
-            break;
-          case 2:
-            subMode = PM_SUBTRACTION_MODE_2;
-            break;
-          default:
-            psError(PPSUB_ERR_ARGUMENTS, false, "Invalid value for -convolve");
-            return false;
-        }
+        switch (convolve) {
+          case 0:
+            // convolve is 0 if it is not supplied on the command line
+            subMode = subModeFromString(convolveName);
+            break;
+          case 1:
+            subMode = PM_SUBTRACTION_MODE_1;
+            break;
+          case 2:
+            subMode = PM_SUBTRACTION_MODE_2;
+            break;
+          default:
+            psError(PPSUB_ERR_ARGUMENTS, false, "Invalid value for -convolve");
+            return false;
+        }
     }
 
@@ -397 +397 @@
         psKernel *truncated = psImageCovarianceTruncate(inRO->covariance, COVAR_FRAC);
         psFree(inRO->covariance);
-        inRO->covariance = truncated;
+        inRO->covariance = truncated;
     }
     if (refRO->covariance) {
         psKernel *truncated = psImageCovarianceTruncate(refRO->covariance, COVAR_FRAC);
         psFree(refRO->covariance);
-        refRO->covariance = truncated;
+        refRO->covariance = truncated;
     }
 
@@ -458 +458 @@
             ppSubDataQuality(data, error, PPSUB_FILES_ALL);
             return true;
+        // XX } else if (error == PM_ERR_DATA) {
+        // XX     psErrorStackPrint(stderr, "Unable to solve for the kernel to match images");
+        // XX     psWarning("Failed to find PSF match kernel --- suspect bad data quality.");
+        // XX     ppSubDataQuality(data, error, PPSUB_FILES_ALL);
+        // XX     return true;
         } else {
             psError(PPSUB_ERR_DATA, false, "Unable to match images.");
@@ -515 +520 @@
         psKernel *truncated = psImageCovarianceTruncate(inConv->covariance, COVAR_FRAC);
         psFree(inConv->covariance);
-        inConv->covariance = truncated;
+        inConv->covariance = truncated;
     }
     if (refConv->covariance) {
         psKernel *truncated = psImageCovarianceTruncate(refConv->covariance, COVAR_FRAC);
         psFree(refConv->covariance);
-        refConv->covariance = truncated;
+        refConv->covariance = truncated;
     }