Changeset 745

Timestamp:

11/28/05 15:25:18 (19 years ago)

Author:

mar637

Message:

removed setmask functionality

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (52 diffs)
• SDMemTable.h (modified) (16 diffs)
• SDMemTableWrapper.h (modified) (6 diffs)
• python_SDMemTable.cc (modified) (2 diffs)

trunk/src/SDMemTable.cc

@@ -75 +75 @@
   IFSel_(0),
   beamSel_(0),
-  polSel_(0) 
+  polSel_(0)
 {
   setup();
@@ -105 +105 @@
     beamSel_= 0;
     polSel_= 0;
-    chanMask_.resize(0);
   } else {
     IFSel_= other.IFSel_;
     beamSel_= other.beamSel_;
     polSel_= other.polSel_;
-    chanMask_.resize(0);
-    chanMask_ = other.chanMask_;
   }
 
@@ -148 +145 @@
      beamSel_= other.beamSel_;
      polSel_= other.polSel_;
-     chanMask_.resize(0);
-     chanMask_ = other.chanMask_;
      table_ = other.table_.copyToMemoryTable(String("dummy"));
      attach();
@@ -199 +194 @@
   SDStokesEngine stokesEngine(String("STOKES"), String("SPECTRA"));
   aNewTab.bindColumn("STOKES", stokesEngine);
-  
+
   // Create Table
-  table_ = Table(aNewTab, Table::Memory, 0); 
-  // add subtable 
+  table_ = Table(aNewTab, Table::Memory, 0);
+  // add subtable
   TableDesc tdf("", "1", TableDesc::Scratch);
   tdf.addColumn(ArrayColumnDesc<String>("FUNCTIONS"));
@@ -262 +257 @@
   if (showDate)
     mvt.setFormat(MVTime::YMD);
-  else 
+  else
     mvt.setFormat(MVTime::TIME);
   ostringstream oss;
@@ -303 +298 @@
 }
 
-void SDMemTable::resetCursor() 
+void SDMemTable::resetCursor()
 {
    polSel_ = 0;
@@ -310 +305 @@
 }
 
-bool SDMemTable::setMask(std::vector<int> whichChans)
-{
-  std::vector<int>::iterator it;
-  uInt n = flagsCol_.shape(0)(3);
-  if (whichChans.empty()) {
-    chanMask_ = std::vector<bool>(n,true);
-    return true;      
-  }
-  chanMask_.resize(n,true);
-  for (it = whichChans.begin(); it != whichChans.end(); ++it) {
-    if (*it < n) {
-      chanMask_[*it] = false;
-    }
-  }
-  return true;
-}
-
-std::vector<bool> SDMemTable::getMask(Int whichRow) const 
+std::vector<bool> SDMemTable::getMask(Int whichRow) const
 {
 
@@ -342 +320 @@
   aa2.reset(aa2.begin(uInt(polSel_)));// go to pol
 
-  Bool useUserMask = ( chanMask_.size() == arr.shape()(3) );
-
-  std::vector<bool> tmp;
-  tmp = chanMask_; // WHY the fxxx do I have to make a copy here
-  std::vector<bool>::iterator miter;
-  miter = tmp.begin();
-
   for (ArrayAccessor<uChar, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {
     bool out =!static_cast<bool>(*i);
-    if (useUserMask) {
-      out = out && (*miter);
-      miter++;
-    }
     mask.push_back(out);
   }
@@ -362 +329 @@
 
 
-std::vector<float> SDMemTable::getSpectrum(Int whichRow) const 
+std::vector<float> SDMemTable::getSpectrum(Int whichRow) const
 {
   Array<Float> arr;
@@ -376 +343 @@
 
 
-std::vector<float> SDMemTable::getStokesSpectrum(Int whichRow, 
-                                                 Bool doPol) const
+std::vector<float> SDMemTable::getStokesSpectrum(Int whichRow,
+                                                 Bool doPol) const
   //
   // Gets one STokes parameter depending on cursor polSel location
@@ -388 +355 @@
     throw (AipsError("You must have 1,2 or 4 polarizations to get the Stokes parameters"));
   }
-  
+
   // For full conversion we are only supporting linears at the moment
-  
+
   if (nPol() > 2) {
     String antName;
@@ -403 +370 @@
   Array<Float> arr;
   stokesCol_.get(whichRow, arr);
-  
+
   if (doPol && (polSel_==1 || polSel_==2)) {       //   Q,U --> P, P.A.
-    
+
     // Set current cursor location
-    
+
     const IPosition& shape = arr.shape();
     IPosition start, end;
     getCursorSlice(start, end, shape);
-    
+
     // Get Q and U slices
-    
+
     Array<Float> Q = SDPolUtil::getStokesSlice(arr,start,end,"Q");
     Array<Float> U = SDPolUtil::getStokesSlice(arr,start,end,"U");
-    
-    // Compute output 
-    
+
+    // Compute output
+
     Array<Float> out;
     if (polSel_==1) {                                        // P
@@ -425 +392 @@
       out = SDPolUtil::positionAngle(Q,U);
     }
-    
+
     // Copy to output
-    
+
     IPosition vecShape(1,shape(asap::ChanAxis));
     Vector<Float> outV = out.reform(vecShape);
@@ -433 +400 @@
     outV.tovector(stlout);
     return stlout;
-    
-  } else {    
+
+  } else {
     // Selects at the cursor location
     return getFloatSpectrum(arr);
@@ -440 +407 @@
 }
 
-std::string SDMemTable::getPolarizationLabel(Bool linear, Bool stokes, 
-                                              Bool linPol, Int polIdx) const
-{
-   uInt idx = polSel_;   
+std::string SDMemTable::getPolarizationLabel(Bool linear, Bool stokes,
+                                              Bool linPol, Int polIdx) const
+{
+   uInt idx = polSel_;
    if (polIdx >=0) idx = polIdx;
    return SDPolUtil::polarizationLabel(idx, linear, stokes, linPol);
@@ -450 +417 @@
 
 
-std::vector<float> SDMemTable::stokesToPolSpectrum(Int whichRow, 
-                                                   Bool toLinear, 
-                                                   Int polIdx) const
+std::vector<float> SDMemTable::stokesToPolSpectrum(Int whichRow,
+                                                   Bool toLinear,
+                                                   Int polIdx) const
 //
 // polIdx
@@ -489 +456 @@
       throw(AipsError("Only conversion to RR & LL is currently supported"));
     }
-    
-    // Get I and V slices    
+
+    // Get I and V slices
     Array<Float> I = SDPolUtil::getStokesSlice(arr,start,end,"I");
     Array<Float> V = SDPolUtil::getStokesSlice(arr,start,end,"V");
-    
-    // Compute output     
+
+    // Compute output
     out = SDPolUtil::circularPolarizationFromStokes(I, V, doRR);
   }
-  
+
   // Copy to output
    IPosition vecShape(1,shape(asap::ChanAxis));
@@ -521 +488 @@
 
   const IPosition& shape = arr.shape();
-  IPosition start(shape.nelements(),0);  
+  IPosition start(shape.nelements(),0);
   IPosition end(shape-1);
   if (iBeam!=-1) {
@@ -587 +554 @@
   MFrequency::Types mdr;
   if (!MFrequency::getType(mdr, rfrm)) {
-    
+
     Int a,b;const uInt* c;
     const String* valid = MFrequency::allMyTypes(a, b, c);
@@ -662 +629 @@
   } else if (u == Unit("Hz")) {
 
-    // Set world axis units    
+    // Set world axis units
     Vector<String> wau(1); wau = u.getName();
     spc.setWorldAxisUnits(wau);
@@ -689 +656 @@
   Vector<uInt> freqIDs;
   freqidCol_.get(whichRow, freqIDs);
-  uInt freqID = freqIDs(IFSel_);  
+  uInt freqID = freqIDs(IFSel_);
   restfreqidCol_.get(whichRow, freqIDs);
   uInt restFreqID = freqIDs(IFSel_);
@@ -697 +664 @@
 
   String s = "Channel";
-  if (u == Unit("km/s")) { 
+  if (u == Unit("km/s")) {
     s = CoordinateUtil::axisLabel(spc,0,True,True,True);
   } else if (u == Unit("Hz")) {
@@ -789 +756 @@
 */
 
-MaskedArray<Float> SDMemTable::rowAsMaskedArray(uInt whichRow, 
-                                                Bool toStokes) const 
+MaskedArray<Float> SDMemTable::rowAsMaskedArray(uInt whichRow,
+                                                Bool toStokes) const
 {
   // Get flags
@@ -871 +838 @@
 SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID) const
 {
-  
+
   Table t = table_.keywordSet().asTable("FREQUENCIES");
   if (freqID> t.nrow() ) {
@@ -900 +867 @@
 
 
-SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID, 
-                                                     uInt restFreqID,
+SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID,
+                                                     uInt restFreqID,
                                                      uInt whichRow) const
 {
-  
+
   // Create basic SC
   SpectralCoordinate spec = getSpectralCoordinate (freqID);
@@ -989 +956 @@
   std::vector<double> stlout;
   tvec.tovector(stlout);
-  return stlout;  
+  return stlout;
 }
 
@@ -1065 +1032 @@
   Vector<String> funcs;
   Vector<String> finfo;
-  Vector<Int> comps;  
+  Vector<Int> comps;
   ROArrayColumn<Double> parmsCol(t, "PARAMETERS");
   ROArrayColumn<Bool> parmaskCol(t, "PARMASK");
@@ -1102 +1069 @@
   Vector<String> funcs;
   Vector<String> finfo;
-  Vector<Int> comps;    
+  Vector<Int> comps;
   ROArrayColumn<Double> parmsCol(t, "PARAMETERS");
   ROArrayColumn<Bool> parmaskCol(t, "PARMASK");
@@ -1130 +1097 @@
 
 void SDMemTable::addFit(uInt whichRow,
-                        const Vector<Double>& p, const Vector<Bool>& m,
-                        const Vector<String>& f, const Vector<Int>& c)
+                        const Vector<Double>& p, const Vector<Bool>& m,
+                        const Vector<String>& f, const Vector<Int>& c)
 {
   if (whichRow >= nRow()) {
@@ -1137 +1104 @@
   }
   Table t = table_.keywordSet().asTable("FITS");
-  uInt nrow = t.nrow();  
+  uInt nrow = t.nrow();
   t.addRow();
   ArrayColumn<Double> parmsCol(t, "PARAMETERS");
@@ -1154 +1121 @@
   fitCol_.get(whichRow, fitarr);
 
-  Array<Int> newarr;               // The new Array containing the fitid 
-  Int pos =-1;                     // The fitid position in the array 
+  Array<Int> newarr;               // The new Array containing the fitid
+  Int pos =-1;                     // The fitid position in the array
   if ( fitarr.nelements() == 0 ) { // no fits at all in this row
     Array<Int> arr(IPosition(4,nBeam(),nIF(),nPol(),1));
     arr = -1;
     newarr.reference(arr);
-    pos = 0;      
+    pos = 0;
   } else {
     IPosition shp = fitarr.shape();
@@ -1172 +1139 @@
     while (it != fits.end()) {
       if (*it == -1) {
-        pos = i;
-        break;
+        pos = i;
+        break;
       }
       ++i;
@@ -1186 +1153 @@
       newarr = fitarr;
   }
-  newarr(IPosition(4, beamSel_, IFSel_, polSel_, pos)) = Int(nrow); 
+  newarr(IPosition(4, beamSel_, IFSel_, polSel_, pos)) = Int(nrow);
   fitCol_.put(whichRow, newarr);
 
@@ -1218 +1185 @@
   sdft.setRefFrame(baseFrame);
 
-  // Equinox  
+  // Equinox
   Float equinox;
   t.keywordSet().get("EQUINOX", equinox);
@@ -1283 +1250 @@
   Array<Double> direction;
   Array<Int> fits;
-  
+
   specCol_.get(whichRow, spectrum);
   sdc.putSpectrum(spectrum);
@@ -1344 +1311 @@
 }
 void SDMemTable::makePersistent(const std::string& filename)
-{  
+{
   table_.deepCopy(filename,Table::New);
 
@@ -1369 +1336 @@
   if (x < 59.95)
     return  String("      ") + mvt.string(MVTime::TIME_CLEAN_NO_HM, 7)+"s";
-  else if (x < 3599.95) 
+  else if (x < 3599.95)
     return String("   ") + mvt.string(MVTime::TIME_CLEAN_NO_H,7)+" ";
   else {
@@ -1376 +1343 @@
     oss << ":" << mvt.string(MVTime::TIME_CLEAN_NO_H,7) << " ";
     return String(oss);
-  }   
+  }
 };
 
@@ -1465 +1432 @@
       << setw(24) << dirtype
       << setw(10) << "Time"
-      << setw(18) << "Integration" 
+      << setw(18) << "Integration"
       << setw(7) << "FreqIDs" << endl;
   oss << "--------------------------------------------------------------------------------" << endl;
-  
+
   // Generate list of scan start and end integrations
   Vector<Int> scanIDs = scanCol_.getColumn();
@@ -1488 +1455 @@
 
     // Find all the FreqIDs in this scan
-    listFQ.resize(0);      
-    listRestFQ.resize(0);      
+    listFQ.resize(0);
+    listRestFQ.resize(0);
     for (uInt j=startInt(i); j<endInt(i)+1; j++) {
       freqidCol_.get(j, freqIDs);
       for (uInt k=0; k<freqIDs.nelements(); k++) {
-        mathutil::addEntry(listFQ, freqIDs(k));
+        mathutil::addEntry(listFQ, freqIDs(k));
       }
 //
       restfreqidCol_.get(j, restFreqIDs);
       for (uInt k=0; k<restFreqIDs.nelements(); k++) {
-        mathutil::addEntry(listRestFQ, restFreqIDs(k));
+        mathutil::addEntry(listRestFQ, restFreqIDs(k));
       }
     }
@@ -1504 +1471 @@
     nInt = endInt(i) - startInt(i) + 1;
     oss << setw(3) << std::right << i << std::left << setw(2) << "  "
-        << setw(15) << name
-        << setw(24) << posit
-        << setw(10) << time 
-        << setw(3) << std::right << nInt  << setw(3) << " x " << std::left
-        << setw(6) <<  tInt
-        << " " << listFQ << " " << listRestFQ << endl;
+        << setw(15) << name
+        << setw(24) << posit
+        << setw(10) << time
+        << setw(3) << std::right << nInt  << setw(3) << " x " << std::left
+        << setw(6) <<  tInt
+        << " " << listFQ << " " << listRestFQ << endl;
   }
   oss << endl;
-  oss << "Table contains " << table_.nrow() << " integration(s) in " 
+  oss << "Table contains " << table_.nrow() << " integration(s) in "
       << nScans << " scan(s)." << endl;
 
@@ -1524 +1491 @@
     for (uInt i=0; i<sdft.length(); i++) {
       oss << setw(8) << i << setw(8)
-          << info[3] << setw(16) << setprecision(8)
-          << sdft.referenceValue(i) << setw(10)
-          << sdft.referencePixel(i) << setw(12)
-          << sdft.increment(i) << endl;
+          << info[3] << setw(16) << setprecision(8)
+          << sdft.referenceValue(i) << setw(10)
+          << sdft.referencePixel(i) << setw(12)
+          << sdft.increment(i) << endl;
     }
     oss << "--------------------------------------------------------------------------------" << endl;
@@ -1586 +1553 @@
 {
   Table t = table_.rwKeywordSet().asTable("HISTORY");
-  uInt nrow = t.nrow();  
+  uInt nrow = t.nrow();
   t.addRow();
   ScalarColumn<String> itemCol(t, "ITEM");
@@ -1596 +1563 @@
   Vector<String> history;
   const Table& t = table_.keywordSet().asTable("HISTORY");
-  uInt nrow = t.nrow();  
+  uInt nrow = t.nrow();
   ROScalarColumn<String> itemCol(t, "ITEM");
   std::vector<std::string> stlout;
@@ -1647 +1614 @@
 
 MDirection::Types SDMemTable::getDirectionReference() const
-{  
+{
   Float eq;
   table_.keywordSet().get("Equinox",eq);
@@ -1654 +1621 @@
   mp[1950.0] = "B1950";
   MDirection::Types mdr;
-  if (!MDirection::getType(mdr, mp[eq])) {   
+  if (!MDirection::getType(mdr, mp[eq])) {
     mdr = MDirection::J2000;
     pushLog("WARNING: Unknown equinox using J2000");
-    
+
   }
 
@@ -1677 +1644 @@
 
 
-Bool SDMemTable::setRestFreqs(const Vector<Double>& restFreqsIn, 
-                              const String& sUnit,
-                              const vector<string>& lines,
-                              const String& source,
-                              Int whichIF)
+Bool SDMemTable::setRestFreqs(const Vector<Double>& restFreqsIn,
+                              const String& sUnit,
+                              const vector<string>& lines,
+                              const String& source,
+                              Int whichIF)
 {
    const Int nIFs = nIF();
@@ -1707 +1674 @@
             restFreqs[i] = lineFreq.getValue().getValue();          // Hz
          } else {
-            String s = String(lines[i]) + 
-              String(" is an unrecognized spectral line");
+            String s = String(lines[i]) +
+              String(" is an unrecognized spectral line");
             throw(AipsError(s));
          }
@@ -1757 +1724 @@
       for (uInt i=0; i<nRow; i++) {
          srcnCol_.get(i, srcName);
-         restfreqidCol_.get(i,restFreqIDs);       
+         restfreqidCol_.get(i,restFreqIDs);
          if (idx==-1) {
-           // Replace vector of restFreqs; one per IF.
-           // No selection possible
+           // Replace vector of restFreqs; one per IF.
+           // No selection possible
             for (uInt i=0; i<nIFs; i++) restFreqIDs[i] = i;
          } else {
-           // Set RestFreqID for selected data
+           // Set RestFreqID for selected data
             if (empty || source==srcName) {
                if (whichIF<0) {
                   restFreqIDs = idx;
-               } else {              
+               } else {
                   restFreqIDs[whichIF] = idx;
                }
             }
          }
-         restfreqidCol_.put(i,restFreqIDs);       
+         restfreqidCol_.put(i,restFreqIDs);
       }
       ok = True;
@@ -1813 +1780 @@
       // renumber
       scanCol_.put(i,newscanid);
-    } else { 
+    } else {
       ++newscanid;
       pIdx = cIdx;   // store scanid
@@ -1823 +1790 @@
 
 void SDMemTable::getCursorSlice(IPosition& start, IPosition& end,
-                                const IPosition& shape) const
+                                const IPosition& shape) const
 {
   const uInt nDim = shape.nelements();
   start.resize(nDim);
   end.resize(nDim);
-  
+
   start(asap::BeamAxis) = beamSel_;
   end(asap::BeamAxis) = beamSel_;
@@ -1855 +1822 @@
   ArrayAccessor<Float, Axis<asap::PolAxis> > aa2(aa1);
   aa2.reset(aa2.begin(uInt(polSel_)));                     // Pol selection
-  
+
   std::vector<float> spectrum;
   for (ArrayAccessor<Float, Axis<asap::ChanAxis> > i(aa2); i != i.end(); ++i) {

trunk/src/SDMemTable.h

@@ -49 +49 @@
 
 namespace asap {
-  
+
 class SDContainer;
 class SDHeader;
@@ -71 +71 @@
   SDMemTable(const casa::Table& tab, const std::string& expr);
 
-  // Assignment operator (copy semantics)  
+  // Assignment operator (copy semantics)
   SDMemTable &operator=(const SDMemTable& other);
-  
+
   virtual ~SDMemTable();
 
@@ -86 +86 @@
   SDHeader getSDHeader() const;
 
-  // Get SD Frequency table.  
+  // Get SD Frequency table.
   SDFrequencyTable getSDFreqTable() const;
 
@@ -101 +101 @@
   // I,P,PA,V (doPol=True) (determined by the polSel cursor location
   // 0->3) If the latter, you can add a PA offset (degrees)
-  virtual std::vector<float> getStokesSpectrum(casa::Int whichRow=0, 
+  virtual std::vector<float> getStokesSpectrum(casa::Int whichRow=0,
                                                casa::Bool doPol=casa::False) const;
 
@@ -108 +108 @@
   // label for raw correlations (linear or circular). If True returns
   // label for Stokes.  If doPol=False, I,Q,U,V else I,P,PA,V
-  std::string getPolarizationLabel(casa::Bool linear, casa::Bool stokes, 
-                                   casa::Bool linPol, 
-                                   casa::Int polIdx=-1) const;
+  std::string getPolarizationLabel(casa::Bool linear, casa::Bool stokes,
+                                   casa::Bool linPol,
+                                   casa::Int polIdx=-1) const;
 
   // Convert Stokes to linear or circular polarizations (specified by
@@ -116 +116 @@
   // supported.
   virtual std::vector<float> stokesToPolSpectrum(casa::Int whichRow,
-                                                 casa::Bool toLinear,
-                                                 casa::Int polIdx) const;
+                                                 casa::Bool toLinear,
+                                                 casa::Int polIdx) const;
 
   // Get all Stokes at the specified Beam/IF cursor location (ignoring
@@ -125 +125 @@
   // is not the same as nPol(), I have put it here for direct access as needed
   virtual casa::Array<casa::Float> getStokesSpectrum(casa::Int whichRow=0,
-                                                     casa::Int iBeam=-1, 
+                                                     casa::Int iBeam=-1,
                                                      casa::Int iIF=-1) const;
 
@@ -132 +132 @@
 
   // get all as aips++ Vectors
-  virtual void getSpectrum(casa::Vector<casa::Float>& spectrum, 
-                           casa::Int whichRow=0) const;
-  //virtual void getMask(Vector<Bool>& mask,Int whichRow=0) const;
+  virtual void getSpectrum(casa::Vector<casa::Float>& spectrum,
+                           casa::Int whichRow=0) const;
 
   // Get rest frequencies
   std::vector<double> getRestFreqs() const;
-  
-  // get info for current row  
+
+  // get info for current row
   // if whichRow == -1 the Header time is given
-  std::string getTime(casa::Int whichRow=0, 
-                      casa::Bool showDate=casa::False) const ;
-  casa::MEpoch getEpoch(casa::Int whichRow=0) const; 
+  std::string getTime(casa::Int whichRow=0,
+                      casa::Bool showDate=casa::False) const ;
+  casa::MEpoch getEpoch(casa::Int whichRow=0) const;
   casa::MDirection getDirection(casa::Int whichRow=0,
-                                casa::Bool refBeam=casa::False) const; 
+                                casa::Bool refBeam=casa::False) const;
 
   std::string getSourceName(casa::Int whichRow=0) const;
@@ -154 +153 @@
 
   // Set RestFreqID.  source="" and IF=-1 means select all
-  virtual casa::Bool setRestFreqs(const casa::Vector<casa::Double>& restFreqs, 
-                                  const casa::String& unit,
-                                  const std::vector<std::string>& lines,
-                                  const casa::String& source,
-                                  casa::Int whichIF=-1);
+  virtual casa::Bool setRestFreqs(const casa::Vector<casa::Double>& restFreqs,
+                                  const casa::String& unit,
+                                  const std::vector<std::string>& lines,
+                                  const casa::String& source,
+                                  casa::Int whichIF=-1);
 
   // List lines
@@ -166 +165 @@
   std::string getFluxUnit() const;
   void setFluxUnit (const std::string& unit);
-  
+
   // Set Instrument
   void setInstrument (const std::string& instrument);
@@ -178 +177 @@
   virtual void resetCursor();
 
-  //sets the user mask applied to all spectra
-  virtual bool setMask(std::vector<int> whichChans);
   // Hard flags the current spectrum, not reversible
   virtual void flag(int whichRow);
@@ -226 +223 @@
   // return a row as a Masked array, internally converting uChar flags
   // to bool mask
-  casa::MaskedArray<casa::Float> rowAsMaskedArray(casa::uInt whichRow, 
+  casa::MaskedArray<casa::Float> rowAsMaskedArray(casa::uInt whichRow,
                                                   casa::Bool toStokes=casa::False) const;
 
@@ -237 +234 @@
   // rest frequency.  If row number given (>=0), also set
   // frame conversion layer (needs direction & time which require row)
-  casa::SpectralCoordinate getSpectralCoordinate(casa::uInt freqID, 
+  casa::SpectralCoordinate getSpectralCoordinate(casa::uInt freqID,
                                                  casa::uInt restFreqID,
                                                  casa::uInt row) const;
@@ -243 +240 @@
   // Set just the reference value, pixel and increment into the table
   // No other state is extracted.
-  casa::Bool setCoordinate(const casa::SpectralCoordinate& speccord, 
-                           casa::uInt whichIdx);
+  casa::Bool setCoordinate(const casa::SpectralCoordinate& speccord,
+                           casa::uInt whichIdx);
 
   casa::Int nCoordinates() const;
@@ -263 +260 @@
 
   void addFit(casa::uInt whichRow,
-              const casa::Vector<casa::Double>& p, 
-              const casa::Vector<casa::Bool>& m,
-              const casa::Vector<casa::String>& f, 
-              const casa::Vector<casa::Int>& c);
-
-  
+              const casa::Vector<casa::Double>& p,
+              const casa::Vector<casa::Bool>& m,
+              const casa::Vector<casa::String>& f,
+              const casa::Vector<casa::Int>& c);
+
+
 private:
   // utility func for nice printout
@@ -279 +276 @@
 
   // Generate start and end for shape and current cursor selection
-  void getCursorSlice(casa::IPosition& start, casa::IPosition& end, 
-                      const casa::IPosition& shape) const;
+  void getCursorSlice(casa::IPosition& start, casa::IPosition& end,
+                      const casa::IPosition& shape) const;
 
   // the current cursor into the array
   casa::Int IFSel_,beamSel_,polSel_;
-  std::vector<bool> chanMask_;
   // the underlying memory table
   casa::Table table_;

trunk/src/SDMemTableWrapper.h

@@ -86 +86 @@
   }
 
-  std::vector<float> getStokesSpectrum(int whichRow=0, 
-                                       bool linPol=false) const {
+  std::vector<float> getStokesSpectrum(int whichRow=0,
+                                       bool linPol=false) const {
     return table_->getStokesSpectrum(whichRow, linPol);
   }
 
   std::vector<float> stokesToPolSpectrum(int whichRow=0, bool linear=false,
-                                         int polIdx=-1) const {
+                                         int polIdx=-1) const {
     return table_->stokesToPolSpectrum(whichRow, linear, polIdx);
   }
@@ -98 +98 @@
   //  std::string getPolarizationLabel(bool linear, bool stokes, bool linPol, int polIdx) const {
   // Boost fails with 4 arguments.
-  std::string getPolarizationLabel(bool linear, bool stokes, 
-                                   bool linPol) const {
+  std::string getPolarizationLabel(bool linear, bool stokes,
+                                   bool linPol) const {
     int polIdx = -1;
     return table_->getPolarizationLabel(linear, stokes, linPol, polIdx);
@@ -130 +130 @@
     return table_->getMask(whichRow);
   }
-  bool setMask(const std::vector<int> mvals) const {
-    return table_->setMask(mvals);
-  }
 
   void flag(int whichRow=-1) {
@@ -169 +166 @@
   }
 
-  bool setRestFreqs(const std::vector<double>& restfreqs, 
-                    const std::string& unit, 
+  bool setRestFreqs(const std::vector<double>& restfreqs,
+                    const std::string& unit,
                     const std::vector<std::string>& lines,
                     const std::string& source, int whichIF) {
@@ -178 +175 @@
                                 casa::Int(whichIF));
   }
-  
-  std::string spectralLines() const {table_->spectralLines();}
+
+  std::string spectralLines() const {return table_->spectralLines();}
 
   std::vector<double> getRestFreqs() {
@@ -195 +192 @@
   SDMemTable* getPtr() {return &(*table_);}
 
-  std::string summary(bool verbose=false) const { 
-    return table_->summary(verbose); 
-  }
-  
-  std::vector<std::string> getHistory() { 
-    return table_->getHistory(); 
-  }
-  void addHistory(const std::string& hist) { 
-    table_->addHistory(hist); 
+  std::string summary(bool verbose=false) const {
+    return table_->summary(verbose);
+  }
+
+  std::vector<std::string> getHistory() {
+    return table_->getHistory();
+  }
+  void addHistory(const std::string& hist) {
+    table_->addHistory(hist);
   }
 
   void addFit(int whichRow, const std::vector<double>& p,
-              const std::vector<bool>& m, const std::vector<string>& f,
-              const std::vector<int>& c) {
-    
+              const std::vector<bool>& m, const std::vector<string>& f,
+              const std::vector<int>& c) {
+
     casa::Vector<casa::Double> p2(p);
-    casa::Vector<casa::Bool> m2(m); 
+    casa::Vector<casa::Bool> m2(m);
     casa::Vector<casa::String> f2 = mathutil::toVectorString(f);
     casa::Vector<casa::Int> c2(c);

trunk/src/python_SDMemTable.cc

@@ -62 +62 @@
     .def("setbeam", &SDMemTableWrapper::setBeam)
     .def("setpol", &SDMemTableWrapper::setPol)
-    .def("_setmask", &SDMemTableWrapper::setMask)
     .def("get_fluxunit", &SDMemTableWrapper::getFluxUnit)
     .def("set_fluxunit", &SDMemTableWrapper::setFluxUnit)
@@ -100 +99 @@
     .def("_save",  &SDMemTableWrapper::makePersistent)
     .def("_summary",  &SDMemTableWrapper::summary,
-         (boost::python::arg("verbose")=true) )
+         (boost::python::arg("verbose")=true) )
     .def("_getrestfreqs",  &SDMemTableWrapper::getRestFreqs)
     .def("_setrestfreqs",  &SDMemTableWrapper::setRestFreqs)