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

Timestamp:

Mar 9, 2006, 10:56:39 AM (20 years ago)

Author:

magnier

Message:

fixed compile errors in the new pmFPAview and pmFPAfile

File:

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

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

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-09 03:24:49 $
+ *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 20:56:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #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)
 {
@@ -308 +284 @@
 
     if (view->chip == -1) {
-        pmFPARead (fpa, fits, NULL, NULL);
+        pmFPARead (fpa, fits, NULL);
         return true;
     }
@@ -318 +294 @@
 
     if (view->cell == -1) {
-        pmChipRead (chip, fits, NULL, NULL);
+        pmChipRead (chip, fits, NULL);
         return true;
     }
@@ -328 +304 @@
 
     if (view->readout == -1) {
-        pmCellRead (cell, fits, NULL, NULL);
-        return true;
-    }
-
-    if (view->readout >= cell->readouts->n) {
-        return false;
-    }
+        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, NULL);
+        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