Changeset 36152

Timestamp:

Sep 27, 2013, 1:45:13 PM (13 years ago)

Author:

eugene

Message:

add input support for psphotFullForce

Location:

branches/eam_branches/ipp-20130904/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (1 diff)
• objects/pmSourceIO.c (modified) (1 diff)
• objects/pmSourceIO_CFF.c (added)

branches/eam_branches/ipp-20130904/psModules/src/camera/pmFPAfileIO.c

@@ -222 +222 @@
       case PM_FPA_FILE_CMP:
       case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_CFF:
       case PM_FPA_FILE_WCS:
       case PM_FPA_FILE_SRCTEXT:

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

@@ -1132 +1132 @@
         break;
 
+      case PM_FPA_FILE_CFF:
+        // read in header, if not yet loaded
+        hdu = pmFPAviewThisHDU (view, file->fpa);
+
+        // look these up in the camera config?
+        // headrule = {CHIP.NAME}.hdr
+        // datarule = {CHIP.NAME}.cff
+
+        // 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);
+
+        // advance to the IMAGE HEADER extension
+        if (hdu->header == NULL) {
+            // if the IMAGE header does not exist, we have no data for this view
+            if (!psFitsMoveExtNameClean (file->fits, headname)) {
+                readout->data_exists = false;
+                psFree (headname);
+                psFree (dataname);
+                return true;
+            }
+            hdu->header = psFitsReadHeader (NULL, file->fits);
+        }
+
+        // advance to the table data extension
+        // since we have read the IMAGE header, the TABLE header should exist
+        if (!psFitsMoveExtName (file->fits, dataname)) {
+            psAbort("cannot find data extension %s in %s", dataname, file->filename);
+        }
+
+        psMetadata *tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
+        if (!tableHeader) psAbort("cannot read table header");
+
+        // verify this is a binary table
+        char *xtension = psMetadataLookupStr (NULL, tableHeader, "XTENSION");
+        if (!xtension) psAbort("cannot read table type");
+        if (strcmp (xtension, "BINTABLE")) {
+            psWarning ("no binary table in extension %s, skipping\n", dataname);
+            psFree(tableHeader);
+            return false;
+        }
+
+        sources = pmSourcesRead_CFF(file->fits, hdu->header);
+
+        psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);
+        psFree (headname);
+        psFree (dataname);
+        psFree (tableHeader);
+        break;
+
       default:
         fprintf (stderr, "warning: type mismatch\n");