Changeset 21396

Timestamp:

Feb 6, 2009, 2:15:00 PM (17 years ago)

Author:

Paul Price

Message:

Fixing weight --> variance

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (7 diffs)
• ppSubReadoutUpdate.c (modified) (5 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:37:17 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-07 00:15:00 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -182 +182 @@
 bool ppSubArgumentsSetup(int argc, char *argv[], pmConfig *config)
 {
-    int argnum;                         // Argument Number
+    int argnum;                         // Argument Number
     assert(config);
 
@@ -192 +192 @@
 
     if ((argnum = psArgumentGet(argc, argv, "-psphot-visual"))) {
-        psArgumentRemove(argnum, &argc, argv);
-        psphotSetVisual(true);
+        psArgumentRemove(argnum, &argc, argv);
+        psphotSetVisual(true);
     }
 
@@ -200 +200 @@
     psMetadata *arguments = config->arguments; // Command-line arguments
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-inmask", 0, "Input mask image", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-inweight", 0, "Input weight image", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-refmask", 0, "Referencemask image", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-refweight", 0, "Referenceweight image", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-invariance", 0, "Input variance image", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-refmask", 0, "Reference mask image", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-refvariance", 0, "Reference variance image", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-region", 0, "Size of iso-kernel region", NAN);
@@ -226 +226 @@
     psMetadataAddImageMask(arguments,  PS_LIST_TAIL, "-mask-bad", 0, "Mask value for bad pixels", 0);
     psMetadataAddImageMask(arguments,  PS_LIST_TAIL, "-mask-poor", 0, "Mask value for poor pixels", 0);
-    psMetadataAddF32(arguments,  PS_LIST_TAIL, "-poor-frac", 0, "Fraction of weight for poor pixels", NAN);
+    psMetadataAddF32(arguments,  PS_LIST_TAIL, "-poor-frac", 0, "Fraction of variance for poor pixels", NAN);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-badfrac", 0, "Maximum fraction of bad pixels to accept", 1.0);
     psMetadataAddBool(arguments,  PS_LIST_TAIL, "-reverse", 0, "Reverse sense of subtraction?", false);
@@ -265 +265 @@
         fileList("INPUT.MASK", inMask, "Name of the input mask image", config);
     }
-    const char *inWeight = psMetadataLookupStr(NULL, arguments, "-inweight"); // Name of input weight
-    if (inWeight && strlen(inWeight) > 0) {
-        fileList("INPUT.WEIGHT", inWeight, "Name of the input weight image", config);
+    const char *inVariance = psMetadataLookupStr(NULL, arguments, "-invariance"); // Name of input variance
+    if (inVariance && strlen(inVariance) > 0) {
+        fileList("INPUT.VARIANCE", inVariance, "Name of the input variance image", config);
     }
 
@@ -274 +274 @@
         fileList("REF.MASK", refMask, "Name of the reference mask image", config);
     }
-    const char *refWeight = psMetadataLookupStr(NULL, arguments, "-refweight"); // Name of ref weight
-    if (refWeight && strlen(refWeight) > 0) {
-        fileList("REF.WEIGHT", refWeight, "Name of the reference weight image", config);
+    const char *refVariance = psMetadataLookupStr(NULL, arguments, "-refvariance"); // Name of ref variance
+    if (refVariance && strlen(refVariance) > 0) {
+        fileList("REF.VARIANCE", refVariance, "Name of the reference variance image", config);
     }
 

trunk/ppSub/src/ppSubReadoutUpdate.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-07 00:15:00 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -29 +29 @@
     // Renormalising for pixels, because that's what magic desires
     if (!ppSubReadoutRenormPixels (config, recipe, outRO)) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "failure in renormalization");
-        return false;
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "failure in renormalization");
+        return false;
     }
 
@@ -48 +48 @@
     // Generate binned JPEGs
     {
-        psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Bits to mask for bad pixels
+        psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Bits to mask for bad pixels
 
         int bin1 = psMetadataLookupS32(NULL, recipe, "BIN1"); // First binning level
@@ -58 +58 @@
 
         pmReadout *ro1 = pmReadoutAlloc(cell1);
-        pmReadout *ro2 = pmReadoutAlloc(cell2); // Binned readouts
+        pmReadout *ro2 = pmReadoutAlloc(cell2); // Binned readouts
         if (!pmReadoutRebin(ro1, outRO, maskBad, bin1, bin1)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin output (1st binning)");
@@ -79 +79 @@
     {
         psImage *sig = (psImage*)psBinaryOp(NULL, outRO->image, "*", outRO->image);
-        psBinaryOp(sig, sig, "/", outRO->weight);
+        psBinaryOp(sig, sig, "/", outRO->variance);
         psFits *fits = psFitsOpen("significance.fits", "w");
         psFitsWriteImage(fits, NULL, sig, 0, NULL);