Changeset 2662 for tags/asap-4.1.0/src/STAttr.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/STAttr.cpp (modified) (8 diffs)

tags/asap-4.1.0/src/STAttr.cpp

@@ -37 +37 @@
 #include <casa/Quanta/Quantum.h>
 #include <casa/Quanta/MVTime.h>
+#include <casa/Logging/LogIO.h>
 
 #include <measures/Measures/MEpoch.h>
@@ -52 +53 @@
 }
 
-STAttr::STAttr(const STAttr& other):
-  Logger()
+STAttr::STAttr(const STAttr& other)
 {
   (void) other; //suppress unused warning
@@ -123 +123 @@
                                       const Vector<Float>& freqs) const
 {
-
-  // Look at date where appropriate
+   casa::LogIO os( casa::LogOrigin( "STAttr", "beamEfficiency()" ) );
+   // Look at date where appropriate
    MVTime t(dateObs.getValue());
    uInt year = t.year();
@@ -133 +133 @@
         {
           if (year<2003) {
-            pushLog("There is no beam efficiency data from before 2003"
-                    " - using 2003 data");
+            os << "There is no beam efficiency data from before 2003"
+               <<" - using 2003 data" << casa::LogIO::POST;
             facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_);
           } else if (year==2003) {
-            pushLog("Using beam efficiency data from 2003");
+            os << "Using beam efficiency data from 2003" << casa::LogIO::POST;
             facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_);
           } else {
-            pushLog("Using beam efficiency data from 2004");
+            os << "Using beam efficiency data from 2004" << casa::LogIO::POST;
             facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_);
           }
@@ -147 +147 @@
    default:
      {
-       pushLog("No beam efficiency data for this instrument - assuming unity");
+       os << "No beam efficiency data for this instrument - assuming unity"
+          << casa::LogIO::POST;
      }
    }
@@ -157 +158 @@
                                          const Vector<Float>& freqs) const
 {
-
+   casa::LogIO os( casa::LogOrigin( "STAttr", "apertureEfficiency()" ) );
   // Look at date where appropriate
   MVTime t(dateObs.getValue());
@@ -167 +168 @@
     {
       if (year<2004) {
-        pushLog("There is no aperture efficiency data from before 2004"
-                " - using 2004 data");
+        os << "There is no aperture efficiency data from before 2004"
+           << " - using 2004 data" << casa::LogIO::POST;
         facs = interp(freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
       } else {
-        pushLog("Using aperture efficiency data from 2004");
+        os << "Using aperture efficiency data from 2004" << casa::LogIO::POST;
         facs = interp(freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
       }
@@ -183 +184 @@
   default:
     {
-      pushLog("No aperture efficiency data for this instrument"
-              " - assuming unity");
+      os << "No aperture efficiency data for this instrument"
+         <<  " - assuming unity" << casa::LogIO::POST;
     }
   }