Changeset 2920 for trunk

Timestamp:

04/07/14 10:04:18 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here..

Merged IterationHelper? into STIdxIter2.

Location:

trunk/src

Files:

• IterationHelper.h (deleted)
• STIdxIter.h (modified) (2 diffs)
• STMath.cpp (modified) (4 diffs)

trunk/src/STIdxIter.h

@@ -15 +15 @@
 using namespace std ;
 using namespace casa ;
+
+namespace {
+vector<string> split(const string &str, char delim)
+{
+  vector<string> result;
+  size_t current = 0;
+  size_t found;
+  while ((found = str.find_first_of(delim, current)) != string::npos) {
+    result.push_back(string(str, current, found - current));
+    current = found + 1;
+  }
+  result.push_back(string(str, current, str.size() - current));
+  return result;
+}
+} // anonymous namespace
 
 namespace asap {
@@ -160 +175 @@
 { 
 public:
+  template<class T>
+  static void Iterate(T &processor, const string cols_list)
+  {
+    vector<string> cols = split(cols_list, ',');
+    // for (vector<string>::iterator i = cols.begin(); i != cols.end(); ++i)
+    //   cout << *i << endl;
+    STIdxIter2 iter(processor.target(), cols);
+    STSelector sel ;
+    while ( !iter.pastEnd() ) {
+      const Record current = iter.currentValue() ;
+      Vector<uInt> rows = iter.getRows( SHARE ) ;
+      // any process
+      processor.Process(cols, current, rows);
+      // go next
+      iter.next() ;
+    }    
+  }
   STIdxIter2() ;
   STIdxIter2( const string &name,

trunk/src/STMath.cpp

@@ -58 +58 @@
 
 #include "CalibrationHelper.h"
-#include "IterationHelper.h"
 
 using namespace casa;
@@ -3534 +3533 @@
     copyRows( out->table(), s->table(), 0, 0, s->nrow(), False, True, False ) ;
     
-    // iterate throgh IterationHelper
+    // iterate throgh STIdxIter2
     ChopperWheelCalibrator cal(out, s, aoff, asky, ahot, acold);
-    IterationHelper<ChopperWheelCalibrator>::Iterate(cal, "BEAMNO,POLNO,IFNO");
+    STIdxIter2::Iterate<ChopperWheelCalibrator>(cal, "BEAMNO,POLNO,IFNO");
 
     s->table_ = torg ;
@@ -3593 +3592 @@
 //     t0 = mathutil::gettimeofday_sec() ;
 
-    // iterate throgh IterationHelper
+    // iterate throgh STIdxIter2
     AlmaCalibrator cal(out, s, aoff);
-    IterationHelper<AlmaCalibrator>::Iterate(cal, "BEAMNO,POLNO,IFNO");
+    STIdxIter2::Iterate<AlmaCalibrator>(cal, "BEAMNO,POLNO,IFNO");
 
     // finalize
@@ -3758 +3757 @@
       
       // process each sig and ref scan
-      // iterate throgh IterationHelper
+      // iterate throgh STIdxIter2
       ChopperWheelCalibrator cal_sig(ssig, rsig, aofflo, askylo, ahotlo, acoldlo);
-      IterationHelper<ChopperWheelCalibrator>::Iterate(cal_sig, "BEAMNO,POLNO,IFNO");
+      STIdxIter2::Iterate<ChopperWheelCalibrator>(cal_sig, "BEAMNO,POLNO,IFNO");
       ChopperWheelCalibrator cal_ref(sref, rref, aoffhi, askyhi, ahothi, acoldhi);
-      IterationHelper<ChopperWheelCalibrator>::Iterate(cal_ref, "BEAMNO,POLNO,IFNO");
+      STIdxIter2::Iterate<ChopperWheelCalibrator>(cal_ref, "BEAMNO,POLNO,IFNO");
     }
   }