Changeset 1000 for trunk

Timestamp:

04/07/06 09:41:02 (19 years ago)

Author:

mar637

Message:

fixed bug due to incorrect use of Table::rowNumbers (RTFM!).
added flagging

Location:

trunk/src

Files:

• STFit.cpp (modified) (2 diffs)
• STMath.cpp (modified) (2 diffs)
• STSelector.cpp (modified) (2 diffs)
• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/STFit.cpp

@@ -90 +90 @@
     Table t = table_(table_.col("ID") == id );
     if (t.nrow() > 0) {
-      rno = t.rowNumbers()[0];
+      rno = t.rowNumbers(table_)[0];
       resultid = id;
       foundentry = true;
@@ -102 +102 @@
   // add new row if new id
   if ( !foundentry ) table_.addRow();
-  cout << rno << "   " << resultid << endl;
   funcCol_.put(rno, mathutil::toVectorString(fit.getFunctions()));
   compCol_.put(rno, Vector<Int>(fit.getComponents()));

trunk/src/STMath.cpp

@@ -1004 +1004 @@
   setInsitu(insitu);
   Table& tout = out->table();
-  // clear ouput frequency table
-  //Table ftable = out->frequencies().table();
-  //ftable.removeRow(ftable.rowNumbers());
   // Get reference Epoch to time of first row or given String
   Unit DAY(String("d"));
@@ -1135 +1132 @@
   if ( in->getPolType() == newtype )
     throw(AipsError("No need to convert."));
+  if ( ! in->selector_.empty() )
+    throw(AipsError("Can only convert whole scantable. Unset the selection."));
   bool insitu = insitu_;
   setInsitu(false);

trunk/src/STSelector.cpp

@@ -123 +123 @@
   TableExprNode query;
   intidmap::const_iterator it;
-  for (it= intselections_.begin(); it != intselections_.end(); ++it) {
+  for (it = intselections_.begin(); it != intselections_.end(); ++it) {
     TableExprNode theset(Vector<Int>( (*it).second ));
     if ( query.isNull() ) {
@@ -154 +154 @@
       return sort(tab);
     } else {
+      cout << "query rows"<< tab(query).nrow() << endl;
       return sort(tab(query));
     }

trunk/src/Scantable.cpp

@@ -578 +578 @@
 }
 
-void Scantable::flag()
+void Scantable::flag(const std::vector<bool>& msk)
 {
   if ( selector_.empty() )
-    throw(AipsError("Trying to flag whole scantable. Aborted."));
-  TableVector<uChar> tvec(table_, "FLAGTRA");
-  uChar userflag = 1 << 7;
-  tvec = userflag;
+    throw(AipsError("Trying to flag whole scantable."));
+  if ( msk.size() == 0 ) {
+    uChar userflag = 1 << 7;
+    for ( uInt i=0; i<table_.nrow(); ++i) {
+      Vector<uChar> flgs = flagsCol_(i);
+      flgs = userflag;
+      flagsCol_.put(i, flgs);
+    }
+    return;
+  }
+  if ( int(msk.size()) != nchan() ) {
+    throw(AipsError("Mask has incorrect number of channels."));
+  }
+  for ( uInt i=0; i<table_.nrow(); ++i) {
+    Vector<uChar> flgs = flagsCol_(i);
+    if ( flgs.nelements() != msk.size() ) {
+      throw(AipsError("Mask has incorrect number of channels."
+                      " Probably varying with IF. Please flag per IF"));
+    }
+    std::vector<bool>::const_iterator it;
+    uInt j = 0;
+    uChar userflag = 1 << 7;
+    for (it = msk.begin(); it != msk.end(); ++it) {
+      if ( *it ) {
+        flgs(j) = userflag;
+      }
+      ++j;
+    }
+    flagsCol_.put(i, flgs);
+  }
 }
 
@@ -762 +788 @@
       ROTableRow brow(bsubt);
       const TableRecord& brec = brow.get(0);
-      uInt row0 = bsubt.rowNumbers()[0];
+      uInt row0 = bsubt.rowNumbers(table_)[0];
       oss << setw(5) << "" <<  setw(4) << std::right << brec.asuInt("BEAMNO")<< std::left;
       oss  << setw(4) << ""  << formatDirection(getDirection(row0)) << endl;

trunk/src/Scantable.h

@@ -183 +183 @@
    * "hard" flag the data, this flags everything selected in setSelection()
    */
-  void flag();
+  void flag( const std::vector<bool>& msk = std::vector<bool>());
 
   /**

trunk/src/ScantableWrapper.h

@@ -94 +94 @@
     { return table_->getMask(whichrow); }
 
-  void flag() { table_->flag(); }
+  void flag(const std::vector<bool>& msk=std::vector<bool>())
+    { table_->flag(msk); }
 
   std::string getSourceName(int whichrow=0) const

trunk/src/python_Scantable.cpp

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:
+//# $Id:$
 //#---------------------------------------------------------------------------
 #include <vector>