Changeset 21217

Timestamp:

Jan 28, 2009, 5:12:09 PM (17 years ago)

Author:

Paul Price

Message:

Convering 'weight' to 'variance' where appropriate. Mostly just propagating changes from psModules. Fixed some mask types as well.

Location:

branches/pap_branch_20090128/ppImage/src

Files:

• ppImage.h (modified) (3 diffs)
• ppImageDetrendReadout.c (modified) (1 diff)
• ppImageFileCheck.c (modified) (4 diffs)
• ppImageOptions.c (modified) (5 diffs)
• ppImageParseCamera.c (modified) (8 diffs)

branches/pap_branch_20090128/ppImage/src/ppImage.h

@@ -25 +25 @@
     // actions which ppImage should perform
     bool doMaskBuild;                   // Build internal mask
-    bool doWeightBuild;                   // Build internal mask
+    bool doVarianceBuild;               // Build internal variance map
     bool doMask;                        // Mask bad pixels
     bool doNonLin;                      // Non-linearity correction
@@ -44 +44 @@
     bool BaseFITS;
     bool BaseMaskFITS;
-    bool BaseWeightFITS;
+    bool BaseVarianceFITS;
 
     bool ChipFITS;
     bool ChipMaskFITS;
-    bool ChipWeightFITS;
+    bool ChipVarianceFITS;
 
     bool FPA1FITS;
@@ -58 +58 @@
 
     // make values for abstract concepts of masking
-    psMaskType maskValue;               // apply this bit-mask to choose masked bits
-    psMaskType markValue;               // apply this bit-mask to choose masked bits
-    psMaskType satMask;                 // Mask value to give saturated pixels
-    psMaskType badMask;                 // Mask value to give bad pixels
-    psMaskType flatMask;                // Mask value to give bad flat pixels
-    psMaskType blankMask;               // Mask value to give blank pixels
+    psImageMaskType maskValue;          // apply this bit-mask to choose masked bits
+    psImageMaskType markValue;          // apply this bit-mask to choose masked bits
+    psImageMaskType satMask;            // Mask value to give saturated pixels
+    psImageMaskType badMask;            // Mask value to give bad pixels
+    psImageMaskType flatMask;           // Mask value to give bad flat pixels
+    psImageMaskType blankMask;          // Mask value to give blank pixels
 
     // non-linear correction parameters

branches/pap_branch_20090128/ppImage/src/ppImageDetrendReadout.c

@@ -59 +59 @@
 
     // Weight on the basis of pixel value needs to be done after the overscan has been subtracted
-    if (options->doWeightBuild) {
-        // create the target mask and weight images
-        pmReadoutGenerateWeight(input, true);
+    if (options->doVarianceBuild) {
+        // create the target mask and variance images
+        pmReadoutGenerateVariance(input, true);
     }
 

branches/pap_branch_20090128/ppImage/src/ppImageFileCheck.c

@@ -20 +20 @@
         if (fpa->hdu) {
             if (fpa->hdu->images) fprintf (stderr, "  (%d,%d) images\n", -1, -1);
-            if (fpa->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", -1, -1);
+            if (fpa->hdu->variances) fprintf (stderr, "  (%d,%d) variances\n", -1, -1);
             if (fpa->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", -1, -1);
             if (fpa->hdu->header) fprintf (stderr, "  (%d,%d) header\n", -1, -1);
@@ -30 +30 @@
             if (chip->hdu) {
                 if (chip->hdu->images) fprintf (stderr, "  (%d,%d) images\n", i, -1);
-                if (chip->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", i, -1);
+                if (chip->hdu->variances) fprintf (stderr, "  (%d,%d) variances\n", i, -1);
                 if (chip->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", i, -1);
                 if (chip->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, -1);
@@ -40 +40 @@
                 if (cell->hdu) {
                     if (cell->hdu->images) fprintf (stderr, "  (%d,%d) images\n", i, j);
-                    if (cell->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", i, j);
+                    if (cell->hdu->variances) fprintf (stderr, "  (%d,%d) variances\n", i, j);
                     if (cell->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", i, j);
                     if (cell->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, j);
@@ -50 +50 @@
                     if (readout) {
                         if (readout->image) fprintf (stderr, "  (%d,%d,%d) image\n", i, j, k);
-                        if (readout->weight) fprintf (stderr, "  (%d,%d,%d) weight\n", i, j, k);
+                        if (readout->variance) fprintf (stderr, "  (%d,%d,%d) variance\n", i, j, k);
                         if (readout->mask) fprintf (stderr, "  (%d,%d,%d) masks\n", i, j, k);
                     }

branches/pap_branch_20090128/ppImage/src/ppImageOptions.c

@@ -19 +19 @@
     // actions which ppImage should perform
     options->doMaskBuild     = false;   // Build internal mask
-    options->doWeightBuild   = false;   // Build internal weight
+    options->doVarianceBuild   = false;   // Build internal variance
     options->doMask          = false;   // Mask bad pixels
     options->doNonLin        = false;   // Non-linearity correction
@@ -37 +37 @@
     options->BaseFITS        = false;   // create output image
     options->BaseMaskFITS    = false;   // create output mask image
-    options->BaseWeightFITS  = false;   // create output weight image
+    options->BaseVarianceFITS  = false;   // create output variance image
 
     options->ChipFITS        = false;   // create output chip-mosaic image
     options->ChipMaskFITS    = false;   // create output chip-mosaic mask image
-    options->ChipWeightFITS  = false;   // create output chip-mosaic weight image
+    options->ChipVarianceFITS  = false;   // create output chip-mosaic variance image
 
     options->FPA1FITS        = false;   // create fpa-mosaic binned image (scale 1)
@@ -194 +194 @@
     // for these images, even if not required otherwise
     options->doMaskBuild = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
-    options->doWeightBuild = psMetadataLookupBool(NULL, recipe, "WEIGHT.BUILD");
+    options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
 
     // Mask recipe options (note that mask bit values are set in ppImageSetMaskBits.c)
@@ -236 +236 @@
     options->BaseFITS       = psMetadataLookupBool(NULL, recipe, "BASE.FITS");
     options->BaseMaskFITS   = psMetadataLookupBool(NULL, recipe, "BASE.MASK.FITS");
-    options->BaseWeightFITS = psMetadataLookupBool(NULL, recipe, "BASE.WEIGHT.FITS");
+    options->BaseVarianceFITS = psMetadataLookupBool(NULL, recipe, "BASE.VARIANCE.FITS");
 
     options->ChipFITS       = psMetadataLookupBool(NULL, recipe, "CHIP.FITS");
     options->ChipMaskFITS   = psMetadataLookupBool(NULL, recipe, "CHIP.MASK.FITS");
-    options->ChipWeightFITS = psMetadataLookupBool(NULL, recipe, "CHIP.WEIGHT.FITS");
+    options->ChipVarianceFITS = psMetadataLookupBool(NULL, recipe, "CHIP.VARIANCE.FITS");
 
     options->FPA1FITS       = psMetadataLookupBool(NULL, recipe, "FPA1.FITS");
@@ -255 +255 @@
     options->doBG           = psMetadataLookupBool(NULL, recipe, "BACKGROUND");
 
-    // even if not requested explicitly, if any of these are set, build an internal mask and weight:
+    // even if not requested explicitly, if any of these are set, build an internal mask and variance:
     if (options->doBias || options->doOverscan || options->doDark || options->doShutter || options->doFlat ||
         options->doPhotom) {
         options->doMaskBuild = true;
-        options->doWeightBuild = true;
+        options->doVarianceBuild = true;
     } else if (options->doMask || options->doBG) {
         options->doMaskBuild = true;

branches/pap_branch_20090128/ppImage/src/ppImageParseCamera.c

@@ -20 +20 @@
     }
 
-    // if MASK or WEIGHT was supplied on command line, bind files to 'input'.
-    // the mask and weight will be mosaicked with the image
+    // if MASK or VARIANCE was supplied on command line, bind files to 'input'.
+    // the mask and variance will be mosaicked with the image
     pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.MASK", "PPIMAGE.INPUT.MASK");
     if (!status) {
@@ -34 +34 @@
     }
 
-    pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.WEIGHT", "PPIMAGE.INPUT.WEIGHT");
+    pmFPAfile *inputVariance = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.VARIANCE", "PPIMAGE.INPUT.VARIANCE");
     if (!status) {
         psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
         return NULL;
     }
-    if (inputWeight && inputWeight->type != PM_FPA_FILE_WEIGHT) {
-        psError(PS_ERR_IO, true, "PPIMAGE.INPUT.WEIGHT is not of type WEIGHT");
+    if (inputVariance && inputVariance->type != PM_FPA_FILE_VARIANCE) {
+        psError(PS_ERR_IO, true, "PPIMAGE.INPUT.VARIANCE is not of type VARIANCE");
         return NULL;
     }
@@ -195 +195 @@
         return NULL;
     }
-    pmFPAfile *outWeight = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT.WEIGHT");
-    if (!outWeight) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.OUTPUT.WEIGHT"));
-        psFree(options);
-        return NULL;
-    }
-    if (outWeight->type != PM_FPA_FILE_WEIGHT) {
-        psError(PS_ERR_IO, true, "PPIMAGE.OUTPUT.WEIGHT is not of type WEIGHT");
+    pmFPAfile *outVariance = pmFPAfileDefineOutput(config, input->fpa, "PPIMAGE.OUTPUT.VARIANCE");
+    if (!outVariance) {
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.OUTPUT.VARIANCE"));
+        psFree(options);
+        return NULL;
+    }
+    if (outVariance->type != PM_FPA_FILE_VARIANCE) {
+        psError(PS_ERR_IO, true, "PPIMAGE.OUTPUT.VARIANCE is not of type VARIANCE");
         psFree(options);
         return NULL;
@@ -230 +230 @@
         return NULL;
     }
-    pmFPAfile *chipWeight = pmFPAfileDefineOutput(config, chipImage->fpa, "PPIMAGE.CHIP.WEIGHT");
-    if (!chipWeight) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.CHIP.WEIGHT"));
-        psFree(options);
-        return NULL;
-    }
-    if (chipWeight->type != PM_FPA_FILE_WEIGHT) {
-        psError(PS_ERR_IO, true, "PPIMAGE.CHIP.WEIGHT is not of type WEIGHT");
+    pmFPAfile *chipVariance = pmFPAfileDefineOutput(config, chipImage->fpa, "PPIMAGE.CHIP.VARIANCE");
+    if (!chipVariance) {
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.CHIP.VARIANCE"));
+        psFree(options);
+        return NULL;
+    }
+    if (chipVariance->type != PM_FPA_FILE_VARIANCE) {
+        psError(PS_ERR_IO, true, "PPIMAGE.CHIP.VARIANCE is not of type VARIANCE");
         psFree(options);
         return NULL;
@@ -315 +315 @@
     outImage->save   = options->BaseFITS;
     outMask->save    = options->BaseMaskFITS;
-    outWeight->save  = options->BaseWeightFITS;
+    outVariance->save  = options->BaseVarianceFITS;
 
     chipImage->save  = options->ChipFITS;
     chipMask->save   = options->ChipMaskFITS;
-    chipWeight->save = options->ChipWeightFITS;
+    chipVariance->save = options->ChipVarianceFITS;
 
     byFPA1->save     = options->FPA1FITS;
@@ -329 +329 @@
     outImage->fileLevel = PS_MIN (outImage->fileLevel, outImage->dataLevel);
 
-    // outMask and outWeight must be freed at the same level as outImage (all freed by pmFPAFreeData)
+    // outMask and outVariance must be freed at the same level as outImage (all freed by pmFPAFreeData)
     outMask->freeLevel   = outImage->freeLevel;
-    outWeight->freeLevel = outImage->freeLevel;
+    outVariance->freeLevel = outImage->freeLevel;
     outMask->dataLevel   = outImage->dataLevel;
-    outWeight->dataLevel = outImage->dataLevel;
+    outVariance->dataLevel = outImage->dataLevel;
 
     // Ditto for the chip-mosaicked version
     chipMask->freeLevel   = chipImage->freeLevel;
-    chipWeight->freeLevel = chipImage->freeLevel;
+    chipVariance->freeLevel = chipImage->freeLevel;
     chipMask->dataLevel   = chipImage->dataLevel;
-    chipWeight->dataLevel = chipImage->dataLevel;
+    chipVariance->dataLevel = chipImage->dataLevel;
 
     // the input data is the same as the outImage data : force the free levels to match
@@ -434 +434 @@
     }
 
-    // Turn off mask and weight output if we're not doing anything interesting
+    // Turn off mask and variance output if we're not doing anything interesting
     if (!options->doMaskBuild && outMask->save) {
         psWarning("output mask image (BASE.MASK.FITS) requested, but not generated: skipping.\n");
         outMask->save = false;
     }
-    if (!options->doWeightBuild && outWeight->save) {
-        psWarning("output weight image (BASE.WEIGHT.FITS) requested, but not generated: skipping.\n");
-        outWeight->save = false;
+    if (!options->doVarianceBuild && outVariance->save) {
+        psWarning("output variance image (BASE.VARIANCE.FITS) requested, but not generated: skipping.\n");
+        outVariance->save = false;
     }
     if (!options->doMaskBuild && chipMask->save) {
@@ -447 +447 @@
         chipMask->save = false;
     }
-    if (!options->doWeightBuild && chipWeight->save) {
-        psWarning("output weight image (CHIP.WEIGHT.FITS) requested, but not generated: skipping.\n");
-        chipWeight->save = false;
+    if (!options->doVarianceBuild && chipVariance->save) {
+        psWarning("output variance image (CHIP.VARIANCE.FITS) requested, but not generated: skipping.\n");
+        chipVariance->save = false;
     }