Changeset 1372

Timestamp:

07/09/07 11:34:03 (17 years ago)

Author:

mar637

Message:

latest update from livedata CVS. This has the Hobart position fix

Location:

trunk/external/atnf/PKSIO

Files:

• MBFITSreader.cc (modified) (12 diffs)
• MBFITSreader.h (modified) (2 diffs)

trunk/external/atnf/PKSIO/MBFITSreader.cc

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id: MBFITSreader.cc,v 19.32 2007/01/30 23:40:30 cal103 Exp $
+//# $Id: MBFITSreader.cc,v 19.34 2007/07/02 06:12:18 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The MBFITSreader class reads single dish RPFITS files (such as Parkes
@@ -132 +132 @@
 
   if (jstat) {
-    fprintf(stderr, "Failed to open MBFITS file: %s\n", rpname);
+    fprintf(stderr, "ERROR, failed to open MBFITS file: %s\n", rpname);
     return 1;
   }
@@ -152 +152 @@
 
   if (jstat) {
-    fprintf(stderr, "Failed to read MBFITS header: %s\n", rpname);
+    fprintf(stderr, "ERROR, failed to read MBFITS header: %s\n", rpname);
     close();
     return 1;
@@ -160 +160 @@
   cMopra = strncmp(names_.instrument, "ATMOPRA", 7) == 0;
 
-  // Tidbinbilla data has some more.
-  cTid = strncmp(names_.sta, "tid", 3) == 0;
-  if (cTid) {
-    // Telescope position is stored in the source table.
+  // Non-ATNF data may not store the position in (u,v,w).
+  if (strncmp(names_.sta, "tid", 3) == 0) {
+    fprintf(stderr, "WARNING, found Tidbinbilla data");
+    cSUpos = 1;
+  } else if (strncmp(names_.sta, "HOB", 3) == 0) {
+    fprintf(stderr, "WARNING, found Hobart data");
+    cSUpos = 1;
+  } else if (strncmp(names_.sta, "CED", 3) == 0) {
+    fprintf(stderr, "WARNING, found Ceduna data");
+    cSUpos = 1;
+  } else {
+    cSUpos = 0;
+  }
+
+  if (cSUpos) {
+    fprintf(stderr, ", using telescope position from SU table.\n");
     cInterp = 0;
   }
@@ -177 +189 @@
 
   if (cNBeam <= 0) {
-    fprintf(stderr, "Couldn't determine number of beams.\n");
+    fprintf(stderr, "ERROR, couldn't determine number of beams.\n");
     close();
     return 1;
@@ -279 +291 @@
   // Read the first syscal record.
   if (rpget(1, cEOS)) {
-    fprintf(stderr, "Error: Failed to read first syscal record.\n");
+    fprintf(stderr, "ERROR, failed to read first syscal record.\n");
     close();
     return 1;
@@ -314 +326 @@
 {
   if (!cMBopen) {
-    fprintf(stderr, "An MBFITS file has not been opened.\n");
+    fprintf(stderr, "ERROR, an MBFITS file has not been opened.\n");
     return 1;
   }
@@ -436 +448 @@
 
   if (!cMBopen) {
-    fprintf(stderr, "An MBFITS file has not been opened.\n");
+    fprintf(stderr, "ERROR, an MBFITS file has not been opened.\n");
     return 1;
   }
@@ -564 +576 @@
 
           if (cNBin > 1 && cNBeamSel > 1) {
-            fprintf(stderr, "Cannot handle binning mode for multiple "
+            fprintf(stderr, "ERROR, cannot handle binning mode for multiple "
                             "beams.\n");
             close();
@@ -891 +903 @@
       }
 
+      // Sanity check on incomplete integrations within a scan.
+      if (iMBuff->nIF && (iMBuff->cycleNo != cCycleNo)) {
+        // Force the incomplete integration to be flushed before proceeding.
+        cFlushing = 1;
+        continue;
+      }
+
       iMBuff->scanNo  = cScanNo;
       iMBuff->cycleNo = cCycleNo;
@@ -929 +948 @@
 
       // Beam position at the specified time.
-      if (cTid) {
-        // Tidbinbilla data.
+      if (cSUpos) {
+        // Non-ATNF data that does not store the position in (u,v,w).
         iMBuff->ra  = doubles_.su_ra[cSrcNo-1];
         iMBuff->dec = doubles_.su_dec[cSrcNo-1];
@@ -1211 +1230 @@
   }
 
-  fprintf(stderr, "RPFITS read failed too many times.\n");
+  fprintf(stderr, "ERROR, RPFITS read failed too many times.\n");
   return 2;
 }

trunk/external/atnf/PKSIO/MBFITSreader.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id: MBFITSreader.h,v 19.12 2007/01/30 23:40:30 cal103 Exp $
+//# $Id: MBFITSreader.h,v 19.13 2007/07/02 06:11:22 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The MBFITSreader class reads single dish RPFITS files (such as Parkes
@@ -113 +113 @@
     char   cDateObs[10];
     int    *cBeamSel, *cChanOff, cFirst, *cIFSel, cInterp, cIntTime, cMBopen,
-           cMopra, cNBeamSel, cNBin, cRetry, *cStaleness, cTid, *cXpolOff;
+           cMopra, cNBeamSel, cNBin, cRetry, *cStaleness, cSUpos, *cXpolOff;
 
     // The data has to be bufferred to allow positions to be interpolated.