Changeset 902 for trunk/src/Scantable.cpp

Timestamp:

03/17/06 10:10:59 (18 years ago)

Author:

mar637

Message:

More work on polarisation. STPol and labelling

File:

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

trunk/src/Scantable.cpp

@@ -28 +28 @@
 #include <casa/Quanta/MVAngle.h>
 #include <casa/Containers/RecordField.h>
+#include <casa/Utilities/GenSort.h>
 
 #include <tables/Tables/TableParse.h>
@@ -56 +57 @@
 #include "STPolLinear.h"
 #include "STAttr.h"
+#include "MathUtils.h"
 
 using namespace casa;
@@ -126 +128 @@
                             Bool(clear));
       table_ = Table(newname, Table::Update);
-      copySubtables(other);
+      if ( clear ) copySubtables(other);
       table_.markForDelete();
   }
@@ -328 +330 @@
 int Scantable::nscan() const {
   int n = 0;
-  int previous = -1; int current = 0;
-  for (uInt i=0; i< scanCol_.nrow();i++) {
-    scanCol_.getScalar(i,current);
-    if (previous != current) {
-      previous = current;
-      n++;
-    }
-  }
-  return n;
+  Int previous = -1; Int current = 0;
+  Vector<uInt> scannos(scanCol_.getColumn());
+  uInt nout = GenSort<uInt>::sort( scannos, Sort::Ascending,
+                       Sort::QuickSort|Sort::NoDuplicates );
+  return int(nout);
 }
 
@@ -482 +480 @@
     while ( !it.pastEnd() ) {
       ++n;
+      ++it;
     }
     return n;
@@ -595 +594 @@
 
 std::vector<float> Scantable::getSpectrum( int whichrow,
-                                           const std::string& poltype) const
-{
+                                           const std::string& poltype ) const
+{
+  if ( whichrow  < 0 || whichrow >= nrow() )
+    throw(AipsError("Illegal row number."));
   std::vector<float> out;
   Vector<Float> arr;
@@ -610 +611 @@
       stpol->setSpectra(getPolMatrix(row));
       Float frot,fang,ftan;
-      focusTable_.getEntry(frot, fang, ftan, row);
+      focusTable_.getEntry(frot, fang, ftan, mfocusidCol_(row));
       stpol->setPhaseCorrections(frot, fang, ftan);
       arr = stpol->getSpectrum(requestedpol, poltype);
@@ -619 +620 @@
     }
   }
+  if ( arr.nelements() == 0 )
+    pushLog("Not enough polarisations present to do the conversion.");
   arr.tovector(out);
   return out;
@@ -653 +656 @@
 {
   return table_.keywordSet().asString("POLTYPE");
-}
-
-
-std::string Scantable::getPolarizationLabel(bool linear, bool stokes,
-                                            bool linpol, int polidx) const
-{
-  uInt idx = 0;
-  if (polidx >=0) idx = polidx;
-  return "";
-  //return SDPolUtil::polarizationLabel(idx, linear, stokes, linpol);
 }
 
@@ -892 +885 @@
 }
 
-
-}//namespace asap
+std::vector< std::string > asap::Scantable::columnNames( ) const
+{
+  Vector<String> vec = table_.tableDesc().columnNames();
+  return mathutil::tovectorstring(vec);
+}
+
+} //namespace asap