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

Timestamp:

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

Author:

Malte Marquarding

Message:

update from livedata CVS

File:

• trunk/external/atnf/PKSIO/MBFITSreader.h (modified) (6 diffs)

trunk/external/atnf/PKSIO/MBFITSreader.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id: MBFITSreader.h,v 19.15 2008-06-26 02:14:36 cal103 Exp $
+//# $Id: MBFITSreader.h,v 19.21 2008-11-17 06:33:10 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The MBFITSreader class reads single dish RPFITS files (such as Parkes
@@ -39 +39 @@
 
 #include <atnf/PKSIO/FITSreader.h>
-#include <atnf/PKSIO/PKSMBrecord.h>
+#include <atnf/PKSIO/MBrecord.h>
+
+using namespace std;
 
 // <summary>
@@ -102 +104 @@
 
     // Read the next data record.
-    virtual int read(PKSMBrecord &record);
+    virtual int read(MBrecord &record);
 
     // Close the RPFITS file.
@@ -112 +114 @@
     float cUTC, cU, cV, cW, *cVis, *cWgt;
 
-    char   cDateObs[10];
+    char   cDateObs[12];
     int    *cBeamSel, *cChanOff, cFirst, *cIFSel, cInterp, cIntTime, cMBopen,
            cMopra, cNBeamSel, cNBin, cRetry, cSUpos, *cXpolOff;
@@ -119 +121 @@
     int    cEOF, cEOS, cFlushBin, cFlushIF, cFlushing;
     double *cPosUTC;
-    PKSMBrecord *cBuffer;
+    MBrecord *cBuffer;
 
+    // Scan and cycle number bookkeeping.
     int    cCycleNo, cScanNo;
     double cPrevUTC;
@@ -126 +129 @@
     // Read the next data record from the RPFITS file.
     int rpget(int syscalonly, int &EOS);
+    int rpfitsin(int &jstat);
+
+    // Check and, if necessary, repair a position timestamp.
+    int    cCode5, cNRate;
+    double cAvRate[2];
+    int fixw(const char *datobs, int cycleNo, int beamNo, double avRate[2],
+             double thisRA, double thisDec, double thisUTC,
+             double nextRA, double nextDec, float &nextUTC);
+
+    // Subtract two UTCs (s).
+    double utcDiff(double utc1, double utc2);
+
+    // Compute and apply the scan rate corrected for grid convergence.
+    double cRA0, cDec0;
+    void  scanRate(double ra0, double dec0,
+                   double ra1, double dec1,
+                   double ra2, double dec2, double dt,
+                   double &raRate, double &decRate);
+    void applyRate(double ra0, double dec0,
+                   double ra1, double dec1,
+                   double raRate, double decRate, double dt,
+                   double &ra2, double &dec2);
+    void eulerx(double lng0, double lat0, double phi0, double theta,
+                double phi, double &lng1, double &lat1);
 };