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

Timestamp:

Aug 1, 2006, 5:27:46 PM (20 years ago)

Author:

Paul Price

Message:

Changing name of recipe to PPIMAGE from PHASE2

File:

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

trunk/ppImage/src/ppFocusParseCamera.c

@@ -10 +10 @@
     pmFPAfile *input = pmFPAfileDefineSingleFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT", entry);
     if (!status) {
-        psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT");
-        return NULL;
+        psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT");
+        return NULL;
     }
 
     // add recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, "PHASE2");
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME);
     psMetadata *arglist = psMetadataLookupPtr (&status, config->arguments, "PPIMAGE.OPTIONS");
     psMetadataCopy (recipe, arglist);
@@ -22 +22 @@
     ppImageOptions *options = ppImageOptionsParse (config);
 
-    // 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 or detrend database if specified
     // 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 ("ppImageParseDetrend", "can't find a bias image source");
+        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 ("ppImageParseDetrend", "can't find a bias image source");
     }
     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 ("ppImageParseDetrend", "can't find a dark image source");
+        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 ("ppImageParseDetrend", "can't find a dark image source");
     }
     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 ("ppImageParseDetrend", "can't find a mask image source");
+        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 ("ppImageParseDetrend", "can't find a mask image source");
     }
     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 ("ppImageParseDetrend", "can't find a flat image source");
+        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 ("ppImageParseDetrend", "can't find a flat image source");
     }
 
@@ -67 +67 @@
 
     // output is used as a carrier: input to byChip
-    output->freeLevel = PM_FPA_LEVEL_CHIP; 
+    output->freeLevel = PM_FPA_LEVEL_CHIP;
 
     // define the binned target files (which may just be carriers for some camera configurations)
@@ -90 +90 @@
     psArray *chips = psStringSplitArray (chipLine, ",", false);
     if (chips->n > 0) {
-        pmFPASelectChip (input->fpa, -1, true); // deselect all chips
-        for (int i = 0; i < chips->n; i++) {
-            int chipNum = atoi(chips->data[i]);
-            if (! pmFPASelectChip(input->fpa, chipNum, false)) {
-                psError(PS_ERR_IO, false, "Chip number %d doesn't exist in camera.\n", chipNum);
-                return false;
-            }
+        pmFPASelectChip (input->fpa, -1, true); // deselect all chips
+        for (int i = 0; i < chips->n; i++) {
+            int chipNum = atoi(chips->data[i]);
+            if (! pmFPASelectChip(input->fpa, chipNum, false)) {
+                psError(PS_ERR_IO, false, "Chip number %d doesn't exist in camera.\n", chipNum);
+                return false;
+            }
         }
     }
@@ -121 +121 @@
     psMetadataRemoveKey (config->files, "PPIMAGE.BIN1");
     psMetadataRemoveKey (config->files, "PPIMAGE.BIN2");
-    
+
     psMetadataRemoveKey (config->files, "PPIMAGE.JPEG1");
     psMetadataRemoveKey (config->files, "PPIMAGE.JPEG2");