Changeset 6556 for branches/rel10_ifa/psModules/src/objects/pmFPAviewReadObjects.c

Timestamp:

Mar 8, 2006, 5:14:23 PM (20 years ago)

Author:

magnier

Message:

major rework of objects code

File:

• branches/rel10_ifa/psModules/src/objects/pmFPAviewReadObjects.c (modified) (7 diffs)

branches/rel10_ifa/psModules/src/objects/pmFPAviewReadObjects.c

@@ -1 @@
-# include "pmFPAviewReadObjects.h"
+/** @file  pmSourcePhotometry.c
+ *
+ *  @author EAM, IfA; GLG, MHPCC
+ *
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 03:14:23 $
+ *
+ *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ *
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include "pslib.h"
+#include "pmHDU.h"
+#include "pmFPA.h"
+#include "pmFPAview.h"
+#include "pmFPAfile.h"
+
+#include "pmPeaks.h"
+#include "pmMoments.h"
+#include "pmModel.h"
+#include "pmSource.h"
+
+#include "pmSourceIO.h"
+#include "pmFPAviewObjectsIO.h"
 
 // Given a FITS file pointer, read the table of object data
@@ -42 +68 @@
 
 // read in all chip-level Objects files for this FPA
-pmFPAReadObjects (pmFPA *fpa, pmFPAview *view, pmFPAfile *file)
+bool pmFPAReadObjects (pmFPA *fpa, pmFPAview *view, pmFPAfile *file)
 {
 
     for (int i = 0; i < fpa->chips->n; i++) {
 
-        pmChip *chip = fpa->data[i];
+        pmChip *chip = fpa->chips->data[i];
         pmChipReadObjects (chip, view, file);
     }
@@ -54 +80 @@
 
 // read in all cell-level Objects files for this chip
-pmChipReadObjects (pmChip *chip, pmFPAview *view, pmFPAfile *file)
+bool pmChipReadObjects (pmChip *chip, pmFPAview *view, pmFPAfile *file)
 {
 
     for (int i = 0; i < chip->cells->n; i++) {
 
-        pmCell *cell = chip->data[i];
+        pmCell *cell = chip->cells->data[i];
         pmCellReadObjects (cell, view, file);
     }
@@ -66 +92 @@
 
 // read in all readout-level Objects files for this cell
-pmCellReadObjects (pmCell *cell, pmFPAview *view, pmFPAfile *file)
+bool pmCellReadObjects (pmCell *cell, pmFPAview *view, pmFPAfile *file)
 {
 
     for (int i = 0; i < cell->readouts->n; i++) {
 
-        pmReadout *readout = cell->data[i];
+        pmReadout *readout = cell->readouts->data[i];
         pmReadoutReadObjects (readout, view, file);
     }
@@ -78 +104 @@
 
 // read in all readout-level Objects files for this cell
-pmReadoutReadObjects (pmReadout *readout, pmFPAview *view, pmFPAfile *file)
+bool pmReadoutReadObjects (pmReadout *readout, pmFPAview *view, pmFPAfile *file)
 {
 
+    bool status;
     psArray *sources;
+    pmHDU *hdu;
 
     switch (file->type) {
@@ -96 +124 @@
 
         // read in header, if not yet loaded
-        pmHDU *hdu = pmFPAviewThisHDU (view);
+        hdu = pmFPAviewThisHDU (view);
 
-        filename = pmConfigNameFromRule (file->filerule, view);
+        char *filename = pmFPAviewNameFromRule (file->filerule, view);
         file->fits = psFitsOpen (filename, "r");
-        hdu->header = psFitsReadHeader (file->fits);
+        hdu->header = psFitsReadHeader (NULL, file->fits);
         psFitsClose (file->fits);
         sources  = pmSourcesReadCMP (filename, hdu->header);
@@ -107 +135 @@
     case PM_FPA_FILE_CMF:
         // read in header, if not yet loaded
-        pmHDU *hdu = pmFPAviewThisHDU (view);
+        hdu = pmFPAviewThisHDU (view);
         if (hdu->header == NULL) {
-            headname = pmConfigNameFromRule (file->extxtra, view);
-            psFitsMoveExtName (fits, headname);
-            hdu->header = psFitsReadHeader (file->fits);
+            char *headname = pmFPAviewNameFromRule (file->extxtra, view);
+            psFitsMoveExtName (file->fits, headname);
+            hdu->header = psFitsReadHeader (NULL, file->fits);
         }
 
-        dataname = pmConfigNameFromRule (file->extrule, view);
-        psFitsMoveExtName (fits, dataname);
+        char *dataname = pmFPAviewNameFromRule (file->extrule, view);
+        psFitsMoveExtName (file->fits, dataname);
         sources  = pmSourcesReadCMF (file->fits, hdu->header);
+        break;
+
+    default:
+        fprintf (stderr, "warning: type mismatch\n");
         break;
     }