Changeset 13609

Timestamp:

Jun 3, 2007, 4:28:50 PM (19 years ago)

Author:

eugene

Message:

cleanup satMask, badMask

File:

• trunk/psphot/src/psphotReadout.c (modified) (2 diffs)

trunk/psphot/src/psphotReadout.c

@@ -6 +6 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
     if (!recipe) {
         psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
@@ -24 +24 @@
 
     // generate mask & weight images if they don't already exit
-    if ((!readout->mask && !pmReadoutGenerateMask(readout, pmConfigMask("SAT", config),
-                                                  pmConfigMask("BAD", config))) ||
-        (!readout->weight && !pmReadoutGenerateWeight(readout, true))) {
-        psError (PSPHOT_ERR_CONFIG, false, "trouble creating mask and/or weight");
-        return false;
+    psMaskType satMask = pmConfigMask("SAT", config);
+    psMaskType badMask = pmConfigMask("BAD", config);
+    if (!readout->mask) {
+        if (!pmReadoutGenerateMask(readout, satMask, badMask)) {
+            psError (PSPHOT_ERR_CONFIG, false, "trouble creating mask");
+            return false;
+        }
+    }
+    if (!readout->weight) {
+        if (!pmReadoutGenerateWeight(readout, true)) {
+            psError (PSPHOT_ERR_CONFIG, false, "trouble creating weight");
+            return false;
+        }
     }