Changeset 13528 for trunk/ppImage/src/ppFocusParseCamera.c

Timestamp:

May 25, 2007, 5:09:20 PM (19 years ago)

Author:

eugene

Message:

changed the pmFPAfileDefine functions to not require an input status value

File:

• trunk/ppImage/src/ppFocusParseCamera.c (modified) (1 diff)

trunk/ppImage/src/ppFocusParseCamera.c

@@ -25 +25 @@
     // not all input or output images are used in a given recipe
     if (options->doBias) {
-        bool status = false;
-        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("can't find a bias image source");
+        if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.BIAS", "BIAS", PM_FPA_FILE_IMAGE)) {
+            psError (PS_ERR_IO, false, "Can't find a bias image source");
+            return NULL;
+        }
     }
     if (options->doDark) {
-        bool status = false;
-        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("can't find a dark image source");
+        if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.DARK", "DARK", PM_FPA_FILE_IMAGE)) {
+            psError (PS_ERR_IO, false, "Can't find a dark image source");
+            return NULL;
+        }
     }
     if (options->doMask) {
-        bool status = false;
-        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("can't find a mask image source");
+        if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.MASK", "MASK", PM_FPA_FILE_MASK)) {
+            psError (PS_ERR_IO, false, "Can't find a mask image source");
+            return NULL;
+        }
     }
     if (options->doFlat) {
-        bool status = false;
-        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("can't find a flat image source");
+        if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.FLAT", "FLAT", PM_FPA_FILE_IMAGE)) {
+            psError (PS_ERR_IO, false, "Can't find a shutter image source");
+            return NULL;
+        }
     }