Changeset 30118 for branches/czw_branch/20101203/ppImage

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)
• ppImage/src/ppImageOptions.c (modified) (2 diffs)
• ppImage/src/ppImagePhotom.c (modified) (4 diffs)
• ppImage/src/ppImageStatsOutput.c (modified) (1 diff)

branches/czw_branch/20101203/ppImage/src/ppImageDetrendReadout.c

@@ -62 +62 @@
     // Non-linearity correction
     if (options->doNonLin) {
-      //      linearity = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.LINEARITY");
       if (!ppImageDetrendNonLinear(input,detview,config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to correct NonLinearity");
@@ -68 +67 @@
         return(false);
       }
-      /*       ppImageDetrendNonLinear(detrend->input, input, options); */
     }
 

branches/czw_branch/20101203/ppImage/src/ppImageOptions.c

@@ -216 +216 @@
 
     // for these images, even if not required otherwise
-    options->doMaskBuild = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
-    options->doMaskSat   = psMetadataLookupBool(NULL, recipe, "MASK.SATURATED");
-    options->doMaskLow   = psMetadataLookupBool(NULL, recipe, "MASK.LOW");
-    options->doMaskBurntool = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
+    options->doMaskBuild     = psMetadataLookupBool(NULL, recipe, "MASK.BUILD");
+    options->doMaskSat       = psMetadataLookupBool(NULL, recipe, "MASK.SATURATED");
+    options->doMaskLow       = psMetadataLookupBool(NULL, recipe, "MASK.LOW");
+    options->doMaskBurntool  = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
     options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
 
@@ -301 +301 @@
     options->checkCTE       = psMetadataLookupBool(NULL, recipe, "CHECK.CTE");
 
-    // even if not requested explicitly, if any of these are set, build an internal mask and variance:
-    if (options->doNoiseMap || options->doBias || options->doOverscan || options->doDark || options->doShutter || options->doFlat ||
-        options->doPhotom) {
+    /* doMaskBuild : there are some cases where we require a mask, so we force doMaskBuild to be set even if the user specified 'FALSE'
+     *
+     * doPhotom : a mask is required because it is used to mark the locations of stars
+     *
+     * doNoiseMap : no reason this needs to trigger a mask?
+     * doBias : no reason this needs to trigger a mask?
+     * doOverscan : no reason this needs to trigger a mask?
+     * doDark : no reason this needs to trigger a mask?
+     * doShutter : no reason this needs to trigger a mask?
+     * doFlat : no reason this needs to trigger a mask?
+     */
+
+    // if the variance image is requested, build it (if not supplied)
+    if (options->BaseVarianceFITS || options->ChipVarianceFITS) {
+        options->doVarianceBuild = true;
+    } 
+    // photometry and noisemap both require a variance image
+    if (options->doNoiseMap || options->doPhotom) {
+        options->doVarianceBuild = true;
+    } 
+
+    // we need a mask if we are going to apply these things:
+    if (options->doMaskSat || options->doMaskLow || options->doMaskBurntool || options->doMaskStats) {
         options->doMaskBuild = true;
-        options->doVarianceBuild = true;
-    } else if (options->doMask || options->doBG) {
+    }
+    // photometry, mask, and background all require a mask image
+    if (options->doMask || options->doBG || options->doPhotom) {
         options->doMaskBuild = true;
     }

branches/czw_branch/20101203/ppImage/src/ppImagePhotom.c

@@ -11 +11 @@
     pmCell *cell;
     pmReadout *readout;
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     psphotInit();
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     // find or define a pmFPAfile PSPHOT.INPUT
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
@@ -20 +20 @@
         return false;
     }
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     // we make a new copy of the output chip to keep psphot from modifying the output image
     pmChip *oldChip = pmFPAviewThisChip (view, input->src);
     pmChip *newChip = pmFPAviewThisChip (view, input->fpa);
     pmChipCopy (newChip, oldChip);
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     // iterate over the cells and readout for this chip
     while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
@@ -34 +34 @@
         while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
             if (! readout->data_exists) { continue; }
-            printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
             // run the actual photometry analysis
-            if (!psphotReadout (config, view)) {
+            if (!psphotReadout (config, view, "PSPHOT.INPUT")) {
                 // This is likely a data quality issue
                 // XXX Split into multiple cases using error codes?
@@ -60 +60 @@
     ppImageMemoryDump("photom");
 
-    // the PSPHOT.INPUT file is a temporary file used to carry PPIMAGE.CHIP to psphotReadout
-    // XXX not sure that this is needed...
-//    pmFPAfileActivate (config->files, false, "PSPHOT.INPUT");
-
     return true;
 }
-
-// XXX do we need to deactivate all files and activate the psphot ones explicitly?

branches/czw_branch/20101203/ppImage/src/ppImageStatsOutput.c

@@ -28 +28 @@
         return false;
     }
-    if (!psMetadataConfigWrite(stats, resolved)) {
+
+    // check for Metadata compression options:
+    char *compressMode = NULL;
+    bool status = false;
+    if (config->camera) {
+        // XXX use a different config variable for this output?
+        compressMode = psMetadataLookupStr(&status, config->camera, "METADATA.COMPRESSION");
+    }
+
+    if (!psMetadataConfigWrite(stats, resolved, compressMode)) {
         psError(psErrorCodeLast(), false, "Unable to serialize stats metadata.\n");
         psFree(resolved);