Changeset 1779 for branches/mergetest/src/STMathWrapper.h

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• src/STMathWrapper.h (modified) (4 diffs)

branches/mergetest/src/STMathWrapper.h

@@ -73 +73 @@
   { return ScantableWrapper(STMath::unaryOperate(in.getCP(), val, mode, tsys)); }
 
+  ScantableWrapper arrayOperate( const ScantableWrapper& in, 
+                                 const std::vector<float> val,
+                                 const std::string& mode,
+                                 bool tsys=false )
+  { return ScantableWrapper(STMath::arrayOperateChannel(in.getCP(), val, mode, tsys)); }
+
+  ScantableWrapper array2dOperate( const ScantableWrapper& in, 
+                                   const std::vector< std::vector<float> > val,
+                                   const std::string& mode, bool tsys=false )
+  { return ScantableWrapper(STMath::array2dOperate(in.getCP(), val, mode, tsys)); }
+
   ScantableWrapper binaryOperate( const ScantableWrapper& left,
                                   const ScantableWrapper& right,
@@ -121 +132 @@
   { return STMath::statistic(in.getCP(), mask, which); }
 
+  std::vector<int> minMaxChan(const ScantableWrapper& in,
+                               const std::vector<bool>& mask,
+                               const std::string& which)
+  { return STMath::minMaxChan(in.getCP(), mask, which); }
+
   ScantableWrapper bin( const ScantableWrapper& in, int width=5)
   { return ScantableWrapper(STMath::bin(in.getCP(), width)); }
@@ -175 +191 @@
                                    const std::string& refTime,
                                    const std::string& method  )
-  { return ScantableWrapper(STMath::frequencyAlign(in.getCP(), refTime, method)); }
+  { return ScantableWrapper(STMath::frequencyAlign(in.getCP())); }
 
   ScantableWrapper convertPolarisation( const ScantableWrapper& in,
@@ -191 +207 @@
                                             mode)); }
 
+  // test for average spectra with different channel/resolution
+  ScantableWrapper
+    new_average( const std::vector<ScantableWrapper>& in,
+                 const bool& compel,
+                 const std::vector<bool>& mask,
+                 const std::string& weight,
+                 const std::string& avmode )
+  {
+    std::vector<casa::CountedPtr<Scantable> > sts;
+    for (unsigned int i=0; i<in.size(); ++i) sts.push_back(in[i].getCP());
+    return ScantableWrapper(STMath::new_average(sts, compel, mask, weight, avmode));
+  }
+
+  // cwcal
+  ScantableWrapper cwcal( const ScantableWrapper &in,
+                          const std::string calmode,
+                          const std::string antname )
+  {
+    casa::CountedPtr<Scantable> tab = in.getCP() ;
+    casa::String mode( calmode ) ;
+    casa::String name( antname ) ;
+    return ScantableWrapper( STMath::cwcal( tab, mode, name ) ) ;
+  }
+  // almacal
+  ScantableWrapper almacal( const ScantableWrapper &in,
+                          const std::string calmode )
+  {
+    casa::CountedPtr<Scantable> tab = in.getCP() ;
+    casa::String mode( calmode ) ;
+    return ScantableWrapper( STMath::almacal( tab, mode ) ) ;
+  }
 };