Changeset 6573 for branches/rel10_ifa/psModules/src/objects/pmFPAviewWriteObjects.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/pmFPAviewWriteObjects.c (modified) (6 diffs)

branches/rel10_ifa/psModules/src/objects/pmFPAviewWriteObjects.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
@@ -117 +117 @@
     switch (file->type) {
     case PM_FPA_FILE_OBJ:
-        filename = pmFPAviewNameFromRule (file->filerule, view);
+        filename = pmFPAviewNameFromRule (file->filerule, view, file->fpa);
         pmSourcesWriteOBJ (sources, filename);
         break;
 
     case PM_FPA_FILE_SX:
-        filename = pmFPAviewNameFromRule (file->filerule, view);
+        filename = pmFPAviewNameFromRule (file->filerule, view, file->fpa);
         pmSourcesWriteSX (sources, filename);
         break;
@@ -128 +128 @@
     case PM_FPA_FILE_CMP:
         // a SPLIT format : only one header and object table per file
-        hdu = pmFPAviewThisHDU (view);
-        filename = pmFPAviewNameFromRule (file->filerule, view);
+        hdu = pmFPAviewThisHDU (view, file->fpa);
+        filename = pmFPAviewNameFromRule (file->filerule, view, file->fpa);
         pmSourcesWriteCMP (sources, filename, hdu->header);
         break;
@@ -135 +135 @@
     case PM_FPA_FILE_CMF:
         // write header, if not yet written?
-        hdu = pmFPAviewThisHDU (view);
+        hdu = pmFPAviewThisHDU (view, file->fpa);
 
         // XXX is this needed? is it automatically added?
@@ -143 +143 @@
         if (hdu->header) {
             psMetadataItem *mdi = NULL;
-            headname = pmFPAviewNameFromRule (file->extxtra, view);
+            headname = pmFPAviewNameFromRule (file->extxtra, view, file->fpa);
 
             // set NAXIS to 0 (we don't write out the data array)
@@ -156 +156 @@
             psFitsWriteHeader (hdu->header, file->fits);
         }
-        dataname = pmFPAviewNameFromRule (file->extrule, view);
+        dataname = pmFPAviewNameFromRule (file->extrule, view, file->fpa);
         pmSourcesWriteCMF (file->fits, sources, hdu->header, dataname);
         break;