Changeset 23335 for branches/eam_branches/eam_branch_20090312/psastro/src/psastroExtractParseCamera.c

Timestamp:

Mar 15, 2009, 4:56:07 PM (17 years ago)

Author:

eugene

Message:

add psastroExtract (first working version)

File:

• branches/eam_branches/eam_branch_20090312/psastro/src/psastroExtractParseCamera.c (modified) (3 diffs)

branches/eam_branches/eam_branch_20090312/psastro/src/psastroExtractParseCamera.c

@@ -16 +16 @@
 
     bool status = false;
-    pmFPAfile *input = NULL;
 
     // the input image(s) are required arguments; they define the camera
@@ -29 +28 @@
     status = false;
     pmFPAfile *astrom = pmFPAfileDefineFromArgs(&status, config, "PSASTRO.EXTRACT.ASTROM", "ASTROM");
-    if (!status) {
+    if (!astrom || !status) {
         psError (PS_ERR_UNKNOWN, false, "failed to load astrometry definition");
         return NULL;
-    }
-    if (astrom) {
-        psLogMsg ("psastro", 3, "using supplied astrometry\n");
-    } else {
-        psLogMsg ("psastro", 3, "using header astrometry\n");
     }
 
@@ -54 +48 @@
     psArray *chips = psStringSplitArray (chipLine, ",", false);
     if (chips->n > 0) {
-        pmFPASelectChip (output->fpa, -1, true); // deselect all chips
+        pmFPASelectChip (input->fpa, -1, true); // deselect all chips
+        pmFPASelectChip (astrom->fpa, -1, true); // deselect all chips
         for (int i = 0; i < chips->n; i++) {
             int chipNum = atoi(chips->data[i]);
-            if (! pmFPASelectChip(output->fpa, chipNum, false)) {
+            if (! pmFPASelectChip(input->fpa, chipNum, false)) {
+                psError(PSASTRO_ERR_CONFIG, true, "Chip number %d doesn't exist in camera.\n", chipNum);
+                return false;
+            }
+            if (! pmFPASelectChip(astrom->fpa, chipNum, false)) {
                 psError(PSASTRO_ERR_CONFIG, true, "Chip number %d doesn't exist in camera.\n", chipNum);
                 return false;