Changeset 29926

Timestamp:

Dec 5, 2010, 9:21:36 PM (15 years ago)

Author:

eugene

Message:

support for compressed metadata files; clarify rules for constructing a mask; support for modified psphotReadout API; remove some deprecated comments and test prints

Location:

trunk/ppImage/src

Files:

• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageOptions.c (modified) (1 diff)
• ppImagePhotom.c (modified) (4 diffs)
• ppImageStatsOutput.c (modified) (1 diff)

trunk/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); */
     }
 

trunk/ppImage/src/ppImageOptions.c

@@ -301 +301 @@
     options->checkCTE       = psMetadataLookupBool(NULL, recipe, "CHECK.CTE");
 
+    /* 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?
+     */
+
     // 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) {
-        options->doMaskBuild = true;
+    // XXX we used to automatically generate a mask in all of these cases.
+    // if (options->doNoiseMap || options->doBias || options->doOverscan || options->doDark || options->doShutter || options->doFlat || options->doPhotom) {
+    //     options->doMaskBuild = true;
+    //     options->doVarianceBuild = true;
+    // }
+
+    // photometry and noisemap both require a variance image
+    if (options->doNoiseMap || options->doPhotom) {
         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;
     }

trunk/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?

trunk/ppImage/src/ppImageStatsOutput.c

@@ -28 +28 @@
         return false;
     }
-    if (!psMetadataConfigWrite(stats, resolved)) {
+
+    // check for Metadata compression options:
+    char *compressMode;
+    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);