Changeset 21374 for trunk/ppSub/src/ppSubReadoutRenorm.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/ppSubReadoutRenorm.c (modified) (4 diffs)

trunk/ppSub/src/ppSubReadoutRenorm.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
  */
@@ -23 +23 @@
     psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe, "RENORM.STDEV"));
     if (renormMean == PS_STAT_NONE || renormStdev == PS_STAT_NONE) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "Unable to parse renormalisation statistics from recipe.");
-        return false;
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "Unable to parse renormalisation statistics from recipe.");
+        return false;
     }
     psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
-    if (!pmReadoutWeightRenormPixels(readout, maskValue, renormMean, renormStdev, NULL)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-        return false;
+    if (!pmReadoutVarianceRenormPixels(readout, maskValue, renormMean, renormStdev, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
+        return false;
     }
     return true;
@@ -48 +48 @@
     psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe, "RENORM.STDEV"));
     if (renormMean == PS_STAT_NONE || renormStdev == PS_STAT_NONE) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "Unable to parse renormalisation statistics from recipe.");
-        return false;
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "Unable to parse renormalisation statistics from recipe.");
+        return false;
     }
 
@@ -58 +58 @@
 
     psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
-    if (!pmReadoutWeightRenormPhot(readout, maskValue, renormNum, renormWidth, renormMean, renormStdev, NULL)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-        return false;
+    if (!pmReadoutVarianceRenormPhot(readout, maskValue, renormNum, renormWidth, renormMean, renormStdev, NULL)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
+        return false;
     }
     return true;