Changeset 1111 for trunk

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

Location:

trunk/src

Files:

• Scantable.cpp (modified) (6 diffs)
• Scantable.h (modified) (3 diffs)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

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;

trunk/src/Scantable.h

@@ -250 +250 @@
   std::string getPolType() const;
 
+
+  /**
+   * Get the number of integartion cycles
+   * @param scanno the scan number to get the number of rows for.
+   * If scanno<0 the number is retrieved from the header.
+   * @return the number of rows (for the specified scanno)
+   */
+  int nrow(int scanno=-1) const;
+
+  int getBeam(int whichrow) const;
+  std::vector<uint> getBeamNos() { return getNumbers(beamCol_); }
+
+  int getIF(int whichrow) const;
+  std::vector<uint> getIFNos() { return getNumbers(ifCol_); }
+
+  int getPol(int whichrow) const;
+  std::vector<uint> getPolNos() { return getNumbers(polCol_); }
+
+  std::vector<uint> getScanNos() { return getNumbers(scanCol_); }
+  int getScan(int whichrow) const { return scanCol_(whichrow); }
+
   /**
    * Get the number of channels in the data or a specific IF. This currently
@@ -258 +279 @@
    */
   int nchan(int ifno=-1) const;
-
-  /**
-   * Get the number of integartion cycles
-   * @param scanno the scan number to get the number of rows for.
-   * If scanno<0 the number is retrieved from the header.
-   * @return the number of rows (for the specified scanno)
-   */
-  int nrow(int scanno=-1) const;
+  int getChannels(int whichrow) const;
 
   int ncycle(int scanno=-1) const;
-
-  int getBeam(int whichrow) const;
-  int getIF(int whichrow) const;
-  int getPol(int whichrow) const;
   int getCycle(int whichrow) const { return cycleCol_(whichrow); }
-  int getScan(int whichrow) const { return scanCol_(whichrow); }
-  int getChannels(int whichrow) const;
 
   double getInterval(int whichrow) const
@@ -402 +410 @@
    */
   int rowToScanIndex(int therow);
+
+  std::vector<uint> getNumbers(casa::ScalarColumn<casa::uInt>& col);
 
   static const casa::uInt version_ = 2;

trunk/src/ScantableWrapper.h

@@ -116 +116 @@
     { table_->setSpectrum(spectrum, whichrow); }
 
+  std::vector<uint> getIFNos() { return table_->getIFNos(); }
   int getIF(int whichrow) const {return table_->getIF(whichrow);}
+  std::vector<uint> getBeamNos() { return table_->getBeamNos(); }
   int getBeam(int whichrow) const {return table_->getBeam(whichrow);}
+  std::vector<uint> getPolNos() { return table_->getPolNos(); }
   int getPol(int whichrow) const {return table_->getPol(whichrow);}
   int getCycle(int whichrow) const {return table_->getCycle(whichrow);}
+  std::vector<uint> getScanNos() { return table_->getScanNos(); }
   int getScan(int whichrow) const {return table_->getScan(whichrow);}
 

trunk/src/python_Scantable.cpp

@@ -50 +50 @@
     .def("_assign", &ScantableWrapper::assign)
     .def("getif", &ScantableWrapper::getIF)
+    .def("getifnos", &ScantableWrapper::getIFNos)
     .def("getbeam", &ScantableWrapper::getBeam)
+    .def("getbeamnos", &ScantableWrapper::getBeamNos)
     .def("getpol", &ScantableWrapper::getPol)
+    .def("getpolnos", &ScantableWrapper::getPolNos)
     .def("getscan", &ScantableWrapper::getScan)
+    .def("getscannos", &ScantableWrapper::getScanNos)
     .def("getcycle", &ScantableWrapper::getCycle)
     .def("nif", &ScantableWrapper::nif,