Changeset 1779 for branches/mergetest/external/atnf/PKSIO/PKSreader.h

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• external/atnf/PKSIO/PKSreader.h (modified) (8 diffs)

branches/mergetest/external/atnf/PKSIO/PKSreader.h

@@ -37 +37 @@
 #define ATNF_PKSREADER_H
 
-#include <atnf/PKSIO/PKSmsg.h>
 #include <atnf/PKSIO/PKSrecord.h>
+#include <atnf/PKSIO/SrcType.h>
 
 #include <casa/aips.h>
 #include <casa/Arrays/Matrix.h>
 #include <casa/Arrays/Vector.h>
+#include <casa/BasicSL/Complex.h>
 #include <casa/BasicSL/String.h>
 
@@ -70 +71 @@
 class PKSreader* getPKSreader(
         const String name,
+        const String antenna,
         const Int retry,
         const Int interpolate,
@@ -84 +86 @@
 class PKSreader* getPKSreader(
         const String name,
+        const String antenna,
         const Vector<String> directories,
         const Int retry,
@@ -97 +100 @@
         Bool   &haveSpectra);
 
-class PKSreader : public PKSmsg
+
+class PKSreader
 {
   public:
@@ -106 +110 @@
     virtual Int open(
         const String inName,
+        const String antenna,
         Vector<Bool> &beams,
         Vector<Bool> &IFs,
@@ -148 +153 @@
         const Bool getSpectra = True,
         const Bool getXPol    = False,
+        const Bool getFeedPos = False,
+        const Bool getPointing = False,
         const Int  coordSys   = 0) = 0;
+
 
     // Find the range of the data selected in time and position.
@@ -157 +165 @@
         Matrix<Double> &positions) = 0;
 
-    // Read the next data record.
+    // Read the next data record. 
+/**
+    virtual Int read(
+        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,
+        Vector<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,
+        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) = 0;
+**/
+/**
+    // 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) = 0;
+**/
     virtual Int read(PKSrecord &pksrec) = 0;
 
@@ -164 +227 @@
 
   protected:
-    Bool  cGetSpectra, cGetXPol;
+    Bool   cGetFeedPos, cGetSpectra, cGetXPol, cGetPointing;
     Int   cCoordSys;