Changeset 1452 for trunk/external/atnf/PKSIO/PKSFITSreader.h

Timestamp:

11/19/08 20:41:16 (16 years ago)

Author:

Malte Marquarding

Message:

update from livedata CVS

File:

• trunk/external/atnf/PKSIO/PKSFITSreader.h (modified) (7 diffs)

trunk/external/atnf/PKSIO/PKSFITSreader.h

@@ -26 +26 @@
 //#                        Charlottesville, VA 22903-2475 USA
 //#
-//# $Id: PKSFITSreader.h,v 19.13 2008-06-26 02:02:43 cal103 Exp $
+//# $Id: PKSFITSreader.h,v 19.17 2008-11-17 06:38:05 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# This class is basically a wrapper class for reading data from either an
@@ -39 +39 @@
 
 #include <atnf/PKSIO/FITSreader.h>
+#include <atnf/PKSIO/PKSrecord.h>
 #include <atnf/PKSIO/PKSreader.h>
 
 #include <casa/aips.h>
+#include <casa/stdio.h>
 #include <casa/Arrays/Vector.h>
 #include <casa/Arrays/Matrix.h>
@@ -47 +49 @@
 #include <casa/BasicSL/String.h>
 
+#include <casa/namespace.h>
+
 // <summary>
 // Class to read Parkes Multibeam data from a FITS file.
 // </summary>
 
-#include <casa/namespace.h>
 class PKSFITSreader : public PKSreader
 {
@@ -63 +66 @@
     // Destructor.
     virtual ~PKSFITSreader();
+
+    // Set message disposition.
+    virtual Int setMsg(
+        FILE *fd = 0x0);
 
     // Open the FITS file for reading.
@@ -104 +111 @@
         const Bool getSpectra = True,
         const Bool getXPol    = False,
-        const Bool getFeedPos = False);
+        const Int  coordSys   = 0);
 
     // Find the range of the data selected in time and position.
@@ -114 +121 @@
 
     // Read the next data record.
-    virtual Int read(MBrecord &mbrec);
-
-    // Read the next data record, just the basics.
-    virtual Int read(
-        Int           &IFno,
-        Vector<Float> &tsys,
-        Vector<Float> &calFctr,
-        Matrix<Float> &baseLin,
-        Matrix<Float> &baseSub,
-        Matrix<Float> &spectra,
-        Matrix<uChar> &flagged);
+    virtual Int read(PKSrecord &pksrec);
 
     // Close the FITS file.
@@ -132 +129 @@
     Int    *cBeams, *cIFs;
     uInt   cNBeam, cNIF;
-    PKSMBrecord cFITSMBrec;
+    MBrecord cMBrec;
     FITSreader  *cReader;