Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageDetrendReadout.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppImage (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppImage/src/ppImageDetrendReadout.c (modified) (9 diffs)

branches/cnb_branches/cnb_branch_20090301/ppImage/src

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageDetrendReadout.c

@@ -17 +17 @@
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
     if (options->doMaskBuild) {
-        pmReadoutGenerateMask(input, options->satMask, options->badMask);
+        psImageMaskType satMask = options->doMaskSat ? options->satMask : 0;
+        psImageMaskType lowMask = options->doMaskLow ? options->lowMask : 0;
+        pmReadoutGenerateMask(input, satMask, lowMask);
     }
     // apply the externally supplied mask to the input->mask pixels
@@ -54 +56 @@
         if (!pmBiasSubtract(input, options->overscan, bias, oldDark, view)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to subtract bias.");
-            psFree(detview);
+            psFree(detview);
             return false;
         }
@@ -66 +68 @@
 
     if (options->doDark && dark) {
-        if (!pmDarkApply(input, dark, options->maskValue)) {
+        if (!pmDarkApply(input, dark, options->darkMask)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to subtract dark.");
-            psFree(detview);
+            psFree(detview);
             return false;
         }
@@ -74 +76 @@
 
     if (options->doRemnance) {
-        if (!pmRemnance(input, options->maskValue, options->badMask,
+        if (!pmRemnance(input, options->maskValue, options->lowMask,
                         options->remnanceSize, options->remnanceThresh)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to mask remnance.");
-            psFree(detview);
+            psFree(detview);
             return false;
         }
@@ -86 +88 @@
         pmReadout *shutter = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.SHUTTER");
         if (!pmShutterCorrectionApply(input, shutter, pmConfigMaskGet("FLAT", config))) {
-            psFree(detview);
+            psFree(detview);
             return false;
         }
@@ -95 +97 @@
         pmReadout *flat = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.FLAT");
         if (!pmFlatField(input, flat, options->flatMask)) {
-            psFree(detview);
+            psFree(detview);
             return false;
         }
@@ -117 +119 @@
     psMetadata *normlist = psMetadataLookupMetadata(&mdok, config->arguments, "NORMALIZATION.TABLE");
     if (normlist) {
-        pmFPAfile *inputFile = psMetadataLookupPtr(&mdok, config->files, "PPIMAGE.INPUT");
+        pmFPAfile *inputFile = psMetadataLookupPtr(&mdok, config->files, "PPIMAGE.INPUT");
 
-        // get the menu of class IDs
-        psMetadata *menu = psMetadataLookupMetadata(&mdok, inputFile->camera, "CLASSID"); 
+        // get the menu of class IDs
+        psMetadata *menu = psMetadataLookupMetadata(&mdok, inputFile->camera, "CLASSID");
         if (!menu) {
             psError(PS_ERR_IO, false, "Unable to find CLASSID metadata in camera configuration");
-            psFree(detview);
+            psFree(detview);
             return false;
         }
-        // get the rule for class_id for the desired class
-        const char *rule = psMetadataLookupStr(&mdok, menu, options->normClass); 
+        // get the rule for class_id for the desired class
+        const char *rule = psMetadataLookupStr(&mdok, menu, options->normClass);
         if (!rule) {
             psError(PS_ERR_IO, false, "Unable to find NORM.CLASS value %s in CLASSID in camera configuration", options->normClass);
-            psFree(detview);
+            psFree(detview);
             return false;
         }
-        // get the class_id from the rule
+        // get the class_id from the rule
         char *classID = pmFPAfileNameFromRule(rule, inputFile, view);
         if (!classID) {
             psError(PS_ERR_IO, false, "error converting CLASSID rule %s to name\n", rule);
-            psFree(detview);
+            psFree(detview);
             return false;
         }
 
-        // get normalization from the class_id
-        float norm = psMetadataLookupF32 (&mdok, normlist, classID);
+        // get normalization from the class_id
+        float norm = psMetadataLookupF32 (&mdok, normlist, classID);
+        if (!mdok) {
+            psError(PS_ERR_IO, false, "failed to find class ID %s in normalization table\n", classID);
+            psFree(detview);
+            return false;
+        }
 
         pmHDU *hdu = pmHDUFromReadout(input); // HDU of interest
@@ -150 +157 @@
         psFree(comment);
 
-        // apply the normalization
+        // apply the normalization
         psBinaryOp(input->image, input->image, "*", psScalarAlloc(norm, PS_TYPE_F32));
 
-        psFree (classID);
+        psFree (classID);
     }
 # endif
@@ -160 +167 @@
         pmCell *fringe = pmFPAfileThisCell(config->files, detview, "PPIMAGE.FRINGE");
         if (!ppImageDetrendFringeMeasure(input, fringe, false, options)) {
-            psFree(detview);
+            psFree(detview);
             return false;
         }

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h