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

Timestamp:

Nov 3, 2006, 4:40:46 PM (20 years ago)

Author:

Paul Price

Message:

Adding fringe processing.

File:

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

trunk/ppImage/src/ppImageParseCamera.c

@@ -34 +34 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a bias image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a bias image source");
+            return NULL;
+        }
     }
     if (options->doDark) {
@@ -44 +44 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a dark image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a dark image source");
+            return NULL;
+        }
     }
     if (options->doMask) {
@@ -54 +54 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a mask image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a mask image source");
+            return NULL;
+        }
     }
     if (options->doShutter) {
@@ -62 +62 @@
         pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.SHUTTER", "SHUTTER");
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.SHUTTER");
-        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.SHUTTER", input->fpa, PM_DETREND_TYPE_FLAT);
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.SHUTTER", input->fpa, PM_DETREND_TYPE_SHUTTER);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a shutter image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a shutter image source");
+            return NULL;
+        }
     }
     if (options->doFlat) {
@@ -74 +74 @@
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT);
         if (!status) {
-            psError (PS_ERR_IO, false, "can't find a flat image source");
-            return NULL;
-        }
+            psError (PS_ERR_IO, false, "can't find a flat image source");
+            return NULL;
+        }
+    }
+    if (options->doFringe) {
+        bool status = false;
+        pmFPAfileDefineFromArgs  (&status, config, "PPIMAGE.FRINGE", "FRINGE");
+        pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.FRINGE");
+        pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FRINGE", input->fpa, PM_DETREND_TYPE_FRINGE_IMAGE);
+        if (!status) {
+            psError (PS_ERR_IO, false, "can't find a fringe image source");
+            return NULL;
+        }
     }