Changeset 21374 for trunk/ppSub/src/ppSubVarianceFactors.c

Timestamp:

Feb 5, 2009, 5:20:02 PM (17 years ago)

Author:

Paul Price

Message:

Updating to work following merge of pap_branch_20090128. Compiles, but not tested.

File:

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

trunk/ppSub/src/ppSubVarianceFactors.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:37:17 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 03:20:02 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -40 +40 @@
     pmSubtractionKernels *kernels = psMetadataLookupPtr(&mdok, outRO->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL); // Kernels
     if (!mdok) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find subtraction kernels.");
-        return false;
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find subtraction kernels.");
+        return false;
     }
 
     float vfIn = psMetadataLookupF32(NULL, inCell->concepts, "CELL.VARFACTOR"); // Variance factor for input
     if (!isfinite(vfIn)) {
-        vfIn = 1.0;
+        vfIn = 1.0;
     }
     float vfRef = psMetadataLookupF32(NULL, refCell->concepts, "CELL.VARFACTOR"); // Variance factor for ref
     if (!isfinite(vfRef)) {
-        vfRef = 1.0;
+        vfRef = 1.0;
     }
 
     if (kernels->mode == PM_SUBTRACTION_MODE_1) {
-        vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false);
+        vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false);
     }
     if (kernels->mode == PM_SUBTRACTION_MODE_2) {
-        vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false);
-    } 
+        vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false);
+    }
     if (kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
-        vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false);
-        vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, true);
+        vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false);
+        vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, true);
     }
 
@@ -72 +72 @@
 
     // measure the mean of the convolved input variance image
-    if (!psImageBackground(vfStats, NULL, inConv->weight, inConv->mask, maskVal | maskBad, rng)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved input");
-        psFree(vfStats);
-        psFree(rng);
-        return false;
+    if (!psImageBackground(vfStats, NULL, inConv->variance, inConv->mask, maskVal | maskBad, rng)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved input");
+        psFree(vfStats);
+        psFree(rng);
+        return false;
     }
     float inMeanVar = vfStats->robustMedian; // Mean variance of input
 
     // measure the mean of the convolved reference variance image
-    if (!psImageBackground(vfStats, NULL, refConv->weight, refConv->mask, maskVal | maskBad, rng)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved reference");
-        psFree(vfStats);
-        psFree(rng);
-        return false;
+    if (!psImageBackground(vfStats, NULL, refConv->variance, refConv->mask, maskVal | maskBad, rng)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved reference");
+        psFree(vfStats);
+        psFree(rng);
+        return false;
     }
     float refMeanVar = vfStats->robustMedian; // Mean variance of reference
@@ -98 +98 @@
     // Statistics on the matching
     if (stats) {
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_MEAN);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_RMS);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_NORM);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_BGDIFF);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MX);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MY);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXX);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXY);
-        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MYY);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_MEAN);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_RMS);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_NORM);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_BGDIFF);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MX);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MY);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXX);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXY);
+        psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MYY);
 
-        psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_MATCH", 0, "Time to match PSFs",
-                         psTimerClear("PPSUB_MATCH"));
+        psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_MATCH", 0, "Time to match PSFs",
+                         psTimerClear("PPSUB_MATCH"));
     }
-    
+
     return true;
 }