Changeset 1635 for trunk/external/atnf/PKSIO/MBFITSreader.cc

Timestamp:

09/25/09 11:47:11 (15 years ago)

Author:

Malte Marquarding

Message:

Update from livedata CVS

File:

• trunk/external/atnf/PKSIO/MBFITSreader.cc (modified) (20 diffs)

trunk/external/atnf/PKSIO/MBFITSreader.cc

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id: MBFITSreader.cc,v 19.54 2008-11-17 06:51:55 cal103 Exp $
+//# $Id: MBFITSreader.cc,v 19.55 2009-01-20 06:45:33 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The MBFITSreader class reads single dish RPFITS files (such as Parkes
@@ -141 +141 @@
   int jstat = -3;
   if (rpfitsin(jstat)) {
-    sprintf(cMsg, "ERROR: failed to open MBFITS file\n       %s", rpname);
+    sprintf(cMsg, "ERROR: Failed to open MBFITS file\n       %s", rpname);
     logMsg(cMsg);
     return 1;
@@ -159 +159 @@
   jstat = -1;
   if (rpfitsin(jstat)) {
-    sprintf(cMsg, "ERROR: failed to read MBFITS header in file\n"
+    sprintf(cMsg, "ERROR: Failed to read MBFITS header in file\n"
                   "       %s", rpname);
     logMsg(cMsg);
@@ -205 +205 @@
 
   if (cNBeam <= 0) {
-    logMsg("ERROR, couldn't determine number of beams.");
+    logMsg("ERROR: Couldn't determine number of beams.");
     close();
     return 1;
@@ -337 +337 @@
   // Read the first syscal record.
   if (rpget(1, cEOS)) {
-    logMsg("ERROR, failed to read first syscal record.");
+    logMsg("ERROR: Failed to read first syscal record.");
     close();
     return 1;
@@ -373 +373 @@
 {
   if (!cMBopen) {
-    logMsg("ERROR, an MBFITS file has not been opened.");
+    logMsg("ERROR: An MBFITS file has not been opened.");
     return 1;
   }
@@ -515 +515 @@
 
   if (!cMBopen) {
-    logMsg("ERROR, an MBFITS file has not been opened.");
+    logMsg("ERROR: An MBFITS file has not been opened.");
     return 1;
   }
@@ -588 +588 @@
           cXpolOff = new int[cNIF];
 
-          int simulIF = 0;
           int maxChan = 0;
           int maxXpol = 0;
 
+          cSimulIF = 0;
           for (int iIF = 0; iIF < cNIF; iIF++) {
             if (cIFs[iIF]) {
@@ -617 +617 @@
 
               // Maximum number of selected IFs in any simultaneous set.
-              simulIF = max(simulIF, cIFSel[iIF]+1);
+              cSimulIF = max(cSimulIF, cIFSel[iIF]+1);
 
               // Maximum memory required for any simultaneous set.
@@ -644 +644 @@
 
           if (cNBin > 1 && cNBeamSel > 1) {
-            logMsg("ERROR, cannot handle binning mode for multiple beams.");
+            logMsg("ERROR: Cannot handle binning mode for multiple beams.\n"
+                   "       Select a single beam for input.");
             close();
             return 1;
@@ -657 +658 @@
           // Allocate memory for spectral arrays.
           for (int ibuff = 0; ibuff < nBuff; ibuff++) {
-            cBuffer[ibuff].setNIFs(simulIF);
+            cBuffer[ibuff].setNIFs(cSimulIF);
             cBuffer[ibuff].allocate(0, maxChan, maxXpol);
 
             // Signal that this IF in this buffer has been flushed.
-            for (int iIF = 0; iIF < simulIF; iIF++) {
+            for (int iIF = 0; iIF < cSimulIF; iIF++) {
               cBuffer[ibuff].IFno[iIF] = 0;
             }
@@ -679 +680 @@
           cCycleNo = 0;
           cPrevUTC = -1.0;
+        }
+
+        // Apply beam and IF selection before the change-of-day test to allow
+        // a single selected beam and IF to be handled in binning-mode.
+        beamNo = int(cBaseline / 256.0);
+        if (beamNo == 1) {
+          // Store the position of beam 1 for grid convergence corrections.
+          cRA0  = cU;
+          cDec0 = cV;
+        }
+        iBeamSel = cBeamSel[beamNo-1];
+        if (iBeamSel < 0) continue;
+
+        // Sanity check (mainly for MOPS).
+        if (cIFno > cNIF) continue;
+
+        // Apply IF selection.
+        iIFSel = cIFSel[cIFno - 1];
+        if (iIFSel < 0) continue;
+
+
+        if (cNBin > 1) {
+          // Binning mode: correct the time.
+          cUTC += param_.intbase * (cBin - (cNBin + 1)/2.0);
         }
 
@@ -689 +714 @@
           // the start of the next.
 #ifdef PKSIO_DEBUG
-          fprintf(stderr, "Change-of-day on cUTC: %.1f -> %.1f",
+          fprintf(stderr, "Change-of-day on cUTC: %.1f -> %.1f\n",
             cPrevUTC, cUTC);
 #endif
@@ -707 +732 @@
         }
 
-        if (cNBin > 1) {
-          // Binning mode: correct the time.
-          cUTC += param_.intbase * (cBin - (cNBin + 1)/2.0);
-        }
-
         // New integration cycle?
         if ((cUTC+cod) > cPrevUTC) {
@@ -717 +737 @@
           cPrevUTC = cUTC + 0.0001;
         }
-
-        // Apply beam selection.
-        beamNo = int(cBaseline / 256.0);
-        if (beamNo == 1) {
-          // Store the position of beam 1 for grid convergence corrections.
-          cRA0  = cU;
-          cDec0 = cV;
-        }
-        iBeamSel = cBeamSel[beamNo-1];
-        if (iBeamSel < 0) continue;
-
-        // Sanity check (mainly for MOPS).
-        if (cIFno > cNIF) continue;
-
-        // Apply IF selection.
-        iIFSel = cIFSel[cIFno - 1];
-        if (iIFSel < 0) continue;
 
         sprintf(cDateObs, "%-10.10s", names_.datobs);
@@ -784 +787 @@
           iMBuff = cBuffer + iBeamSel + cNBeamSel*cFlushBin;
 
-          // iMBuff->nIF is set to zero (below) to signal that all IFs in
-          // an integration have been flushed.
+          // iMBuff->nIF is decremented (below) and if zero signals that all
+          // IFs in an integration have been flushed.
           if (iMBuff->nIF) {
             if (cycleNo == 0 || iMBuff->cycleNo < cycleNo) {
@@ -805 +808 @@
 
         // Find the IF to flush.
-        for (; cFlushIF < iMBuff->nIF; cFlushIF++) {
+        for (; cFlushIF < cSimulIF; cFlushIF++) {
           if (iMBuff->IFno[cFlushIF]) break;
         }
@@ -827 +830 @@
 
 
-    if (cFlushing && cFlushBin == 0 && cFlushIF == 0 && cInterp) {
+    if (cInterp && cFlushing == 1) {
       // Start of flush cycle, interpolate the beam position.
       //
@@ -1098 +1101 @@
 #endif
       }
+
+      cFlushing = 2;
     }
 
@@ -1114 +1119 @@
       iMBuff->IFno[cFlushIF] = 0;
 
-      if (cFlushIF == iMBuff->nIF - 1) {
-        // Signal that all IFs in this buffer location have been flushed.
-        iMBuff->nIF = 0;
-
-        // Stop cEOS being set when the next integration is read.
+      iMBuff->nIF--;
+      if (iMBuff->nIF == 0) {
+        // All IFs in this buffer location have been flushed.  Stop cEOS
+        // being set when the next integration is read.
         iMBuff->cycleNo = 0;