Changeset 2537 for branches/hpc33/src/STIdxIter.h

Timestamp:

05/18/12 19:16:51 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: see below

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Defined STIdxIterExAcc class that is able to handle Int and String scalar
columns. Also, fixed a bug in ArrayIndexIterartorAcc?.

File:

• branches/hpc33/src/STIdxIter.h (modified) (2 diffs)

branches/hpc33/src/STIdxIter.h

@@ -7 +7 @@
 #include <casa/Arrays/Matrix.h>
 #include <casa/Arrays/IPosition.h>
+#include <casa/BasicSL/String.h>
 
 #include "Scantable.h"
@@ -127 +128 @@
 } ;
 
-// class STIdxIterExAcc : public STIdxIterAcc
-// {
-//   STIdxIterExAcc() ;
-//   STIdxIterExAcc( const string &name,
-//                   const vector<string> &cols ) ;
-//   STIdxIterExAcc( const CountedPtr<Scantable> &s,
-//                   const vector<string> &cols ) ;
-//   ~STIdxIterExAcc() ;
-// protected:
-//   virtual void init( Table &t,
-//                      const vector<string> &cols ) ;
-// } ;
+class STIdxIterExAcc : public STIdxIter
+{
+public:
+  STIdxIterExAcc() ;
+  STIdxIterExAcc( const string &name,
+                  const vector<string> &cols ) ;
+  STIdxIterExAcc( const CountedPtr<Scantable> &s,
+                  const vector<string> &cols ) ;
+  ~STIdxIterExAcc() ;
+  Int getSrcType() ;
+  String getSrcName() ;
+protected:
+  virtual void init( Table &t,
+                     const vector<string> &cols ) ;
+private:
+  void processIntCol( Vector<Int> &in,
+                      Vector<uInt> &out,
+                      Block<Int> &val ) ;
+  void processStrCol( Vector<String> &in,
+                      Vector<uInt> &out,
+                      Block<String> &val ) ;
+  Block<Int> srctype_m ;
+  Block<String> srcname_m ;
+  uInt srctypeid_m ;
+  uInt srcnameid_m ;
+} ;
 
 } // namespace