Changeset 3106 for trunk/src/STMath.cpp

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/STMath.cpp (modified) (8 diffs)

trunk/src/STMath.cpp

@@ -63 +63 @@
 #include "CalibrationHelper.h"
 
-using namespace casa;
-using namespace asap;
+using namespace casacore;
+
+namespace asap {
 
 // 2012/02/17 TN
@@ -1308 +1309 @@
                                           const CountedPtr < Scantable >& ref,
                                           int smoothref,
-                                          casa::Float tsysv,
-                                          casa::Float tau )
-{
-  LogIO os( casa::LogOrigin( "STMath", "dosigref()"));
+                                          casacore::Float tsysv,
+                                          casacore::Float tau )
+{
+  LogIO os( casacore::LogOrigin( "STMath", "dosigref()"));
 if ( ! ref->conformant(*sig) ) {
     throw(AipsError("'sig' and 'ref' scantables are not conformant."));
@@ -1410 +1411 @@
 }
 
-CountedPtr< Scantable > STMath::donod(const casa::CountedPtr<Scantable>& s,
+CountedPtr< Scantable > STMath::donod(const casacore::CountedPtr<Scantable>& s,
                                      const std::vector<int>& scans,
                                      int smoothref,
-                                     casa::Float tsysv,
-                                     casa::Float tau,
-                                     casa::Float tcal )
+                                     casacore::Float tsysv,
+                                     casacore::Float tau,
+                                     casacore::Float tcal )
 
 {
   setInsitu(false);
-  LogIO os( casa::LogOrigin( "STMath", "donod()"));
+  LogIO os( casacore::LogOrigin( "STMath", "donod()"));
   STSelector sel;
   std::vector<int> scan1, scan2, beams, types;
@@ -1589 +1590 @@
                                       const std::vector<int>& scans,
                                       int smoothref,
-                                      casa::Float tsysv,
-                                      casa::Float tau,
-                                      casa::Float tcal )
+                                      casacore::Float tsysv,
+                                      casacore::Float tau,
+                                      casacore::Float tcal )
 {
 
@@ -2928 +2929 @@
                                 const std::string & method)
 {
-  LogIO os( casa::LogOrigin("STMath", "frequencyAlign()", WHERE));
+  LogIO os( casacore::LogOrigin("STMath", "frequencyAlign()", WHERE));
   // clone as this is not working insitu
   bool insitu = insitu_;
@@ -3158 +3159 @@
 
 std::vector<float>
-  asap::STMath::fft( const casa::CountedPtr< Scantable > & in, 
+  asap::STMath::fft( const casacore::CountedPtr< Scantable > & in,
                      const std::vector<int>& whichrow, 
                      bool getRealImag )
@@ -3250 +3251 @@
                      const std::string& weight,
                      const std::string& avmode )
-  throw ( casa::AipsError )
+  throw ( casacore::AipsError )
 {
   LogIO os( LogOrigin( "STMath", "new_average()", WHERE ) ) ;
@@ -4359 +4360 @@
   return a ;
 }
+
+}