Changeset 6559 for branches/rel10_ifa/psModules/src/astrom/pmFPAview.c

Timestamp:

Mar 8, 2006, 5:24:49 PM (20 years ago)

Author:

magnier

Message:

fixed pmFPAview,file so they compile

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAview.c (modified) (11 diffs)

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

@@ -1 @@
-# include "pmFPAview.h"
-
-static void pmPFAviewFree (pmFPAview *view)
+/** @file  pmFPAview.c
+ *
+ *  @author EAM, IfA
+ *
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 03:24:49 $
+ *
+ *  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 "pmFPARead.h"
+#include "pmFPAWrite.h"
+
+bool pmChipRead(pmChip *fpa,              // FPA to read into
+                psFits *fits,            // FITS file from which to read
+                psMetadata *phu,         // Primary header
+                psDB *db                 // Database handle, for concept ingest
+               );
+
+bool pmCellRead(pmCell *fpa,              // FPA to read into
+                psFits *fits,            // FITS file from which to read
+                psMetadata *phu,         // Primary header
+                psDB *db                 // Database handle, for concept ingest
+               );
+
+bool pmReadoutRead(pmReadout *fpa,              // FPA to read into
+                   psFits *fits,            // FITS file from which to read
+                   psMetadata *phu,         // Primary header
+                   psDB *db                 // Database handle, for concept ingest
+                  );
+
+bool pmReadoutReadSegment(pmReadout *fpa,              // FPA to read into
+                          psFits *fits,            // FITS file from which to read
+                          int n, int i,
+                          psMetadata *phu,         // Primary header
+                          psDB *db);
+
+static void pmFPAviewFree (pmFPAview *view)
 {
 
@@ -15 +58 @@
 
     pmFPAview *view = psAlloc (sizeof(pmFPAview));
+    psMemSetDeallocator (view, (psFreeFunc) pmFPAviewFree);
 
     view->fpa     = fpa;
@@ -167 +211 @@
 }
 
-pmCell *pmFPAviewNextReadout (pmFPAview *view, int nStep)
+pmReadout *pmFPAviewNextReadout (pmFPAview *view, int nStep)
 {
 
@@ -178 +222 @@
 
     // if there are no available cells, return NULL
-    if (view->fpa->readouts->n <= 0) {
-        view->readouts = -1;
+    if (cell->readouts->n <= 0) {
+        view->readout = -1;
         return NULL;
     }
@@ -210 +254 @@
 
     if (view->chip < 0) {
-        return pmHDUfromFPA (view->fpa);
+        return pmHDUFromFPA (view->fpa);
     }
     if (view->cell < 0) {
-        return pmHDUfromChip (pmFPAviewThisChip (view));
+        return pmHDUFromChip (pmFPAviewThisChip (view));
     }
     if (view->readout < 0) {
-        return pmHDUfromCell (pmFPAviewThisCell (view));
+        return pmHDUFromCell (pmFPAviewThisCell (view));
     }
     return NULL;
@@ -225 +269 @@
 {
 
-    char *name;
     char *newName = NULL;     // destination for resulting name
 
@@ -249 +292 @@
     }
     if (strstr (newName, "{EXTNAME}") != NULL) {
-        pmCell *cell = pmFPAviewThisCell (view);
-        char *name = psMetadataLookupStr (NULL, header, "EXTNAME");
-        if (name != NULL) {
-            newName = psStringSubstitute (newName, name, "{EXTNAME}");
+        pmHDU *hdu = pmFPAviewThisHDU (view);
+        if (hdu->extname != NULL) {
+            newName = psStringSubstitute (newName, hdu->extname, "{EXTNAME}");
         }
     }
@@ -266 +308 @@
 
     if (view->chip == -1) {
-        pmFPARead (fpa, fits, phu, database);
+        pmFPARead (fpa, fits, NULL, NULL);
         return true;
     }
@@ -276 +318 @@
 
     if (view->cell == -1) {
-        pmChipRead (chip, fits, phu, database);
+        pmChipRead (chip, fits, NULL, NULL);
         return true;
     }
@@ -286 +328 @@
 
     if (view->readout == -1) {
-        pmCellRead (cell, fits, phu, database);
+        pmCellRead (cell, fits, NULL, NULL);
         return true;
     }
@@ -296 +338 @@
 
     if (view->nRows == 0) {
-        pmReadoutRead (readout, fits, phu, database);
+        pmReadoutRead (readout, fits, NULL, NULL);
     } else {
-        pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, phu, database);
+        pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
     }
     return true;