Changeset 36157 for branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c

Timestamp:

Sep 27, 2013, 8:48:07 PM (13 years ago)

Author:

eugene

Message:

updates for CFF input and galaxy fits

File:

• branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c (modified) (5 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO.c

@@ -915 +915 @@
     pmHDU *hdu;
 
+    // define the EXTNAME values for the different data segments:
+    psString headname = NULL;
+    psString dataname = NULL;
+    psString deteffname = NULL;
+    psString xsrcname = NULL;
+    psString xfitname = NULL;
+    psString xradname = NULL;
+
+    psMetadata *tableHeader = NULL;
+    char *xtension = NULL;
+
     switch (file->type) {
       case PM_FPA_FILE_OBJ:
@@ -962 +973 @@
         // read in header, if not yet loaded
         hdu = pmFPAviewThisHDU (view, file->fpa);
-
-        // define the EXTNAME values for the different data segments:
-        psString headname = NULL;
-        psString dataname = NULL;
-        psString deteffname = NULL;
-        psString xsrcname = NULL;
-        psString xfitname = NULL;
-        psString xradname = NULL;
 
         // determine the output table format. Assume if we need to output extendend source
@@ -1033 +1036 @@
         }
 
-        psMetadata *tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
+        tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
         if (!tableHeader) psAbort("cannot read table header");
 
-        char *xtension = psMetadataLookupStr (NULL, tableHeader, "XTENSION");
+        xtension = psMetadataLookupStr (NULL, tableHeader, "XTENSION");
         if (!xtension) psAbort("cannot read table type");
         if (strcmp (xtension, "BINTABLE")) {
@@ -1141 +1144 @@
 
         // define the EXTNAME values for the different data segments:
-        psString headname = pmFPAfileNameFromRule("{CHIP.NAME}.hdr", file, view);
-        psString dataname = pmFPAfileNameFromRule("{CHIP.NAME}.cff", file, view);
+        headname = pmFPAfileNameFromRule("{CHIP.NAME}.hdr", file, view);
+        dataname = pmFPAfileNameFromRule("{CHIP.NAME}.cff", file, view);
 
         // advance to the IMAGE HEADER extension
@@ -1162 +1165 @@
         }
 
-        psMetadata *tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
+        tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
         if (!tableHeader) psAbort("cannot read table header");