Changeset 6573

Timestamp:

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

Author:

magnier

Message:

updates to pmFPAview, pmFPAfile

Location:

branches/rel10_ifa/psModules/src

Files:

• astrom/Makefile.am (modified) (2 diffs)
• astrom/pmFPAfile.c (modified) (8 diffs)
• astrom/pmFPAfile.h (modified) (4 diffs)
• astrom/pmFPAview.c (modified) (19 diffs)
• astrom/pmFPAview.h (modified) (4 diffs)
• objects/pmFPAviewReadObjects.c (modified) (4 diffs)
• objects/pmFPAviewWriteObjects.c (modified) (6 diffs)

branches/rel10_ifa/psModules/src/astrom/Makefile.am

@@ -13 +13 @@
         pmConceptsWrite.c \
         pmConceptsStandard.c \
-        pmFPAfile.c \
-        pmFPAview.c 
+        pmFPAview.c \
+        pmFPAfile.c
 
 #       pmFPAAstrometry.c
@@ -33 +33 @@
         pmConceptsWrite.h \
         pmConceptsStandard.h \
-        pmFPAfile.h \
-        pmFPAview.h
+        pmFPAview.h \
+        pmFPAfile.h
 
 #       pmFPAAstrometry.h

branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c

@@ -3 +3 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmFPAConstruct.h"
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
+#include "pmFPARead.h"
+#include "pmFPAWrite.h"
 #include "pmFPAviewObjectsIO.h"
 
@@ -40 +43 @@
 
 // XXX is a file allowed to be both READ and WRITE?
-pmFPAfile *pmFPAfileDefine (pmFPAview *view, psMetadata *camera, char *name)
+pmFPAfile *pmFPAfileDefine (psMetadata *files, psMetadata *camera, pmFPA *fpa, char *name)
 {
 
@@ -49 +52 @@
     psMetadata *data = psMetadataLookupPtr (&status, camera, name);
     if (data == NULL) {
-        return false;
+        return NULL;
     }
 
@@ -114 +117 @@
     }
 
+    if (fpa == NULL) {
+        fpa = pmFPAConstruct (camera);
+    }
+    file->fpa = fpa;
+
+    psMetadataAddPtr (files, PS_LIST_TAIL, name, PS_META_REPLACE, "", file);
     return (file);
 }
 
-bool pmFPAfileOpen (pmFPAfile *file, pmFPAview *view, psMetadata *camera)
+bool pmFPAfileOpen (pmFPAfile *file, pmFPAview *view)
 {
 
@@ -130 +139 @@
 
     // determine the file name
-    file->filename = pmFPAviewNameFromRule (file->filerule, view);
+    file->filename = pmFPAviewNameFromRule (file->filerule, view, file->fpa);
 
     // indirect filenames
     if (!strcasecmp (file->filename, "@FPAIO")) {
-        extra = pmFPAviewNameFromRule (file->filextra, view);
-        file->filename = psMetadataLookupStr (&status, view->IO, extra);
+        extra = pmFPAviewNameFromRule (file->filextra, view, file->fpa);
+        file->filename = psMetadataLookupStr (&status, file->names, extra);
     }
     if (!strcasecmp (file->filename, "@DETDB")) {
-        extra = pmFPAviewNameFromRule (file->filextra, view);
+        extra = pmFPAviewNameFromRule (file->filextra, view, file->fpa);
         // file->filename = pmDetrendSelect (extra);
     }
@@ -165 +174 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
-        pmFPAviewReadFitsImage (view, file->fits);
+        pmFPAviewReadFitsImage (view, file);
         break;
 
@@ -216 +225 @@
 }
 
+bool pmFPAfileClose (pmFPAfile *file, pmFPAview *view)
+{
+    // is current depth == open depth?
+    pmFPAdepth depth = pmFPAviewDepth (view);
+    if (file->openDepth != depth) {
+        return false;
+    }
+
+    // check if we are actually open
+    psFitsClose (file->fits);
+    return true;
+}
+
 // attempt open and read for all pmFPAfiles in view->IO
-bool pmFPAfileIOCheck (pmFPAview *view, psMetadata *camera)
-{
-
+bool pmFPAfileReadChecks (psMetadata *files, pmFPAview *view)
+{
     // recipe override values (command-line options):
     psMetadataItem *item = NULL;
-    psMetadataIterator *iter = psMetadataIteratorAlloc (view->IO, PS_LIST_HEAD, NULL);
+    psMetadataIterator *iter = psMetadataIteratorAlloc (files, PS_LIST_HEAD, NULL);
     while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
         pmFPAfile *file = item->data.V;
 
-        pmFPAfileOpen (file, view, camera);
+        pmFPAfileOpen (file, view);
         pmFPAfileRead (file, view);
     }
@@ -232 +253 @@
     return true;
 }
+
+// attempt open and read for all pmFPAfiles in view->IO
+bool pmFPAfileWriteChecks (psMetadata *files, pmFPAview *view)
+{
+    // recipe override values (command-line options):
+    psMetadataItem *item = NULL;
+    psMetadataIterator *iter = psMetadataIteratorAlloc (files, PS_LIST_HEAD, NULL);
+    while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
+        pmFPAfile *file = item->data.V;
+
+        pmFPAfileWrite (file, view);
+        pmFPAfileClose (file, view);
+    }
+    psFree (iter);
+    return true;
+}
+
+psImage *pmFPAfileReadoutImage (psMetadata *files, pmFPAview *view, char *name, int Nx, int Ny, int type)
+{
+    bool status;
+    psImage *image = NULL;
+
+    // I want an image from the
+    pmFPA *fpa = psMetadataLookupPtr (&status, files, name);
+    if (fpa == NULL) {
+        // use Nx or Ny == 0 to avoid creating an image
+        if (Nx*Ny <= 0) {
+            return NULL;
+        }
+        image = psImageAlloc (Nx, Ny, type);
+        return (image);
+    }
+
+    // inconsistent result: return NULL
+    pmReadout *readout = pmFPAviewThisReadout (view, fpa);
+    if (readout == NULL) {
+        return NULL;
+    }
+
+    // resize the existing readout??? this is wrong...
+    // need to allocate it if it does not exist...
+    image = psImageRecycle (readout->image, Nx, Ny, type);
+    psMemIncrRefCounter (image);
+    return (image);
+}
+
+# if (0)
+    // return the named pmFPAfile
+    pmFPAfile *pmFPAfileSelect (pmFPAview *view, char *name)
+{
+
+    // select the name from the camera config data
+    pmFPAfile *file = psMetadataLookupPtr (&status, view->IO, name);
+    if (file == NULL) {
+        return NULL;
+    }
+    return file;
+}
+
+bool pmFPAfileWriteChecks (pmFPAview *view, char *name)
+{
+
+    pmFPAfile *file = pmFPAfileSelect (view, name);
+    pmFPAfileWrite (file, view);
+    return true;
+}
+#endif
+
+// given an already-opened fits file, read the components corresponding
+// to the specified view
+bool pmFPAviewReadFitsImage (pmFPAview *view, pmFPAfile *file)
+{
+    pmFPA *fpa = file->fpa;
+    psFits *fits = file->fits;
+
+    if (view->chip == -1) {
+        pmFPARead (fpa, fits, NULL);
+        return true;
+    }
+
+    if (view->chip >= fpa->chips->n) {
+        return false;
+    }
+    pmChip *chip = fpa->chips->data[view->chip];
+
+    if (view->cell == -1) {
+        pmChipRead (chip, fits, NULL);
+        return true;
+    }
+
+    if (view->cell >= chip->cells->n) {
+        return false;
+    }
+    pmCell *cell = chip->cells->data[view->cell];
+
+    if (view->readout == -1) {
+        pmCellRead (cell, fits, NULL);
+        return true;
+    }
+
+    // XXX pmReadoutRead, pmReadoutReadSegement disabled for now
+    return false;
+
+    # if (0)
+
+        if (view->readout >= cell->readouts->n) {
+            return false;
+        }
+    pmReadout *readout = cell->readouts->data[view->readout];
+
+    if (view->nRows == 0) {
+        pmReadoutRead (readout, fits, NULL);
+    } else {
+        pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
+    }
+    return true;
+    # endif
+}
+
+// XXX image writes disabled for now
+# if (0)
+    // given an already-opened fits file, write the components corresponding
+    // to the specified view
+    bool pmFPAviewWriteFitsImage (pmFPAview *view, pmFPAfile *file)
+{
+
+    pmFPA *fpa = file->fpa;
+    psFits *fits = file->fits;
+
+    if (view->chip == -1) {
+        pmFPAWrite (fpa, fits, NULL, NULL);
+        return true;
+    }
+
+    if (view->chip >= fpa->chips->n) {
+        return false;
+    }
+    pmChip *chip = fpa->chips->data[view->chip];
+
+    if (view->cell == -1) {
+        pmChipWrite (chip, fits, NULL, NULL);
+        return true;
+    }
+
+    if (view->cell >= chip->cells->n) {
+        return false;
+    }
+    pmCell *cell = chip->cells->data[view->cell];
+
+    if (view->readout == -1) {
+        pmCellWrite (cell, fits, NULL, NULL);
+        return true;
+    }
+
+    if (view->readout >= cell->readouts->n) {
+        return false;
+    }
+    pmReadout *readout = cell->readouts->data[view->readout];
+
+    if (view->nRows == 0) {
+        pmReadoutWrite (readout, fits, NULL, NULL);
+    } else {
+        pmReadoutWriteSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
+    }
+    return true;
+}
+# endif

branches/rel10_ifa/psModules/src/astrom/pmFPAfile.h

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-03-09 20:56:39 $
+*  @version $Revision: 1.1.2.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-14 02:21:07 $
 *
 *  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
@@ -17 +17 @@
 
 typedef enum {
-    PM_FPA_FILE_IMAGE,
     PM_FPA_FILE_SX,
     PM_FPA_FILE_OBJ,
@@ -23 +22 @@
     PM_FPA_FILE_CMF,
     PM_FPA_FILE_RAW,
+    PM_FPA_FILE_IMAGE,
 } pmFPAfileType;
 
@@ -41 +41 @@
 
     pmFPAfileType type;
+
+    psMetadata *names;
+    pmFPA *fpa;
 }
 pmFPAfile;
 
 pmFPAfile *pmFPAfileAlloc ();
-pmFPAfile *pmFPAfileDefine (pmFPAview *view, psMetadata *camera, char *name);
-bool pmFPAfileOpen (pmFPAfile *file, pmFPAview *view, psMetadata *camera);
+pmFPAfile *pmFPAfileDefine (psMetadata *files, psMetadata *camera, pmFPA *fpa, char *name);
+bool pmFPAfileOpen (pmFPAfile *file, pmFPAview *view);
 bool pmFPAfileRead (pmFPAfile *file, pmFPAview *view);
 bool pmFPAfileWrite (pmFPAfile *file, pmFPAview *view);
-bool pmFPAfileIOCheck (pmFPAview *view, psMetadata *camera);
+bool pmFPAfileClose (pmFPAfile *file, pmFPAview *view);
+
+bool pmFPAfileReadChecks (psMetadata *files, pmFPAview *view);
+bool pmFPAfileWriteChecks (psMetadata *files, pmFPAview *view);
+
+psImage *pmFPAfileReadoutImage (psMetadata *files, pmFPAview *view, char *name, int Nx, int Ny, int type);
+
+// read an image into the current view
+bool pmFPAviewReadFitsImage (pmFPAview *view, pmFPAfile *file);
+
+// write the components for the specified view
+bool pmFPAviewWriteFitsImage (pmFPAview *view, pmFPAfile *file);
 
 # endif

branches/rel10_ifa/psModules/src/astrom/pmFPAview.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-09 20:56:39 $
+ *  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-14 02:21:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
 #include "pmFPA.h"
 #include "pmFPAview.h"
-#include "pmFPARead.h"
-#include "pmFPAWrite.h"
 
 static void pmFPAviewFree (pmFPAview *view)
 {
-
     if (view == NULL)
         return;
-
-    psFree (view->IO);
     return;
 }
 
-pmFPAview *pmFPAviewAlloc (pmFPA *fpa, psMetadata *camera, int nRows)
-{
-
+pmFPAview *pmFPAviewAlloc (int nRows)
+{
     pmFPAview *view = psAlloc (sizeof(pmFPAview));
     psMemSetDeallocator (view, (psFreeFunc) pmFPAviewFree);
-
-    view->fpa     = fpa;
-    view->nRows   = nRows;
-    view->camera  = camera;
 
     view->chip    = -1;
     view->cell    = -1;
     view->readout = -1;
-    view->iRows   = 0;
-
-    view->IO      = psMetadataAlloc ();
+    view->iRows   =  0;
+    view->nRows   = nRows;
     return (view);
 }
@@ -64 +53 @@
 }
 
-pmChip *pmFPAviewThisChip (pmFPAview *view)
+pmChip *pmFPAviewThisChip (pmFPAview *view, pmFPA *fpa)
 {
 
@@ -71 +60 @@
     }
 
-    if (view->chip >= view->fpa->chips->n) {
-        return NULL;
-    }
-
-    pmChip *chip = view->fpa->chips->data[view->chip];
+    if (view->chip >= fpa->chips->n) {
+        return NULL;
+    }
+
+    pmChip *chip = fpa->chips->data[view->chip];
     return chip;
 }
 
-pmChip *pmFPAviewNextChip (pmFPAview *view, int nStep)
-{
-
+pmChip *pmFPAviewNextChip (pmFPAview *view, pmFPA *fpa, int nStep)
+{
     view->cell = -1;
     view->readout = -1;
@@ -87 +75 @@
 
     // if there are no available chips, return NULL
-    if (view->fpa->chips->n <= 0) {
+    if (fpa->chips->n <= 0) {
         view->chip = -1;
         return NULL;
@@ -101 +89 @@
 
     // if we are at the end of the stack, return NULL
-    if (view->chip >= view->fpa->chips->n) {
+    if (view->chip >= fpa->chips->n) {
         view->chip = -1;
         return NULL;
@@ -107 +95 @@
 
     // get the correct chip pointer
-    pmChip *chip = view->fpa->chips->data[view->chip];
+    pmChip *chip = fpa->chips->data[view->chip];
     return (chip);
 }
 
-pmCell *pmFPAviewThisCell (pmFPAview *view)
+pmCell *pmFPAviewThisCell (pmFPAview *view, pmFPA *fpa)
 {
 
@@ -118 +106 @@
     }
 
-    pmChip *chip = pmFPAviewThisChip (view);
+    pmChip *chip = pmFPAviewThisChip (view, fpa);
     if (chip == NULL) {
         return NULL;
@@ -131 +119 @@
 }
 
-pmCell *pmFPAviewNextCell (pmFPAview *view, int nStep)
-{
-
-    pmChip *chip = pmFPAviewThisChip (view);
+pmCell *pmFPAviewNextCell (pmFPAview *view, pmFPA *fpa, int nStep)
+{
+
+    pmChip *chip = pmFPAviewThisChip (view, fpa);
     if (chip == NULL) {
         return NULL;
@@ -167 +155 @@
 }
 
-pmReadout *pmFPAviewThisReadout (pmFPAview *view)
+pmReadout *pmFPAviewThisReadout (pmFPAview *view, pmFPA *fpa)
 {
 
@@ -174 +162 @@
     }
 
-    pmCell *cell = pmFPAviewThisCell (view);
+    pmCell *cell = pmFPAviewThisCell (view, fpa);
     if (cell == NULL) {
         return NULL;
@@ -187 +175 @@
 }
 
-pmReadout *pmFPAviewNextReadout (pmFPAview *view, int nStep)
-{
-
-    pmCell *cell = pmFPAviewThisCell (view);
+pmReadout *pmFPAviewNextReadout (pmFPAview *view, pmFPA *fpa, int nStep)
+{
+
+    pmCell *cell = pmFPAviewThisCell (view, fpa);
     if (cell == NULL) {
         return NULL;
@@ -222 +210 @@
 }
 
-pmHDU *pmFPAviewThisHDU (pmFPAview *view)
+pmHDU *pmFPAviewThisHDU (pmFPAview *view, pmFPA *fpa)
 {
 
@@ -230 +218 @@
 
     if (view->chip < 0) {
-        return pmHDUFromFPA (view->fpa);
+        return pmHDUFromFPA (fpa);
     }
     if (view->cell < 0) {
-        return pmHDUFromChip (pmFPAviewThisChip (view));
+        return pmHDUFromChip (pmFPAviewThisChip (view, fpa));
     }
     if (view->readout < 0) {
-        return pmHDUFromCell (pmFPAviewThisCell (view));
+        return pmHDUFromCell (pmFPAviewThisCell (view, fpa));
     }
     return NULL;
@@ -242 +230 @@
 
 // select the rule from the camera configuration, perform substitutions as needed
-char *pmFPAviewNameFromRule (char *rule, pmFPAview *view)
+char *pmFPAviewNameFromRule (char *rule, pmFPAview *view, pmFPA *fpa)
 {
 
@@ -250 +238 @@
 
     if (strstr (newName, "{CHIP.NAME}") != NULL) {
-        pmChip *chip = pmFPAviewThisChip (view);
+        pmChip *chip = pmFPAviewThisChip (view, fpa);
         if (chip != NULL) {
             char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
@@ -259 +247 @@
     }
     if (strstr (newName, "{CELL.NAME}") != NULL) {
-        pmCell *cell = pmFPAviewThisCell (view);
+        pmCell *cell = pmFPAviewThisCell (view, fpa);
         if (cell != NULL) {
             char *name = psMetadataLookupStr (NULL, cell->concepts, "CELL.NAME");
@@ -268 +256 @@
     }
     if (strstr (newName, "{EXTNAME}") != NULL) {
-        pmHDU *hdu = pmFPAviewThisHDU (view);
+        pmHDU *hdu = pmFPAviewThisHDU (view, fpa);
         if (hdu->extname != NULL) {
             newName = psStringSubstitute (newName, hdu->extname, "{EXTNAME}");
@@ -275 +263 @@
     return newName;
 }
-
-// given an already-opened fits file, read the components corresponding
-// to the specified view
-bool pmFPAviewReadFitsImage (pmFPAview *view, psFits *fits)
-{
-
-    pmFPA *fpa = view->fpa;
-
-    if (view->chip == -1) {
-        pmFPARead (fpa, fits, NULL);
-        return true;
-    }
-
-    if (view->chip >= fpa->chips->n) {
-        return false;
-    }
-    pmChip *chip = fpa->chips->data[view->chip];
-
-    if (view->cell == -1) {
-        pmChipRead (chip, fits, NULL);
-        return true;
-    }
-
-    if (view->cell >= chip->cells->n) {
-        return false;
-    }
-    pmCell *cell = chip->cells->data[view->cell];
-
-    if (view->readout == -1) {
-        pmCellRead (cell, fits, NULL);
-        return true;
-    }
-
-    // XXX pmReadoutRead, pmReadoutReadSegement disabled for now
-    return false;
-
-    # if (0)
-
-        if (view->readout >= cell->readouts->n) {
-            return false;
-        }
-    pmReadout *readout = cell->readouts->data[view->readout];
-
-    if (view->nRows == 0) {
-        pmReadoutRead (readout, fits, NULL);
-    } else {
-        pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
-    }
-    return true;
-    # endif
-}
-
-// XXX image writes disabled for now
-# if (0)
-    // given an already-opened fits file, write the components corresponding
-    // to the specified view
-    bool pmFPAviewWriteFitsImage (pmFPAview *view, psFits *fits)
-{
-
-    pmFPA *fpa = view->fpa;
-
-    if (view->chip == -1) {
-        pmFPAWrite (fpa, fits, NULL, NULL);
-        return true;
-    }
-
-    if (view->chip >= fpa->chips->n) {
-        return false;
-    }
-    pmChip *chip = fpa->chips->data[view->chip];
-
-    if (view->cell == -1) {
-        pmChipWrite (chip, fits, NULL, NULL);
-        return true;
-    }
-
-    if (view->cell >= chip->cells->n) {
-        return false;
-    }
-    pmCell *cell = chip->cells->data[view->cell];
-
-    if (view->readout == -1) {
-        pmCellWrite (cell, fits, NULL, NULL);
-        return true;
-    }
-
-    if (view->readout >= cell->readouts->n) {
-        return false;
-    }
-    pmReadout *readout = cell->readouts->data[view->readout];
-
-    if (view->nRows == 0) {
-        pmReadoutWrite (readout, fits, NULL, NULL);
-    } else {
-        pmReadoutWriteSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
-    }
-    return true;
-}
-# endif

branches/rel10_ifa/psModules/src/astrom/pmFPAview.h

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-03-09 20:56:39 $
+*  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-14 02:21:07 $
 *
 *  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
@@ -30 +30 @@
 typedef struct
 {
-    pmFPA *fpa;
-    psMetadata *IO;
-    psMetadata *camera;
     int chip;
     int cell;
@@ -38 +35 @@
     int nRows;
     int iRows;
+    pmFPA *fpa;
 }
 pmFPAview;
 
 // allocate a pmFPAview structure for this fpa and camera
-pmFPAview *pmFPAviewAlloc (pmFPA *fpa, psMetadata *camera, int nRows);
+pmFPAview *pmFPAviewAlloc (int nRows);
 
 // determine the current view depth
@@ -48 +46 @@
 
 // return the currently selected chip for this view
-pmChip *pmFPAviewThisChip (pmFPAview *view);
+pmChip *pmFPAviewThisChip (pmFPAview *view, pmFPA *fpa);
 
 // advance view to the next chip
-pmChip *pmFPAviewNextChip (pmFPAview *view, int nStep);
+pmChip *pmFPAviewNextChip (pmFPAview *view, pmFPA *fpa, int nStep);
 
 // return the currently selected cell for this view
-pmCell *pmFPAviewThisCell (pmFPAview *view);
+pmCell *pmFPAviewThisCell (pmFPAview *view, pmFPA *fpa);
 
 // advance view to the next cell
-pmCell *pmFPAviewNextCell (pmFPAview *view, int nStep);
+pmCell *pmFPAviewNextCell (pmFPAview *view, pmFPA *fpa, int nStep);
 
 // return the currently selected readout for this view
-pmReadout *pmFPAviewThisReadout (pmFPAview *view);
+pmReadout *pmFPAviewThisReadout (pmFPAview *view, pmFPA *fpa);
 
 // advance view to the next readout
-pmReadout *pmFPAviewNextReadout (pmFPAview *view, int nStep);
+pmReadout *pmFPAviewNextReadout (pmFPAview *view, pmFPA *fpa, int nStep);
 
 // return the HDU corresponding to the current view
-pmHDU *pmFPAviewThisHDU (pmFPAview *view);
+pmHDU *pmFPAviewThisHDU (pmFPAview *view, pmFPA *fpa);
 
 // convert the rule to a name based on the current view
-char *pmFPAviewNameFromRule (char *rule, pmFPAview *view);
-
-// read an image into the current view
-bool pmFPAviewReadFitsImage (pmFPAview *view, psFits *fits);
-
-// write the components for the specified view
-bool pmFPAviewWriteFitsImage (pmFPAview *view, psFits *fits);
+char *pmFPAviewNameFromRule (char *rule, pmFPAview *view, pmFPA *fpa);
 
 # endif

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);

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;