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

Timestamp:

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

Author:

Malte Marquarding

Message:

update from livedata CVS

File:

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

trunk/external/atnf/PKSIO/FITSreader.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id: FITSreader.h,v 19.6 2007/11/12 03:37:56 cal103 Exp $
+//# $Id: FITSreader.h,v 19.9 2008-11-17 06:28:04 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The FITSreader class is an abstract base class for the Parkes Multibeam
@@ -38 +38 @@
 #define ATNF_FITSREADER_H
 
-#include <atnf/PKSIO/PKSMBrecord.h>
+#include <atnf/PKSIO/MBrecord.h>
+#include <atnf/PKSIO/PKSmsg.h>
+
+using namespace std;
 
 // <summary>
@@ -44 +47 @@
 // </summary>
 
-class FITSreader
+class FITSreader : public PKSmsg
 {
   public:
@@ -91 +94 @@
     // Set data selection criteria.  Channel numbering is 1-relative, zero or
     // negative channel numbers are taken to be offsets from the last channel.
+    // Coordinate systems are
+    //   0: equatorial (RA,Dec),
+    //   1: vertical (Az,El),
+    //   2: feed-plane.
     int select(
         const int startChan[],
@@ -96 +103 @@
         const int refChan[],
         const int getSpectra = 1,
-        const int getXPol = 0,
-        const int getFeedPos = 0);
+        const int getXPol  = 0,
+        const int coordSys = 0);
 
     // Find the range in time and position of the data selected.
@@ -109 +116 @@
     // Read the next data record.
     virtual int read(
-        PKSMBrecord &record) = 0;
+        MBrecord &record) = 0;
 
     // Close the RPFITS file.
@@ -115 +122 @@
 
   protected:
-    int    *cBeams, *cEndChan, cGetFeedPos, cGetSpectra, cGetXPol, cHaveBase,
-           cHaveSpectra, *cHaveXPol, *cIFs, cNBeam, *cNChan, cNIF, *cNPol,
-           *cRefChan, *cStartChan;
+    int  *cBeams, *cEndChan, cCoordSys, cGetSpectra, cGetXPol, cHaveBase,
+         cHaveSpectra, *cHaveXPol, *cIFs, cNBeam, *cNChan, cNIF, *cNPol,
+         *cRefChan, *cStartChan;
+
+    // For use in constructing messages.
+    char cMsg[256];
 };