Changeset 2740 for trunk/src

Timestamp:

01/18/13 20:42:21 (12 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-4794

Ready for Test: No

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description:

Location:

trunk/src

Files:

• STBaselineTable.cpp (modified) (4 diffs)
• STBaselineTable.h (modified) (3 diffs)
• Scantable.cpp (modified) (2 diffs)

trunk/src/STBaselineTable.cpp

@@ -52 +52 @@
 {
   table_.addColumn(ScalarColumnDesc<uInt>("NCHAN"));
-  table_.addColumn(ScalarColumnDesc<uInt>("FUNCTION"));
-  table_.addColumn(ScalarColumnDesc<uInt>("ORDER"));
+  table_.addColumn(ScalarColumnDesc<uInt>("FUNC_TYPE"));
+  table_.addColumn(ArrayColumnDesc<uInt>("FUNC_PARAM"));
+  table_.addColumn(ArrayColumnDesc<Float>("FUNC_FPARAM"));
   table_.addColumn(ScalarColumnDesc<uInt>("CLIP_ITERATION"));
   table_.addColumn(ScalarColumnDesc<Float>("CLIP_THRESHOLD"));
-  table_.addColumn(ArrayColumnDesc<Float>("SECTION"));
-  table_.addColumn(ArrayColumnDesc<Float>("PARAMETER"));
-  table_.addColumn(ArrayColumnDesc<Float>("MASKLIST"));
+  table_.addColumn(ArrayColumnDesc<uInt>("MASKLIST"));
+  table_.addColumn(ArrayColumnDesc<Float>("RESULT"));
   table_.addColumn(ScalarColumnDesc<Float>("RMS"));
 
@@ -69 +69 @@
 {
   nchanCol_.attach(table_, "NCHAN");
-  funcCol_.attach(table_, "FUNCTION");
-  orderCol_.attach(table_, "ORDER");
-  clipiterCol_.attach(table_, "CLIP_ITERATION");
-  clipthresCol_.attach(table_, "CLIP_THRESHOLD");
-  sectCol_.attach(table_, "SECTION");
-  paramCol_.attach(table_, "PARAMETER");
+  ftypeCol_.attach(table_, "FUNC_TYPE");
+  fparCol_.attach(table_, "FUNC_PARAM");
+  ffparCol_.attach(table_, "FUNC_FPARAM");
+  citerCol_.attach(table_, "CLIP_ITERATION");
+  cthresCol_.attach(table_, "CLIP_THRESHOLD");
   maskCol_.attach(table_, "MASKLIST");
+  resCol_.attach(table_, "RESULT");
   rmsCol_.attach(table_, "RMS");
 }
@@ -88 +88 @@
 
 void STBaselineTable::setdata(uInt irow, uInt scanno, uInt cycleno, 
-                             uInt beamno, uInt ifno, uInt polno, uInt freqid,  
-                                   Double time, uInt nchan, STBaselineFunc::FuncName func, uInt order, 
-                             uInt clipiter, Float clipthres,
-                             Vector<Float> sect, Vector<Float> param,
-                             Vector<Float> mask, Float rms)
+                              uInt beamno, uInt ifno, uInt polno, 
+                              uInt freqid, Double time, 
+                              uInt nchan, 
+                              STBaselineFunc::FuncName ftype, 
+                              Vector<uInt> fpar, 
+                              Vector<Float> ffpar, 
+                              uInt citer, 
+                              Float cthres,
+                              Vector<uInt> mask,
+                              Vector<Float> res,
+                              Float rms)
 {
   if (irow >= (uInt)nrow()) {
@@ -105 +111 @@
   setbasedata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time);
   nchanCol_.put(irow, nchan);
-  funcCol_.put(irow, uInt(func));
-  orderCol_.put(irow, order);
-  clipiterCol_.put(irow, clipiter);
-  clipthresCol_.put(irow, clipthres);
-  sectCol_.put(irow, sect);
-  paramCol_.put(irow, param);
+  ftypeCol_.put(irow, uInt(ftype));
+  fparCol_.put(irow, fpar);
+  ffparCol_.put(irow, ffpar);
+  citerCol_.put(irow, citer);
+  cthresCol_.put(irow, cthres);
   maskCol_.put(irow, mask);
+  resCol_.put(irow, res);
   rmsCol_.put(irow, rms);
 }
 
 void STBaselineTable::appenddata(uInt scanno, uInt cycleno, 
-                                      uInt beamno, uInt ifno, uInt polno, uInt freqid,
-                                      Double time, uInt nchan, STBaselineFunc::FuncName func, uInt order, 
-                                      uInt clipiter, Float clipthres, 
-                                      Vector<Float> sect, Vector<Float> param,
-                                      Vector<Float> mask, Float rms)
+                                 uInt beamno, uInt ifno, uInt polno, 
+                                 uInt freqid, Double time, 
+                                 uInt nchan, 
+                                 STBaselineFunc::FuncName ftype, 
+                                 Vector<uInt> fpar, 
+                                 Vector<Float> ffpar, 
+                                 uInt citer, 
+                                 Float cthres,
+                                 Vector<uInt> mask,
+                                 Vector<Float> res,
+                                 Float rms)
 {
   uInt irow = nrow();
   table_.addRow(1, True);
   setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, 
-          nchan, func, order, clipiter, clipthres, sect, param, mask, rms);
+          nchan, ftype, fpar, ffpar, citer, cthres, mask, res, rms);
 }
 
 Vector<STBaselineFunc::FuncName> STBaselineTable::getFunctionAsString()
 {
-  Vector<uInt> rawBlfuncColumn = funcCol_.getColumn();
+  Vector<uInt> rawBlfuncColumn = ftypeCol_.getColumn();
   uInt n = rawBlfuncColumn.nelements();
   Vector<STBaselineFunc::FuncName> blfuncColumn(n);

trunk/src/STBaselineTable.h

@@ -47 +47 @@
                casa::uInt freqid, casa::Double time, 
                casa::uInt nchan, 
-               STBaselineFunc::FuncName func, casa::uInt order, 
-               casa::uInt clipiter, casa::Float clipthres,
-               casa::Vector<casa::Float> sect, 
-               casa::Vector<casa::Float> param,
-               casa::Vector<casa::Float> mask,
+               STBaselineFunc::FuncName ftype, 
+               casa::Vector<casa::uInt> fpar, 
+               casa::Vector<casa::Float> ffpar, 
+               casa::uInt citer, 
+               casa::Float cthres,
+               casa::Vector<casa::uInt> mask,
+               casa::Vector<casa::Float> res,
                casa::Float rms);
   void appenddata(casa::uInt scanno, casa::uInt cycleno, 
@@ -57 +59 @@
                   casa::uInt freqid, casa::Double time, 
                   casa::uInt nchan, 
-                  STBaselineFunc::FuncName func, casa::uInt order, 
-                  casa::uInt clipiter, casa::Float clipthres,
-                  casa::Vector<casa::Float> sect, 
-                  casa::Vector<casa::Float> param, 
-                  casa::Vector<casa::Float> mask, 
-                  casa::Float rms);
-
+                  STBaselineFunc::FuncName ftype, 
+                  casa::Vector<casa::uInt> fpar, 
+                  casa::Vector<casa::Float> ffpar, 
+                  casa::uInt citer, 
+                  casa::Float cthres,
+                  casa::Vector<casa::uInt> mask,
+                  casa::Vector<casa::Float> res,
+                  casa::Float rms);
   casa::uInt nchan(casa::uInt ifno);
-  casa::Vector<casa::uInt> getFunction() {return funcCol_.getColumn();}
+  casa::Vector<casa::uInt> getFunction() {return ftypeCol_.getColumn();}
   casa::Vector<STBaselineFunc::FuncName> getFunctionAsString();
-  casa::Vector<casa::uInt> getOrder() {return orderCol_.getColumn();}
-  casa::Vector<casa::uInt> getClipIteration() {return clipiterCol_.getColumn();}
-  casa::Vector<casa::Float> getClipThreshold() {return clipthresCol_.getColumn();}
-  casa::Matrix<casa::Float> getSection() {return sectCol_.getColumn();}
-  casa::Matrix<casa::Float> getParameter() {return paramCol_.getColumn();}
-  casa::Matrix<casa::Float> getMaskList() {return maskCol_.getColumn();}
+  casa::Matrix<casa::uInt> getFuncParam() {return fparCol_.getColumn();}
+  casa::Matrix<casa::Float> getFuncFParam() {return ffparCol_.getColumn();}
+  casa::Vector<casa::uInt> getClipIteration() {return citerCol_.getColumn();}
+  casa::Vector<casa::Float> getClipThreshold() {return cthresCol_.getColumn();}
+  casa::Matrix<casa::uInt> getMaskList() {return maskCol_.getColumn();}
+  casa::Matrix<casa::Float> getResult() {return resCol_.getColumn();}
   casa::Vector<casa::Float> getRms() {return rmsCol_.getColumn();}
 
@@ -78 +81 @@
   static const casa::String name_ ;
   casa::ScalarColumn<casa::uInt> nchanCol_;
-  casa::ScalarColumn<casa::uInt> funcCol_;
-  casa::ScalarColumn<casa::uInt> orderCol_;
-  casa::ScalarColumn<casa::uInt> clipiterCol_;
-  casa::ScalarColumn<casa::Float> clipthresCol_;
-  casa::ArrayColumn<casa::Float> sectCol_;
-  casa::ArrayColumn<casa::Float> paramCol_;
-  casa::ArrayColumn<casa::Float> maskCol_;
+  casa::ScalarColumn<casa::uInt> ftypeCol_;
+  casa::ArrayColumn<casa::uInt> fparCol_;
+  casa::ArrayColumn<casa::Float> ffparCol_;
+  casa::ScalarColumn<casa::uInt> citerCol_;
+  casa::ScalarColumn<casa::Float> cthresCol_;
+  casa::ArrayColumn<casa::uInt> maskCol_;
+  casa::ArrayColumn<casa::Float> resCol_;
   casa::ScalarColumn<casa::Float> rmsCol_;
 };

trunk/src/Scantable.cpp

@@ -2637 +2637 @@
     int nRow = nrow();
     std::vector<bool> chanMask;
-
-    std::vector<float> sect(0);
     std::vector<bool> finalChanMask;
     float rms;
 
     //---
-    bool outBaselineParamTable = true;
+    bool outBaselineParamTable = false;
     STBaselineTable* bt = new STBaselineTable(*this);
     //---
@@ -2659 +2657 @@
                        uInt(0), 
                        Double(0.0), // <-- Double(getTime(whichrow, false)), 
-                       uInt(nchan(whichrow)), STBaselineFunc::Chebyshev, 
-                       uInt(order), uInt(nIterClip), Float(thresClip), Vector<Float>(sect), Vector<Float>(params), 
-                       Vector<Float>(params), // <-- Vector<Float>(finalChanMask), 
+                       uInt(nchan(whichrow)), 
+                       STBaselineFunc::Chebyshev, 
+                       Vector<uInt>(1), // ==> MUST BE Vector<uInt> containing 'order'.
+                       Vector<Float>(), // ==> for ffpar. ** dummy **
+                       uInt(nIterClip), 
+                       Float(thresClip), 
+                       Vector<uInt>(5), // <-- Vector<uInt>(finalChanMask), 
+                       Vector<Float>(params), 
                        Float(rms));
       } else {