Changeset 17913

Timestamp:

Jun 4, 2008, 3:34:16 PM (18 years ago)

Author:

Paul Price

Message:

Need to include the camera name now.

File:

• trunk/ppStats/src/ppStatsSetupFromArgs.c (modified) (1 diff)

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -166 +166 @@
         }
 
-        // need to handle optional alternate EXTWORD value
-        psMetadata *fileMenu = psMetadataLookupMetadata (NULL, format, "FILE");
-        if (!fileMenu) {
-            psError (PS_ERR_IO, true, "FILE METADATA missing from camera format\n");
-            return false;
-        }
-        bool status = false;
-        char *extword = psMetadataLookupStr (&status, fileMenu, "EXTWORD");
-        if (status) {
-            psFitsSetExtnameWord (data->fits, extword);
-        }
-
-        data->fpa = pmFPAConstruct(config->camera);
+        // need to handle optional alternate EXTWORD value
+        psMetadata *fileMenu = psMetadataLookupMetadata (NULL, format, "FILE");
+        if (!fileMenu) {
+            psError (PS_ERR_IO, true, "FILE METADATA missing from camera format\n");
+            return false;
+        }
+        bool status = false;
+        char *extword = psMetadataLookupStr (&status, fileMenu, "EXTWORD");
+        if (status) {
+            psFitsSetExtnameWord (data->fits, extword);
+        }
+
+        data->fpa = pmFPAConstruct(config->camera, config->cameraName);
         if (!data->fpa) {
             psError(PS_ERR_UNKNOWN, false, "Unable to construct FPA for %s\n", resolved);