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

Timestamp:

11/16/07 13:36:15 (17 years ago)

Author:

Malte Marquarding

Message:

Mark C added brightness unit to getHeader()

File:

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

trunk/external/atnf/PKSIO/MBFITSreader.cc

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id: MBFITSreader.cc,v 19.34 2007/07/02 06:12:18 cal103 Exp $
+//# $Id: MBFITSreader.cc,v 19.36 2007/11/12 03:37:56 cal103 Exp $
 //#---------------------------------------------------------------------------
 //# The MBFITSreader class reads single dish RPFITS files (such as Parkes
@@ -317 +317 @@
         double antPos[3],
         char   obsType[32],
+        char   bunit[32],
         float  &equinox,
         char   radecsys[32],
@@ -392 +393 @@
   obsType[j] = '\0';
 
+  // Brightness unit.
+  sprintf(bunit, "%-16.16s", names_.bunit);
+  if (strcmp(bunit, "JY") == 0) {
+    bunit[1] = 'y';
+  } else if (strcmp(bunit, "JY/BEAM") == 0) {
+    strcpy(bunit, "Jy/beam");
+  }
+
   // Coordinate frames.
   equinox = 2000.0f;
@@ -613 +622 @@
         }
 
+        // Check for change-of-day.
+        if (cUTC < cPrevUTC - 85800.0) {
+          cUTC += 86400.0;
+        }
+
+        if (cNBin > 1) {
+          // Binning mode: correct the time.
+          cUTC += param_.intbase * (cBin - (cNBin + 1)/2.0);
+        }
+
+        // New integration cycle?
+        if (cUTC > cPrevUTC) {
+          cCycleNo++;
+          cPrevUTC = cUTC + 0.0001;
+        }
+
         // Apply beam selection.
         beamNo = int(cBaseline / 256.0);
@@ -626 +651 @@
 
         sprintf(cDateObs, "%-10.10s", names_.datobs);
-
-        // Check for change-of-day.
-        if (cUTC < cPrevUTC - 85800.0) {
-          cUTC += 86400.0;
-        }
-
-        if (cNBin > 1) {
-          // Binning mode: correct the time.
-          cUTC += param_.intbase * (cBin - (cNBin + 1)/2.0);
-        }
-
-        // New integration cycle?
-        if (cUTC > cPrevUTC) {
-          cCycleNo++;
-          cPrevUTC = cUTC + 0.0001;
-        }
 
         // Compute buffer number.
@@ -895 +904 @@
     if (!cFlushing) {
       // Buffer this MBrec.
-      if (cCycleNo == 1 && iMBuff->IFno[0]) {
+      if ((cScanNo > iMBuff->scanNo) && iMBuff->IFno[0]) {
         // Sanity check on the number of IFs in the new scan.
         if (if_.n_if != cNIF) {