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

Timestamp:

Mar 13, 2006, 4:21:07 PM (20 years ago)

Author:

magnier

Message:

updates to pmFPAview, pmFPAfile

File:

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

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

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-09 03:14:23 $
+ *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-14 02:21:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 bool pmFPAviewReadObjects (pmFPAview *view, pmFPAfile *file)
 {
-
-    pmFPA *fpa = view->fpa;
+    pmFPA *fpa = file->fpa;
 
     if (view->chip == -1) {
@@ -124 +123 @@
 
         // read in header, if not yet loaded
-        hdu = pmFPAviewThisHDU (view);
+        hdu = pmFPAviewThisHDU (view, file->fpa);
 
-        char *filename = pmFPAviewNameFromRule (file->filerule, view);
+        char *filename = pmFPAviewNameFromRule (file->filerule, view, file->fpa);
         file->fits = psFitsOpen (filename, "r");
         hdu->header = psFitsReadHeader (NULL, file->fits);
@@ -135 +134 @@
     case PM_FPA_FILE_CMF:
         // read in header, if not yet loaded
-        hdu = pmFPAviewThisHDU (view);
+        hdu = pmFPAviewThisHDU (view, file->fpa);
         if (hdu->header == NULL) {
-            char *headname = pmFPAviewNameFromRule (file->extxtra, view);
+            char *headname = pmFPAviewNameFromRule (file->extxtra, view, file->fpa);
             psFitsMoveExtName (file->fits, headname);
             hdu->header = psFitsReadHeader (NULL, file->fits);
         }
 
-        char *dataname = pmFPAviewNameFromRule (file->extrule, view);
+        char *dataname = pmFPAviewNameFromRule (file->extrule, view, file->fpa);
         psFitsMoveExtName (file->fits, dataname);
         sources  = pmSourcesReadCMF (file->fits, hdu->header);