Changeset 9996 for trunk/ppMerge/src/ppMerge.c

Timestamp:

Nov 14, 2006, 4:49:37 PM (19 years ago)

Author:

Paul Price

Message:

Reorganising shutter stuff to make it fit within the general framework in ppMergeCombine. Adding ppMergeMask to create a bad pixel mask.

File:

• trunk/ppMerge/src/ppMerge.c (modified) (2 diffs)

trunk/ppMerge/src/ppMerge.c

@@ -14 +14 @@
 #include "ppMergeCombine.h"
 #include "ppMergeScaleZero.h"
+#include "ppMergeMask.h"
 
 //#include "ppMem.h"
@@ -45 +46 @@
     }
 
-    // Measure the background in each image
     psImage *scale = NULL;              // The scalings
     psImage *zero = NULL;               // The zeros
-    ppMergeScaleZero(&scale, &zero, data, options, config);
 
-    // Do the combination and write
-    ppMergeCombine(scale, zero, data, options, config);
+    if (options->mask) {
+        // Generate a mask
+        ppMergeMask(data, options, config);
+    } else {
+        // Measure the background in each image
+        ppMergeScaleZero(&scale, &zero, data, options, config);
+
+        // Do the combination and write
+        ppMergeCombine(scale, zero, data, options, config);
+    }
 
     // Output the statistics