Changeset 1427 for trunk/external/atnf/PKSIO/PKSreader.h

Timestamp:

07/04/08 13:23:49 (16 years ago)

Author:

Malte Marquarding

Message:

sync with livedata/implement/atnf

File:

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

trunk/external/atnf/PKSIO/PKSreader.h

@@ -2 +2 @@
 //# PKSreader.h: Class to read Parkes multibeam data.
 //#---------------------------------------------------------------------------
-//# Copyright (C) 2000-2007
+//# Copyright (C) 2000-2008
 //# Associated Universities, Inc. Washington DC, USA.
 //#
@@ -26 +26 @@
 //#                        Charlottesville, VA 22903-2475 USA
 //#
-//# $Id: PKSreader.h,v 19.12 2007/11/12 03:37:56 cal103 Exp $
+//# $Id: PKSreader.h,v 19.13 2008-06-26 01:50:24 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# Original: 2000/08/02, Mark Calabretta, ATNF
@@ -40 +40 @@
 #include <casa/BasicSL/String.h>
 
+#include <casa/namespace.h>
+
 // <summary>
 // Class to read Parkes multibeam data.
 // </summary>
-
-#include <casa/namespace.h>
 
 // Open an appropriate PKSreader for a Parkes Multibeam dataset.
@@ -76 +76 @@
         Bool   &haveSpectra);
 
+class MBrecord;
 
 class PKSreader
@@ -132 +133 @@
         Matrix<Double> &positions) = 0;
 
-    // Read the next data record.
+    // Read the next data record (MBrecord is defined below).
+    virtual Int read(MBrecord &mbrec) = 0;
+
+    // Read the next data record (for backwards compatibility, do not use).
     virtual Int read(
         Int             &scanNo,
@@ -174 +178 @@
         Matrix<uChar>   &flagged,
         Complex         &xCalFctr,
-        Vector<Complex> &xPol) = 0;
+        Vector<Complex> &xPol);
 
     // Read the next data record, just the basics.
@@ -196 +200 @@
 };
 
+
+// Essentially just a struct used as a function argument.
+class MBrecord
+{
+  public:
+    Int             scanNo;
+    Int             cycleNo;
+    Double          mjd;
+    Double          interval;
+    String          fieldName;
+    String          srcName;
+    Vector<Double>  srcDir;
+    Vector<Double>  srcPM;
+    Double          srcVel;
+    String          obsType;
+    Int             IFno;
+    Double          refFreq;
+    Double          bandwidth;
+    Double          freqInc;
+    Double          restFreq;
+    Vector<Float>   tcal;
+    String          tcalTime;
+    Float           azimuth;
+    Float           elevation;
+    Float           parAngle;
+    Float           focusAxi;
+    Float           focusTan;
+    Float           focusRot;
+    Float           temperature;
+    Float           pressure;
+    Float           humidity;
+    Float           windSpeed;
+    Float           windAz;
+    Int             refBeam;
+    Int             beamNo;
+    Vector<Double>  direction;
+    Vector<Double>  scanRate;
+    Int             rateAge;
+    Int             rateson;
+    Vector<Float>   tsys;
+    Vector<Float>   sigma;
+    Vector<Float>   calFctr;
+    Matrix<Float>   baseLin;
+    Matrix<Float>   baseSub;
+    Matrix<Float>   spectra;
+    Matrix<uChar>   flagged;
+    Complex         xCalFctr;
+    Vector<Complex> xPol;
+};
+
 #endif