Changeset 19704

Timestamp:

Sep 23, 2008, 1:15:34 PM (18 years ago)

Author:

Paul Price

Message:

Cleaning up output analysis metadata construction.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (4 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -212 +212 @@
 
     {
+        if (psMetadataLookup(inConv->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL)) {
+            outRO->analysis = psMetadataCopy(outRO->analysis, inConv->analysis);
+        } else if (psMetadataLookup(refConv->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL)) {
+            outRO->analysis = psMetadataCopy(outRO->analysis, refConv->analysis);
+        } else {
+            psWarning("Unable to find subtraction kernel in analysis metadata.");
+        }
+
         // Update variance factors
         // It's not possible to do this perfectly, since we're combining different images:
@@ -218 +226 @@
         // Instead, we're going to cheat.
         bool mdok;                      // Status of MD lookup
-        pmSubtractionKernels *kernels = psMetadataLookupPtr(&mdok, inConv->analysis,
+        pmSubtractionKernels *kernels = psMetadataLookupPtr(&mdok, outRO->analysis,
                                                             PM_SUBTRACTION_ANALYSIS_KERNEL); // Kernels
-        if (!mdok) {
-            kernels = psMetadataLookupPtr(&mdok, refConv->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL);
-        }
         if (!mdok) {
             psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find subtraction kernels.");
@@ -288 +293 @@
             psMetadataAddF32(stats, PS_LIST_TAIL, "SUBTRACTION.RMS", 0, "RMS stamp deviation",
                              kernels->rms);
-            if (psMetadataLookup(inConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE)) {
-                metadataCopySingle(stats, inConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
-            }
-            if (psMetadataLookup(refConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE)) {
-                metadataCopySingle(stats, refConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
-            }
+            metadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
         }
     }
@@ -336 +336 @@
     outRO->mask = (psImage*)psBinaryOp(outRO->mask, inConv->mask, "|", refConv->mask);
     outRO->data_exists = outCell->data_exists = outCell->parent->data_exists = true; // It'll be there soon
-    if (psMetadataLookup(inRO->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL)) {
-        psMetadataCopy(outRO->analysis, inRO->analysis);
-    } else if (psMetadataLookup(refRO->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL)) {
-        psMetadataCopy(outRO->analysis, refRO->analysis);
-    } else {
-        psWarning("Unable to find subtraction kernel in analysis metadata.");
-    }
 
     // Photometry is to be performed in two stages: