Changeset 27838 for branches/tap_branches/psModules/src/objects/pmSourceIO.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmSourceIO.c (modified) (14 diffs)

branches/tap_branches/psModules/src/objects/pmSourceIO.c

@@ -40 +40 @@
 #include "pmPSF.h"
 #include "pmModel.h"
+#include "pmDetections.h"
 #include "pmSource.h"
 #include "pmModelClass.h"
@@ -342 +343 @@
     pmHDU *hdu;
     psMetadata *updates;
-    psMetadata *outhead;
-
-    char *exttype  = NULL;
 
     // if sources is NULL, write out an empty table
-    // input / output sources are stored on the readout->analysis as "PSPHOT.SOURCES" -- a better name might be something like PM_SOURCE_DATA
-    psArray *sources = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
+    // input / output sources are stored on the readout->analysis as "PSPHOT.DETECTIONS"
+
+    psArray *sources = NULL;
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    if (detections) {
+        sources = detections->allSources;
+    }
     if (!sources) {
+        detections = pmDetectionsAlloc();
         sources = psArrayAlloc(0);
-        psMetadataAddArray(readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_META_REPLACE, "Blank array of sources", sources);
-        psFree(sources); // Held onto by the metadata, so we can continue to use
+        detections->allSources = sources;
+        psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_UNKNOWN | PS_META_REPLACE, "Blank array of sources", detections);
+        psFree(detections); // Held onto by the metadata, so we can continue to use
     }
 
@@ -368 +373 @@
         break;
 
-      case PM_FPA_FILE_CMP:
-        // a SPLIT format : only one header and object table per file
-        hdu = pmFPAviewThisHDU (view, fpa);
-        if (!hdu) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find HDU to write sources.");
-            return false;
-        }
-
-        // copy the header to an output header, add the output header data
-        outhead = psMetadataCopy (NULL, hdu->header);
-
-        // copy over the entries saved by PSPHOT
-        updates = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.HEADER");
-        if (updates) {
-            psMetadataCopy (outhead, updates);
-        }
-
-        // copy over the entries saved by PSASTRO
-        updates = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.HEADER");
-        if (updates) {
-            psMetadataCopy (outhead, updates);
-        }
-
-        bool status = pmSourcesWriteCMP (sources, file->filename, outhead);
-        psFree (outhead);
-
-        if (!status) {
-            psError(PS_ERR_IO, false, "Failed to write CMP file\n");
-            return false;
-        }
-        break;
-
-      case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_CMP: {
+          // a SPLIT format : only one header and object table per file
+          hdu = pmFPAviewThisHDU (view, fpa);
+          if (!hdu) {
+              psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find HDU to write sources.");
+              return false;
+          }
+
+          // copy the header to an output header, add the output header data
+          psMetadata *outhead = psMetadataCopy (NULL, hdu->header);
+
+          // copy over the entries saved by PSPHOT
+          updates = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.HEADER");
+          if (updates) {
+              psMetadataCopy (outhead, updates);
+          }
+
+          // copy over the entries saved by PSASTRO
+          updates = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.HEADER");
+          if (updates) {
+              psMetadataCopy (outhead, updates);
+          }
+
+          bool status = pmSourcesWriteCMP (sources, file->filename, outhead);
+          psFree (outhead);
+
+          if (!status) {
+              psError(PS_ERR_IO, false, "Failed to write CMP file\n");
+              return false;
+          }
+          break;
+      }
+
+      case PM_FPA_FILE_CMF: 
         // write a header? (only if this is the first readout for cell)
         //   note that the file->header is set to track the last hdu->header written
@@ -415 +421 @@
         psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
         if (!status) {
-          psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
-          return false;
+            psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
+            return false;
         }
 
@@ -429 +435 @@
         psString xsrcname = NULL;
         psString xfitname = NULL;
-        if (!sourceExtensions(&headname, &dataname, &deteffname, XSRC_OUTPUT ? &xsrcname : NULL,
-                              XFIT_OUTPUT ? &xfitname : NULL, file, view)) {
+        if (!sourceExtensions(&headname, &dataname, &deteffname, 
+                              XSRC_OUTPUT ? &xsrcname : NULL,
+                              XFIT_OUTPUT ? &xfitname : NULL, 
+                              file, view)) {
             return false;
         }
@@ -489 +497 @@
         }
 
-        // write out the TABLE data segment
+        // write out the Object TABLE data segment(s)
         {
             // create a header to hold the output data
-            outhead = psMetadataAlloc ();
-
-            exttype = psMemIncrRefCounter (psMetadataLookupStr(&status, recipe, "OUTPUT.FORMAT"));
+            psMetadata *outhead = psMetadataAlloc ();
+            
+            char *exttype = psMemIncrRefCounter (psMetadataLookupStr(&status, recipe, "OUTPUT.FORMAT"));
             if (!exttype) {
                 exttype = psStringCopy ("SMPDATA");
@@ -502 +510 @@
             psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTHEAD", PS_META_REPLACE, "name of image extension w/", headname);
             psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTTYPE", PS_META_REPLACE, "extension type", exttype);
-            psFree (exttype);
 
             // if we request XSRC output, add the XSRC name to this header
             if (xsrcname) {
-              psMetadataAddStr (outhead, PS_LIST_TAIL, "XSRCNAME", PS_META_REPLACE, "name of XSRC table extension", xsrcname);
+                psMetadataAddStr (outhead, PS_LIST_TAIL, "XSRCNAME", PS_META_REPLACE, "name of XSRC table extension", xsrcname);
             }
             if (xfitname) {
-              psMetadataAddStr (outhead, PS_LIST_TAIL, "XFITNAME", PS_META_REPLACE, "name of XFIT table extension", xfitname);
+                psMetadataAddStr (outhead, PS_LIST_TAIL, "XFITNAME", PS_META_REPLACE, "name of XFIT table extension", xfitname);
             }
 
@@ -532 +539 @@
                 status &= pmSourcesWrite_CMF_PS1_V2 (file->fits, readout, sources, file->header, outhead, dataname);
             }
-
-            if (deteffname) {
-                status &= pmReadoutWriteDetEff(file->fits, readout, outhead, deteffname);
+            if (!strcmp (exttype, "PS1_DV1")) {
+                status &= pmSourcesWrite_CMF_PS1_DV1 (file->fits, readout, sources, file->header, outhead, dataname);
             }
 
             if (xsrcname) {
-              if (!strcmp (exttype, "PS1_DEV_1")) {
-                  status &= pmSourcesWrite_PS1_DEV_1_XSRC (file->fits, sources, xsrcname, recipe);
-              }
-              if (!strcmp (exttype, "PS1_CAL_0")) {
-                  status &= pmSourcesWrite_PS1_CAL_0_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
-              }
-              if (!strcmp (exttype, "PS1_V1")) {
-                  status &= pmSourcesWrite_CMF_PS1_V1_XSRC (file->fits, sources, xsrcname, recipe);
-              }
-              if (!strcmp (exttype, "PS1_V2")) {
-                  status &= pmSourcesWrite_CMF_PS1_V2_XSRC (file->fits, sources, xsrcname, recipe);
-              }
+                if (!strcmp (exttype, "PS1_DEV_1")) {
+                    status &= pmSourcesWrite_PS1_DEV_1_XSRC (file->fits, sources, xsrcname, recipe);
+                }
+                if (!strcmp (exttype, "PS1_CAL_0")) {
+                    status &= pmSourcesWrite_PS1_CAL_0_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
+                }
+                if (!strcmp (exttype, "PS1_V1")) {
+                    status &= pmSourcesWrite_CMF_PS1_V1_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
+                }
+                if (!strcmp (exttype, "PS1_V2")) {
+                    status &= pmSourcesWrite_CMF_PS1_V2_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
+                }
+                if (!strcmp (exttype, "PS1_DV1")) {
+                    status &= pmSourcesWrite_CMF_PS1_DV1_XSRC (file->fits, readout, sources, file->header, xsrcname, recipe);
+                }
             }
             if (xfitname) {
-              if (!strcmp (exttype, "PS1_DEV_1")) {
-                  status &= pmSourcesWrite_PS1_DEV_1_XFIT (file->fits, sources, xfitname);
-              }
-              if (!strcmp (exttype, "PS1_CAL_0")) {
-                  status &= pmSourcesWrite_PS1_CAL_0_XFIT (file->fits, readout, sources, file->header, xfitname);
-              }
-              if (!strcmp (exttype, "PS1_V1")) {
-                  status &= pmSourcesWrite_CMF_PS1_V1_XFIT (file->fits, sources, xfitname);
-              }
-              if (!strcmp (exttype, "PS1_V2")) {
-                  status &= pmSourcesWrite_CMF_PS1_V2_XFIT (file->fits, sources, xfitname);
-              }
-            }
+                if (!strcmp (exttype, "PS1_DEV_1")) {
+                    status &= pmSourcesWrite_PS1_DEV_1_XFIT (file->fits, sources, xfitname);
+                }
+                if (!strcmp (exttype, "PS1_CAL_0")) {
+                    status &= pmSourcesWrite_PS1_CAL_0_XFIT (file->fits, readout, sources, file->header, xfitname);
+                }
+                if (!strcmp (exttype, "PS1_V1")) {
+                    status &= pmSourcesWrite_CMF_PS1_V1_XFIT (file->fits, readout, sources, xfitname);
+                }
+                if (!strcmp (exttype, "PS1_V2")) {
+                    status &= pmSourcesWrite_CMF_PS1_V2_XFIT (file->fits, readout, sources, xfitname);
+                }
+                if (!strcmp (exttype, "PS1_DV1")) {
+                    status &= pmSourcesWrite_CMF_PS1_DV1_XFIT (file->fits, readout, sources, xfitname);
+                }
+            }
+            psFree (outhead);
+            psFree (exttype);
+
             if (!status) {
                 psError(PS_ERR_IO, false, "writing CMF data to %s with format %s\n", file->filename, exttype);
-                psFree (headname);
-                psFree (dataname);
-                psFree (xsrcname);
-                psFree (xfitname);
-                psFree (outhead);
-                psFree (deteffname);
-                return false;
-            }
-        }
+                goto escape;
+            }
+        }
+
+
+        // write out the detection efficiency TABLE segments
+        if (deteffname) {
+            // create a header to hold the output data
+            psMetadata *outhead = psMetadataAlloc ();
+            psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTHEAD", PS_META_REPLACE, "name of image extension w/", headname);
+            psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTTYPE", PS_META_REPLACE, "extension type", "DETEFF");
+
+            status = pmReadoutWriteDetEff(file->fits, readout, outhead, deteffname);
+            psFree (outhead);
+
+            if (!status) {
+                psError(PS_ERR_IO, false, "writing DETEFF data to %s\n", file->filename);
+                goto escape;
+            }
+        }
+        psFree (headname);
+        psFree (dataname);
+        psFree (xsrcname);
+        psFree (xfitname);
+        psFree (deteffname);
 
         psTrace ("pmFPAfile", 5, "wrote ext data %s (type: %d)\n", file->filename, file->type);
-
-        psFree (headname);
-        psFree (dataname);
-        psFree (xsrcname);
-        psFree (xfitname);
-        psFree (outhead);
+        break;
+
+      escape:
+        psFree (headname);
+        psFree (dataname);
+        psFree (xsrcname);
+        psFree (xfitname);
         psFree (deteffname);
-        break;
+        return false;
 
       default:
@@ -592 +624 @@
     }
     return true;
+
 }
 // a MEF CMF file has: PHU, CELL-HEAD, TABLE, CELL-HEAD, TABLE, TABLE, TABLE...
@@ -936 +969 @@
         if (hdu->header == NULL) {
             // if the IMAGE header does not exist, we have no data for this view
-            if (!psFitsMoveExtName (file->fits, headname)) {
+            if (!psFitsMoveExtNameClean (file->fits, headname)) {
                 readout->data_exists = false;
                 psFree (headname);
@@ -964 +997 @@
         if (!tableHeader) psAbort("cannot read table header");
 
+        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);
+            return false;
+        }
+
         char *exttype = psMetadataLookupStr (NULL, tableHeader, "EXTTYPE");
         if (!exttype) psAbort("cannot read table type");
@@ -983 +1023 @@
             if (!strcmp (exttype, "PS1_V2")) {
                 sources = pmSourcesRead_CMF_PS1_V2 (file->fits, hdu->header);
+            }
+            if (!strcmp (exttype, "PS1_DV1")) {
+                sources = pmSourcesRead_CMF_PS1_DV1 (file->fits, hdu->header);
             }
 
@@ -1008 +1051 @@
     }
     readout->data_exists = true;
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY, "input sources", sources);
-    psFree (sources);
+
+    pmDetections *detections = pmDetectionsAlloc();
+    detections->allSources = sources;
+    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY, "input sources", detections);
+    psFree (detections);
     return true;
 }
@@ -1101 +1147 @@
     bool status;
 
-    // select the psf of interest
-    pmPSF *psf = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
-    if (!psf) return false;
-    return true;
-}
-
-
+    // select the detections of interest
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    if (!detections) return false;
+    if (!detections->allSources) return false;
+    return true;
+}
+
+