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

Timestamp:

Mar 27, 2006, 4:14:56 PM (20 years ago)

Author:

magnier

Message:

substantial work on the pmFPAfile I/O concepts

File:

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

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

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-14 02:21:07 $
+ *  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-28 02:14:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -125 +125 @@
         hdu = pmFPAviewThisHDU (view, file->fpa);
 
-        char *filename = pmFPAviewNameFromRule (file->filerule, view, file->fpa);
+        char *filename = pmFPAfileNameFromRule (file->filerule, file, view);
         file->fits = psFitsOpen (filename, "r");
         hdu->header = psFitsReadHeader (NULL, file->fits);
         psFitsClose (file->fits);
         sources  = pmSourcesReadCMP (filename, hdu->header);
+        psFree (filename);
         break;
 
@@ -136 +137 @@
         hdu = pmFPAviewThisHDU (view, file->fpa);
         if (hdu->header == NULL) {
-            char *headname = pmFPAviewNameFromRule (file->extxtra, view, file->fpa);
+            char *headname = pmFPAfileNameFromRule (file->extxtra, file, view);
             psFitsMoveExtName (file->fits, headname);
             hdu->header = psFitsReadHeader (NULL, file->fits);
+            psFree (headname);
         }
 
-        char *dataname = pmFPAviewNameFromRule (file->extrule, view, file->fpa);
+        char *dataname = pmFPAfileNameFromRule (file->extrule, file, view);
         psFitsMoveExtName (file->fits, dataname);
         sources  = pmSourcesReadCMF (file->fits, hdu->header);
+        psFree (dataname);
         break;