Changeset 1694 for trunk/src/Scantable.cpp

Timestamp:

02/11/10 09:45:47 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #172: inverse scaling factor was used in coordinate resampling. Also added no of channels to each IF in scantable.summary and made all get{IF/Beam/Pol}No functions const

File:

• trunk/src/Scantable.cpp (modified) (4 diffs)

trunk/src/Scantable.cpp

@@ -560 +560 @@
 }
 
-std::vector<uint> Scantable::getNumbers(ScalarColumn<uInt>& col)
+std::vector<uint> Scantable::getNumbers(const ScalarColumn<uInt>& col) const
 {
   Vector<uInt> nos(col.getColumn());
@@ -770 +770 @@
       << setw(15) << "Polarisations:" << setw(4) << npol()
       << "(" << getPolType() << ")" << endl
-      << setw(15) << "Channels:"  << setw(4) << nchan() << endl;
-  oss << endl;
+      << setw(15) << "Channels:" << nchan() << endl;
   String tmp;
   oss << setw(15) << "Observer:"
@@ -802 +801 @@
       << setw(10) << "Time" << setw(18) << "Integration" << endl;
   oss << setw(5) << "" << setw(5) << "Beam" << setw(3) << "" << dirtype << endl;
-  oss << setw(10) << "" << setw(3) << "IF" << setw(6) << ""
+  oss << setw(10) << "" << setw(3) << "IF" << setw(3) << ""
       << setw(8) << "Frame" << setw(16)
-      << "RefVal" << setw(10) << "RefPix" << setw(12) << "Increment" <<endl;
+      << "RefVal" << setw(10) << "RefPix" << setw(12) << "Increment"
+      << setw(7) << "Channels"
+      << endl;
   oss << asap::SEPERATOR << endl;
   TableIterator iter(table_, "SCANNO");
@@ -839 +840 @@
         ROTableRow irow(isubt);
         const TableRecord& irec = irow.get(0);
-        oss << setw(10) << "";
+        oss << setw(9) << "";
         oss << setw(3) << std::right << irec.asuInt("IFNO") << std::left
-            << setw(2) << "" << frequencies().print(irec.asuInt("FREQ_ID"))
+            << setw(1) << "" << frequencies().print(irec.asuInt("FREQ_ID"))
+            << setw(3) << "" << nchan(irec.asuInt("IFNO"))
             << endl;