Changeset 1779 for branches/mergetest/external/atnf/PKSIO/PKSMS2reader.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/PKSMS2reader.h (modified) (8 diffs)

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

@@ -68 +68 @@
     virtual Int open(
         const String msName,
+        const String antenna,
         Vector<Bool> &beams,
         Vector<Bool> &IFs,
@@ -85 +86 @@
         String &bunit,
         Float  &equinox,
+        //String &freqRef,
         String &dopplerFrame,
         Double &mjd,
@@ -105 +107 @@
         const Bool getSpectra = True,
         const Bool getXPol    = False,
+        const Bool getFeedPos = False,
+        const Bool getPointing = False,
         const Int  coordSys   = 0);
+
 
     // Find the range of the data selected in time and position.
@@ -115 +120 @@
 
     // 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          &obsMode,
+        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);
+**/
     virtual Int read(PKSrecord &pksrec);
+
+
+    // 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);
 
     // Close the MS.
@@ -121 +181 @@
 
   private:
+    Vector<String> splitAntennaSelectionString( const String s );
+    void setupAntennaList( const String s ) ;
+
     Bool   cHaveBaseLin, cHaveCalFctr, cHaveSrcVel, cHaveTsys, cHaveXCalFctr,
-           cMSopen;
+           cMSopen, cHaveTcal, cHaveDataCol, cALMA, cHaveSysCal, cHaveCorrectedDataCol;
     Int    cCycleNo, cIdx, cNRow, cScanNo;
-    Double cTime;
+    Double cTime, lastmjd;
     Vector<Int>    cEndChan, cRefChan, cStartChan;
     Vector<Bool>   cBeams, cIFs;
     Vector<Slicer> cDataSel;
+    String         cDirRef, cTelName;
     MeasurementSet cPKSMS;
+    Table          cSysCalTab, tmptab, tmptab2;
+
+    //Vector<String> cAntenna;
+    Vector<Int> cAntId;
 
     ROScalarColumn<Int>     cScanNoCol;
@@ -135 +203 @@
     ROScalarColumn<Int>     cFieldIdCol;
     ROScalarColumn<String>  cFieldNameCol;
+    ROArrayColumn<Double>   cFieldDelayDirCol;
     ROScalarColumn<Int>     cSrcIdCol;
+    ROScalarColumn<Int>     cSrcId2Col;
     ROScalarColumn<String>  cSrcNameCol;
     ROArrayColumn<Double>   cSrcDirCol;
@@ -141 +211 @@
     ROArrayColumn<Double>   cSrcVelCol;
     ROScalarColumn<Int>     cStateIdCol;
+    ROScalarColumn<Double>  cCalCol;   
     ROScalarColumn<String>  cObsModeCol;
     ROArrayColumn<Double>   cSrcRestFrqCol;
     ROScalarColumn<Int>     cDataDescIdCol;
+    ROScalarColumn<Int>     cSpWinIdCol;
     ROArrayColumn<Double>   cChanFreqCol;
+    ROScalarColumn<Double>   cTotBWCol;
     ROScalarColumn<Double>  cWeatherTimeCol;
     ROScalarColumn<Float>   cTemperatureCol;
     ROScalarColumn<Float>   cPressureCol;
     ROScalarColumn<Float>   cHumidityCol;
+    ROArrayColumn<Float>    cTcalCol;
     ROScalarColumn<Int>     cBeamNoCol;
     ROArrayColumn<Double>   cPointingCol;
+    ROScalarColumn<Double>  cPointingTimeCol;
     ROArrayColumn<Float>    cTsysCol;
     ROArrayColumn<Float>    cSigmaCol;
@@ -158 +233 @@
     ROArrayColumn<Float>    cFloatDataCol;
     ROArrayColumn<Bool>     cFlagCol;
+    ROScalarColumn<Bool>    cFlagRowCol;
     ROScalarColumn<Complex> cXCalFctrCol;
     ROArrayColumn<Complex>  cDataCol;
+    ROArrayColumn<Complex>  cCorrectedDataCol;
     ROScalarColumn<Int>     cNumReceptorCol;
+    ROScalarColumn<Bool>    cSigStateCol;
+    ROScalarColumn<Bool>    cRefStateCol;
+    
 };