Changeset 1111 for trunk/src/Scantable.cpp

Timestamp:

08/04/06 12:06:38 (18 years ago)

Author:

mar637

Message:

add getNumbers utility function, which is now called by all function which retrieve numbers from the Scantable

File:

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

trunk/src/Scantable.cpp

@@ -134 +134 @@
       table_.markForDelete();
   }
-
+  /// @todo reindex SCANNO, recompute nbeam, nif, npol
   if ( clear ) copySubtables(other);
   attachSubtables();
@@ -338 +338 @@
 
 
-int Scantable::nscan() const {
-  Vector<uInt> scannos(scanCol_.getColumn());
-  uInt nout = GenSort<uInt>::sort( scannos, Sort::Ascending,
-                       Sort::QuickSort|Sort::NoDuplicates );
-  return int(nout);
-}
 
 std::string Scantable::formatSec(Double x) const
@@ -418 +412 @@
   String inname(filename);
   Path path(inname);
+  /// @todo reindex SCANNO, recompute nbeam, nif, npol
   inname = path.expandedName();
   table_.deepCopy(inname, Table::New);
@@ -532 +527 @@
 }
 
+int Scantable::nscan() const {
+  Vector<uInt> scannos(scanCol_.getColumn());
+  uInt nout = GenSort<uInt>::sort( scannos, Sort::Ascending,
+                       Sort::QuickSort|Sort::NoDuplicates );
+  return int(nout);
+}
+
 int Scantable::getChannels(int whichrow) const
 {
@@ -540 +542 @@
 {
   return beamCol_(whichrow);
+}
+
+std::vector<uint> Scantable::getNumbers(ScalarColumn<uInt>& col)
+{
+  Vector<uInt> nos(col.getColumn());
+  GenSort<uInt>::sort( nos, Sort::Ascending,
+                       Sort::QuickSort|Sort::NoDuplicates );
+  std::vector<uint> stlout;
+  nos.tovector(stlout);
+  return stlout;
 }
 
@@ -981 +993 @@
 }
 
-void asap::Scantable::addFit( const STFitEntry & fit, int row )
+void Scantable::addFit( const STFitEntry & fit, int row )
 {
   cout << mfitidCol_(uInt(row)) << endl;