Changeset 29593

Timestamp:

Oct 28, 2010, 5:38:54 PM (16 years ago)

Author:

eugene

Message:

add CONVOL_MAX to output fields; remove unneeded abort: if kernel is supplied, we do not need to determine and supply the FWHMs (they are only used for generating the kernel)

Location:

trunk/ppSub/src

Files:

• ppSubMatchPSFs.c (modified) (2 diffs)
• ppSubReadoutStats.c (modified) (1 diff)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -110 +110 @@
     pmReadout *kernelRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT.KERNELS"); // RO with kernel
     if (kernelRO) {
-        psAbort("we probably need to set the FWHM values");
         psFree(view);
         return true;
@@ -306 +305 @@
     int binning = psMetadataLookupS32(NULL, recipe, "SPAM.BINNING"); // Binning for SPAM kernel
     float penalty = psMetadataLookupF32(NULL, recipe, "PENALTY"); // Penalty for wideness
+
     int iter = psMetadataLookupS32(NULL, recipe, "ITER"); // Rejection iterations
     float rej = psMetadataLookupF32(NULL, recipe, "REJ"); // Rejection threshold

trunk/ppSub/src/ppSubReadoutStats.c

@@ -46 +46 @@
     psMetadataCopySingle(data->stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MYY);
     psMetadataCopySingle(data->stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DECONV_MAX);
+    psMetadataCopySingle(data->stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_CONVOL_MAX);
 
     return true;