Changeset 2662 for tags/asap-4.1.0/src/Scantable.cpp

Timestamp:

10/10/12 14:53:53 (12 years ago)

Author:

Malte Marquarding

Message:

merge from trunk into release candidate

Location:

tags/asap-4.1.0

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/Scantable.cpp (modified) (6 diffs)

tags/asap-4.1.0/src/Scantable.cpp

@@ -20 +20 @@
 #include <casa/OS/File.h>
 #include <casa/OS/Path.h>
+#include <casa/Logging/LogIO.h>
 #include <casa/Arrays/Array.h>
 #include <casa/Arrays/ArrayAccessor.h>
@@ -168 +169 @@
 */
 
-Scantable::Scantable( const Scantable& other, bool clear ):
-  Logger()
+Scantable::Scantable( const Scantable& other, bool clear )
 {
   // with or without data
@@ -726 +726 @@
 
 void Scantable::calculateAZEL()
-{
+{  
+  LogIO os( LogOrigin( "Scantable", "calculateAZEL()", WHERE ) ) ;
   MPosition mp = getAntennaPosition();
   MEpoch::ROScalarColumn timeCol(table_, "TIME");
   ostringstream oss;
-  oss << "Computed azimuth/elevation using " << endl
-      << mp << endl;
+  oss << mp;
+  os << "Computed azimuth/elevation using " << endl
+     << String(oss) << endl;
   for (Int i=0; i<nrow(); ++i) {
     MEpoch me = timeCol(i);
     MDirection md = getDirection(i);
-    oss  << " Time: " << formatTime(me,False) << " Direction: " << formatDirection(md)
+    os  << " Time: " << formatTime(me,False) 
+        << " Direction: " << formatDirection(md)
          << endl << "     => ";
     MeasFrame frame(mp, me);
@@ -744 +747 @@
     azCol_.put(i,Float(azel[0]));
     elCol_.put(i,Float(azel[1]));
-    oss << "azel: " << azel[0]/C::pi*180.0 << " "
-        << azel[1]/C::pi*180.0 << " (deg)" << endl;
-  }
-  pushLog(String(oss));
+    os << "azel: " << azel[0]/C::pi*180.0 << " "
+       << azel[1]/C::pi*180.0 << " (deg)" << LogIO::POST;
+  }
 }
 
@@ -885 +887 @@
                                            const std::string& poltype ) const
 {
+  LogIO os( LogOrigin( "Scantable", "getSpectrum()", WHERE ) ) ;
+
   String ptype = poltype;
   if (poltype == "" ) ptype = getPolType();
@@ -907 +911 @@
   }
   if ( arr.nelements() == 0 )
-    pushLog("Not enough polarisations present to do the conversion.");
+    
+    os << "Not enough polarisations present to do the conversion." 
+       << LogIO::POST;
   arr.tovector(out);
   return out;