Changeset 7581 for trunk/ppImage/src/ppImageParseCamera.c

Timestamp:

Jun 15, 2006, 3:03:49 PM (20 years ago)

Author:

eugene

Message:

substantial work on the image loop, support for DetDB

File:

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

trunk/ppImage/src/ppImageParseCamera.c

@@ -7 +7 @@
 
     // the input image defines the camera
-    pmFPAfile *input = pmFPAfileFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
+    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
     if (!status) {
         psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT");
@@ -22 +22 @@
 
     // the following files are output targets
-    pmFPAfileDefine (config->files, config->camera, input->fpa, "PPIMAGE.OUTPUT");
+    pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PPIMAGE.OUTPUT");
 
     // the following are defined from the argument list, if given, 
@@ -29 +29 @@
     if (options->doBias) {
         bool status = false;
-        pmFPAfileFromArgs (&status, config, "PPIMAGE.BIAS", "BIAS");
-        pmFPAfileFromConf (&status, config, "PPIMAGE.BIAS", input->fpa);
+        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.BIAS", "BIAS");
+        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.BIAS");
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS);
         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);
+        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.DARK", "DARK");
+        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.DARK");
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK);
         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);
+        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.MASK", "MASK");
+        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.MASK");
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK);
         if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source");
     }
     if (options->doFlat) {
         bool status = false;
-        pmFPAfileFromArgs (&status, config, "PPIMAGE.FLAT", "FLAT");
-        pmFPAfileFromConf (&status, config, "PPIMAGE.FLAT", input->fpa);
+        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.FLAT", "FLAT");
+        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.FLAT");
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT);
         if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source");
     }
     if (options->doBin1) {
-        pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
+        pmFPAfile *file = pmFPAfileDefineFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
         if (options->doBin1JPG) {
-            pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
+            pmFPAfileDefineOutput (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
         }
     }
     if (options->doBin2) {
-        pmFPAfile *file = pmFPAfileFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
+        pmFPAfile *file = pmFPAfileDefineFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
         if (options->doBin2JPG) {
-            pmFPAfileDefine (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
+            pmFPAfileDefineOutput (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
         }
     }