Changeset 9342 for trunk/ppImage/src/ppImageParseDetrend.c

Timestamp:

Oct 5, 2006, 5:36:46 PM (20 years ago)

Author:

Paul Price

Message:

Adding shutter correction.

File:

• trunk/ppImage/src/ppImageParseDetrend.c (modified) (3 diffs)

trunk/ppImage/src/ppImageParseDetrend.c

@@ -6 +6 @@
 
 // identify all needed detrend and other I/O files
-// create the pmFPAfiles for the active I/O files 
+// create the pmFPAfiles for the active I/O files
 
 bool ppImageParseDetrend(ppImageOptions *options, pmConfig *config)
@@ -16 +16 @@
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPIMAGE.INPUT");
 
-    // the following are defined from the argument list, if given, 
+    // the following are defined from the argument list, if given,
     // otherwise they revert to the config information
 
     if (options->doBias) {
-        bool status = false;
-        pmFPAfileFromArgs (&status, config, "PPIMAGE.BIAS", "BIAS");
-        pmFPAfileFromConf (&status, config, "PPIMAGE.BIAS", input->fpa);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source");
+        bool status = false;
+        pmFPAfileFromArgs (&status, config, "PPIMAGE.BIAS", "BIAS");
+        pmFPAfileFromConf (&status, config, "PPIMAGE.BIAS", input->fpa);
+        if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source");
     }
 
     if (options->doDark) {
-        bool status = false;
-        pmFPAfileFromArgs (&status, config, "PPIMAGE.DARK", "DARK");
-        pmFPAfileFromConf (&status, config, "PPIMAGE.DARK", input->fpa);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source");
+        bool status = false;
+        pmFPAfileFromArgs (&status, config, "PPIMAGE.DARK", "DARK");
+        pmFPAfileFromConf (&status, config, "PPIMAGE.DARK", input->fpa);
+        if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source");
     }
 
     if (options->doMask) {
-        bool status = false;
-        pmFPAfileFromArgs (&status, config, "PPIMAGE.MASK", "MASK");
-        pmFPAfileFromConf (&status, config, "PPIMAGE.MASK", input->fpa);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source");
+        bool status = false;
+        pmFPAfileFromArgs (&status, config, "PPIMAGE.MASK", "MASK");
+        pmFPAfileFromConf (&status, config, "PPIMAGE.MASK", input->fpa);
+        if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source");
+    }
+
+    if (options->doShutter) {
+        bool status = false;
+        pmFPAfileFromArgs (&status, config, "PPIMAGE.SHUTTER", "SHUTTER");
+        pmFPAfileFromConf (&status, config, "PPIMAGE.SHUTTER", input->fpa);
+        if (!status) psAbort ("ppImageParseDetrend", "can't find a shutter image source");
     }
 
     if (options->doFlat) {
-        bool status = false;
-        pmFPAfileFromArgs (&status, config, "PPIMAGE.FLAT", "FLAT");
-        pmFPAfileFromConf (&status, config, "PPIMAGE.FLAT", input->fpa);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source");
+        bool status = false;
+        pmFPAfileFromArgs (&status, config, "PPIMAGE.FLAT", "FLAT");
+        pmFPAfileFromConf (&status, config, "PPIMAGE.FLAT", input->fpa);
+        if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source");
     }
 
@@ -53 +60 @@
     // XXX do these need to construct a new fpa?
     if (options->doBin1) {
-        pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
-        pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
+        pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
+        pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
     }
     if (options->doBin2) {
-        pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
-        pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
+        pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
+        pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
     }