Changeset 3106 for trunk/src/STMathWrapper.h

Timestamp:

10/04/16 18:20:50 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No?

Interface Changes: Yes/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...

Check-in asap modifications from Jim regarding casacore namespace conversion.

File:

• trunk/src/STMathWrapper.h (modified) (8 diffs)

trunk/src/STMathWrapper.h

@@ -42 +42 @@
              const std::string& avmode )
   {
-    std::vector<casa::CountedPtr<Scantable> > sts;
+    std::vector<casacore::CountedPtr<Scantable> > sts;
     for (unsigned int i=0; i<in.size(); ++i) sts.push_back(in[i].getCP());
     return ScantableWrapper(STMath::average(sts, mask, weight, avmode));
@@ -105 +105 @@
 
   ScantableWrapper dototalpower( const ScantableWrapper& calon,
-                             const ScantableWrapper& caloff, casa::Float tcal= 0 )
+                             const ScantableWrapper& caloff, casacore::Float tcal= 0 )
   { return ScantableWrapper( STMath::dototalpower( calon.getCP(), caloff.getCP(), tcal ) ); }
 
   ScantableWrapper dosigref( const ScantableWrapper& sig,
                              const ScantableWrapper& ref,
-                             int smoothref = 0, casa::Float tsysv=0.0, casa::Float tau=0.0)
+                             int smoothref = 0, casacore::Float tsysv=0.0, casacore::Float tau=0.0)
   { return ScantableWrapper( STMath::dosigref( sig.getCP(), ref.getCP(), smoothref, tsysv, tau ) ); }
 
@@ -116 +116 @@
                           const std::vector<int>& scans,
                           int smoothref = 0,
-                          casa::Float tsysv=0.0, casa::Float tau=0.0, casa::Float tcal=0.0 )
+                          casacore::Float tsysv=0.0, casacore::Float tau=0.0, casacore::Float tcal=0.0 )
   { return ScantableWrapper( STMath::donod( s.getCP(), scans, smoothref, tsysv, tau, tcal ) ); }
 
@@ -122 +122 @@
                          const std::vector<int>& scans,
                          int smoothref = 0,
-                         casa::Float tsysv=0.0, casa::Float tau=0.0, casa::Float tcal=0.0 )
+                         casacore::Float tsysv=0.0, casacore::Float tau=0.0, casacore::Float tcal=0.0 )
   { return ScantableWrapper( STMath::dofs( s.getCP(), scans, smoothref, tsysv, tau, tcal ) ); }
 
@@ -180 +180 @@
           const std::string &freqTol)
   {
-    std::vector<casa::CountedPtr<Scantable> > sts;
+    std::vector<casacore::CountedPtr<Scantable> > sts;
     for (unsigned int i=0; i<in.size(); ++i) sts.push_back(in[i].getCP());
     return ScantableWrapper(STMath::merge(sts, freqTol)); }
@@ -229 +229 @@
                  const std::string& avmode )
   {
-    std::vector<casa::CountedPtr<Scantable> > sts;
+    std::vector<casacore::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));
@@ -239 +239 @@
                           const std::string antname )
   {
-    casa::CountedPtr<Scantable> tab = in.getCP() ;
-    casa::String mode( calmode ) ;
-    casa::String name( antname ) ;
+    casacore::CountedPtr<Scantable> tab = in.getCP() ;
+    casacore::String mode( calmode ) ;
+    casacore::String name( antname ) ;
     return ScantableWrapper( STMath::cwcal( tab, mode, name ) ) ;
   }
@@ -248 +248 @@
                           const std::string calmode )
   {
-    casa::CountedPtr<Scantable> tab = in.getCP() ;
-    casa::String mode( calmode ) ;
+    casacore::CountedPtr<Scantable> tab = in.getCP() ;
+    casacore::String mode( calmode ) ;
     return ScantableWrapper( STMath::almacal( tab, mode ) ) ;
   }