Changeset 2662 for tags

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)
• CHANGELOG (modified) (2 diffs)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• install_osx.sh (copied) (copied from trunk/install_osx.sh )
• python (modified) (1 prop)
• python/__init__.py (modified) (1 diff)
• src (modified) (1 prop)
• src/FillerWrapper.h (modified) (1 prop)
• src/Logger.cpp (deleted)
• src/Logger.h (deleted)
• src/SConscript (modified) (1 prop)
• src/SDFITSImageWriter.cc (deleted)
• src/SDFITSImageWriter.h (deleted)
• src/STAsciiWriter.cpp (modified) (2 diffs)
• src/STAsciiWriter.h (modified) (2 diffs)
• src/STAttr.cpp (modified) (8 diffs)
• src/STAttr.h (modified) (2 diffs)
• src/STFITSImageWriter.cpp (modified) (3 diffs)
• src/STFITSImageWriter.h (modified) (1 diff)
• src/STFiller.cpp (modified) (5 diffs)
• src/STFiller.h (modified) (2 diffs)
• src/STFrequencies.cpp (modified) (2 diffs)
• src/STMath.cpp (modified) (20 diffs)
• src/STMath.h (modified) (2 diffs)
• src/STSubTable.h (modified) (2 diffs)
• src/STWriter.cpp (modified) (9 diffs)
• src/STWriter.h (modified) (3 diffs)
• src/Scantable.cpp (modified) (6 diffs)
• src/Scantable.h (modified) (2 diffs)
• src/python_Logger.cpp (deleted)
• src/python_asap.cpp (modified) (1 diff)
• test/test_nrofiller.py (modified) (2 diffs)

tags/asap-4.1.0/CHANGELOG

@@ -2 +2 @@
 =========
 
-Release 4.1.0 [2012-17-05]
+Release 4.1.0 [2012-10-10]
 
 * reworked build system to work as 'normal' python package
@@ -8 +8 @@
 * experimental merging of IFs
 * speed ups
-* move to ipython>=0.11
+* work with to ipython>=0.11
 * Ticket #269 fixed regression of reference scan detection for Hobart data
-* work under OS X 10.7 
+* work under OS X 10.7/10.8
 * fixed logging control through rcParams
 * fix for frequency_alignment
 * Ticket #264 silence skydip.
 * Ticket #265 fix summary for multiple IF chains 
+* Ticket #280 fix SDFITS frequency frame output
 
 Release 4.0.0 [2011-10-05]

tags/asap-4.1.0/python/__init__.py

@@ -59 +59 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = 'trunk'
+__version__  = '4.1.0'
 __revision__ = get_revision()
 

tags/asap-4.1.0/src/STAsciiWriter.cpp

@@ -44 +44 @@
 #include <casa/sstream.h>
 #include <casa/iomanip.h>
+#include <casa/Logging/LogIO.h>
 
 #include <measures/Measures/MEpoch.h>
@@ -176 +177 @@
     }
     of.close();
-    ostringstream oss;
-    oss << "Wrote " << fName;
-    pushLog(String(oss));
+    LogIO os( LogOrigin( "STAsciiWriter") ) ;    
+    os << "Wrote " << fName << LogIO::POST;
     ++iter;
   }

tags/asap-4.1.0/src/STAsciiWriter.h

@@ -37 +37 @@
 
 #include "Scantable.h"
-#include "Logger.h"
+
 
 namespace casa {
@@ -48 +48 @@
  * A class to export a Scnatble to ASCII file(s)
  */
-class STAsciiWriter : public Logger {
+class STAsciiWriter {
 public:
 // Constructor

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;
     }
   }

tags/asap-4.1.0/src/STAttr.h

@@ -38 +38 @@
 #include <casa/Utilities/CountedPtr.h>
 
-#include "Logger.h"
 #include "STDefs.h"
 
@@ -47 +46 @@
 namespace asap {
 
-class STAttr : public Logger {
+class STAttr {
 
  public:

tags/asap-4.1.0/src/STFITSImageWriter.cpp

@@ -30 +30 @@
 //#---------------------------------------------------------------------------
 
+
 #include <fitsio.h>
-#include <images/Images/TempImage.h>
+#include <casa/Containers/RecordField.h>
+#include <casa/Logging/LogIO.h>
 
 #include <lattices/Lattices/ArrayLattice.h>
@@ -41 +43 @@
 #include <tables/Tables/TableIter.h>
 #include <tables/Tables/TableRecord.h>
-#include <casa/Containers/RecordField.h>
+
 #include <tables/Tables/TableRow.h>
 #include <tables/Tables/ScalarColumn.h>
@@ -271 +273 @@
     }
     fits_close_file(fptr, &status);
-    ostringstream oss;
-    oss << "Wrote " << fileName;
-    pushLog(String(oss));  
-    //pushLog(String(oss));
+    
+    LogIO os( casa::LogOrigin("STFITSImageWriter"));
+    os << "Wrote " << fileName << LogIO::POST;
     ++iter;
   }

tags/asap-4.1.0/src/STFITSImageWriter.h

@@ -33 +33 @@
 
 #include <casa/aips.h>
-#include <casa/BasicSL/String.h>
-#include <casa/ostream.h>
 
 #include <coordinates/Coordinates/DirectionCoordinate.h>
-#include "Scantable.h"
-#include "Logger.h"
+
+//#include "Scantable.h"
+
+namespace casa {
+  class String;
+}
 
 namespace asap {
+
+class Scantable;
+
+
 /**
  * A class to export a Scantable to FITS file(s)
  */
-class STFITSImageWriter : public Logger {
+class STFITSImageWriter {
 public:
 // Constructor

tags/asap-4.1.0/src/STFiller.cpp

@@ -36 +36 @@
 #include <atnf/PKSIO/NROReader.h>
 #include <casa/Logging/LogIO.h>
+#include <fits/FITS/FITSSpectralUtil.h>
 
 #include <time.h>
@@ -137 +138 @@
   // Get basic parameters.
   if ( anyEQ(haveXPol_, True) ) {
-    pushLog("Cross polarization present");
     for (uInt i=0; i< npols.nelements();++i) {
       if (npols[i] < 3) npols[i] += 2;// Convert Complex -> 2 Floats
@@ -164 +164 @@
     throw(AipsError("Failed to get header."));
   }
+  LogIO os( casa::LogOrigin( "STFiller") );
+  
   if ((header_->obstype).matches("*SW*")) {
     // need robust way here - probably read ahead of next timestamp
-    pushLog("Header indicates frequency switched observation.\n"
-               "setting # of IFs = 1 ");
+    os << "Header indicates frequency switched observation.\n"
+       << "setting # of IFs = 1 " << LogIO::POST;
     nIF_ = 1;
     header_->obstype = String("fswitch");
@@ -226 +228 @@
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
-  reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, getPt);
+  reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, 
+                  getPt);
   table_->setHeader(*header_);
   //For MS, add the location of POINTING of the input MS so one get
@@ -249 +252 @@
   //MS style (as PKSMS2reader converts the original frame
   //in FITS standard style)
-  if (freqFrame == "TOPOCENT") {
-    freqFrame = "TOPO";
-  } else if (freqFrame == "GEOCENER") {
-    freqFrame = "GEO";
-  } else if (freqFrame == "BARYCENT") {
-    freqFrame = "BARY";
-  } else if (freqFrame == "GALACTOC") {
-    freqFrame = "GALACTO";
-  } else if (freqFrame == "LOCALGRP") {
-    freqFrame = "LGROUP";
-  } else if (freqFrame == "CMBDIPOL") {
-    freqFrame = "CMB";
-  } else if (freqFrame == "SOURCE") {
-    freqFrame = "REST";
-  }
+  MFrequency::Types fframe;
+  FITSSpectralUtil::frameFromSpecsys(fframe, freqFrame);
   // set both "FRAME" and "BASEFRAME"
-  table_->frequencies().setFrame(freqFrame, false);
-  table_->frequencies().setFrame(freqFrame,true);
+  table_->frequencies().setFrame(fframe, false);
+  table_->frequencies().setFrame(fframe,true);
+  
   //table_->focus().setParallactify(true);
 }

tags/asap-4.1.0/src/STFiller.h

@@ -24 +24 @@
 #include "Scantable.h"
 #include "STHeader.h"
-#include "Logger.h"
+
 
 class PKSreader;
@@ -39 +39 @@
 @version  2.0a
 */
-class STFiller : public Logger {
+class STFiller {
 public:
 

tags/asap-4.1.0/src/STFrequencies.cpp

@@ -15 +15 @@
 #include <casa/Containers/RecordField.h>
 #include <casa/Arrays/IPosition.h>
+#include <casa/Logging/LogIO.h>
 
 #include <tables/Tables/TableDesc.h>
@@ -264 +265 @@
   if (!MFrequency::getType(mft, rf)) {
     ostringstream oss;
-    pushLog("WARNING: Frequency type unknown assuming TOPO");
+    LogIO os( casa::LogOrigin( "STFrequencies", "getFrame") );
+    os << LogIO::WARN << "WARNING: Frequency type unknown assuming TOPO"
+       << LogIO::POST;
     mft = MFrequency::TOPO;
   }

tags/asap-4.1.0/src/STMath.cpp

@@ -388 +388 @@
       cycColOut.put(i, uInt(0));
     } else {
-      ostringstream oss;
-      oss << "For output row="<<i<<", all input rows of data are flagged. no averaging" << endl;
-      pushLog(String(oss));
+      os << "For output row="<<i<<", all input rows of data are flagged. no averaging" << LogIO::POST;
     }
     acc.reset();
@@ -1252 +1250 @@
                                           casa::Float tau )
 {
+  LogIO os( casa::LogOrigin( "STMath", "dosigref()"));
 if ( ! ref->conformant(*sig) ) {
     throw(AipsError("'sig' and 'ref' scantables are not conformant."));
@@ -1263 +1262 @@
     smref = smooth(ref, inkernel, fsmoothref );
     ostringstream oss;
-    oss<<"Applied smoothing of "<<fsmoothref<<" on the reference."<<endl;
-    pushLog(String(oss));
+    os <<"Applied smoothing of "<<fsmoothref<<" on the reference."
+       << LogIO::POST;
   }
   else {
@@ -1309 +1308 @@
         Float elev;
         refelevCol.get(i, elev);
-        oss << "user specified Tsys = " << tsysv;
+        os << "user specified Tsys = " << tsysv;
         // do recalc elevation if EL = 0
         if ( elev == 0 ) {
@@ -1320 +1319 @@
           }
         }
-        oss << ", corrected (for El) tsys= "<<tsysrefscalar;
-        pushLog(String(oss));
+        os << ", corrected (for El) tsys= "<<tsysrefscalar;
       }
       else {
@@ -1357 +1355 @@
 {
   setInsitu(false);
+  LogIO os( casa::LogOrigin( "STMath", "donod()"));
   STSelector sel;
   std::vector<int> scan1, scan2, beams, types;
@@ -1444 +1443 @@
 
   msg=String("Processing dototalpower for subset of the data");
-  ostringstream oss1;
-  oss1 << msg  << endl;
-  pushLog(String(oss1));
+  os << msg << LogIO::POST;
   // Debug for IRC CS data
   //float tcal1=7.0;
@@ -1459 +1456 @@
   // dosigref calibration
   msg=String("Processing dosigref for subset of the data");
-  ostringstream oss2;
-  oss2 << msg  << endl;
-  pushLog(String(oss2));
+  os << msg  << endl;
   calb1=dosigref(sig1,ref2,smoothref,tsysv,tau);
   calb2=dosigref(sig2,ref1,smoothref,tsysv,tau);
@@ -2161 +2156 @@
                                                const std::string& method)
 {
+  LogIO os( LogOrigin( "STMath", "gainElevation", WHERE ) ) ;
   // Get elevation data from Scantable and convert to degrees
   CountedPtr< Scantable > out = getScantable(in, false);
@@ -2203 +2199 @@
       throw(AipsError("There is no known gain-elevation polynomial known for this instrument"));
     }
-    ostringstream oss;
-    oss << "Making polynomial correction with " << msg << " coefficients:" << endl;
-    oss << "   " <<  coeff;
-    pushLog(String(oss));
+    os << "Making polynomial correction with " << msg << " coefficients:" << endl;
+    os << "   " <<  coeff << LogIO::POST;
     const uInt nrow = tab.nrow();
     Vector<Float> factor(nrow);
@@ -2217 +2211 @@
   } else {
     // Read and correct
-    pushLog("Making correction from ascii Table");
+    os << "Making correction from ascii Table" << LogIO::POST;
     scaleFromAsciiTable(tab, filename, method, x, true);
   }
@@ -2288 +2282 @@
                                              float jyperk )
 {
+  LogIO os( LogOrigin( "STMath", "convertFlux", WHERE ) ) ;
+
   CountedPtr< Scantable > out = getScantable(in, false);
   Table& tab = in->table();
@@ -2299 +2295 @@
 
   if ( fluxUnit == JY ) {
-    pushLog("Converting to K");
+    os << "Converting to K" << LogIO::POST;
     Quantum<Double> t(1.0,fluxUnit);
     Quantum<Double> t2 = t.get(JY);
@@ -2307 +2303 @@
     out->setFluxUnit("K");
   } else if ( fluxUnit == K ) {
-    pushLog("Converting to Jy");
+    os << "Converting to Jy" << LogIO::POST;
     Quantum<Double> t(1.0,fluxUnit);
     Quantum<Double> t2 = t.get(K);
@@ -2324 +2320 @@
     factor *= jyperk;
     if ( tokelvin ) factor = 1.0 / jyperk;
-    ostringstream oss;
-    oss << "Jy/K = " << jyperk;
-    pushLog(String(oss));
+    os << "Jy/K = " << jyperk << LogIO::POST;
     Vector<Float> factors(outtab.nrow(), factor);
     scaleByVector(outtab,factors, false);
@@ -2338 +2332 @@
     }
     jyperk = STAttr::findJyPerK(etaap, d);
-    ostringstream oss;
-    oss << "Jy/K = " << jyperk;
-    pushLog(String(oss));
+    os << "Jy/K = " << jyperk << LogIO::POST;
     factor *= jyperk;
     if ( tokelvin ) {
@@ -2354 +2346 @@
     // change per integration.
 
-    pushLog("Looking up conversion factors");
+    os <<"Looking up conversion factors" << LogIO::POST;
     convertBrightnessUnits(out, tokelvin, cfac);
   }
@@ -2547 +2539 @@
     if ( ! (*it)->conformant(*out) ) {
       // non conformant.
-      //pushLog(String("Warning: Can't merge scantables as header info differs."));
       LogIO os( LogOrigin( "STMath", "merge()", WHERE ) ) ;
       os << LogIO::SEVERE << "Can't merge scantables as header informations (any one of AntennaName, Equinox, and FluxUnit) differ." << LogIO::EXCEPTION ;
@@ -2746 +2737 @@
                                 const std::string & method)
 {
+  LogIO os( casa::LogOrigin("STMath", "frequencyAlign()", WHERE));
   // clone as this is not working insitu
   bool insitu = insitu_;
@@ -2784 +2776 @@
   MVTime mvt(refEpoch.getValue());
   String epochout = mvt.string(MVTime::YMD) + String(" (") + refEpoch.getRefString() + String(")");
-  ostringstream oss;
-  oss << "Aligned at reference Epoch " << epochout
-      << " in frame " << MFrequency::showType(system);
-  pushLog(String(oss));
+  os << "Aligned at reference Epoch " << epochout
+     << " in frame " << MFrequency::showType(system) << LogIO::POST;
   // set up the iterator
   Block<String> cols(4);

tags/asap-4.1.0/src/STMath.h

@@ -23 +23 @@
 #include <scimath/Mathematics/InterpolateArray1D.h>
 
-#include "Logger.h"
 #include "Scantable.h"
 #include "STDefs.h"
@@ -34 +33 @@
         * @author Malte Marquarding
 */
-class STMath : private Logger {
+class STMath {
 public:
         // typedef for long method name

tags/asap-4.1.0/src/STSubTable.h

@@ -16 +16 @@
 #include <tables/Tables/ScalarColumn.h>
 
-#include "Logger.h"
+
 
 namespace asap {
@@ -28 +28 @@
 @version $Revision:$
 */
-class STSubTable : public Logger {
+class STSubTable  {
 public:
   STSubTable() {;}

tags/asap-4.1.0/src/STWriter.cpp

@@ -38 +38 @@
 #include <casa/Utilities/CountedPtr.h>
 #include <casa/Utilities/Assert.h>
+#include <casa/Logging/LogIO.h>
 
 #include <atnf/PKSIO/PKSrecord.h>
-#ifndef NOPKSMS
-#include <atnf/PKSIO/PKSMS2writer.h>
-#endif
 #include <atnf/PKSIO/PKSSDwriter.h>
 #include <atnf/PKSIO/SrcType.h>
@@ -51 +49 @@
 #include <tables/Tables/ArrayColumn.h>
 
+#include <fits/FITS/FITSSpectralUtil.h>
+
 #include "STFITSImageWriter.h"
 #include "STAsciiWriter.h"
@@ -68 +68 @@
   t.upcase();
   if (t == "MS2") {
-    #ifdef NOPKSMS
     throw (AipsError("MS2 OUTPUT FORMAT IS NO LONGER SUPPORTED"));
-    #else
-    writer_ = new PKSMS2writer();
-    #endif
   } else if (t == "SDFITS") {
     writer_ = new PKSSDwriter();
@@ -99 +95 @@
   t.upcase();
   if (t== "MS2") {
-    #ifdef NOPKSMS
     throw (AipsError("MS2 OUTPUT FORMAT IS NO LONGER SUPPORTED"));
-    #else
-    writer_ = new PKSMS2writer();
-    #endif
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();
@@ -121 +113 @@
   // in asap on-the-fly.
 
+  String freqframe;
+  FITSSpectralUtil::specsysFromFrame(freqframe, 
+                                     in->frequencies().getFrame(true));
   CountedPtr<Scantable> inst = in;
   if (in->frequencies().getFrame(true) != in->frequencies().getFrame(false)) {
+    FITSSpectralUtil::specsysFromFrame(freqframe, 
+                                     in->frequencies().getFrame(false));
+  
     STMath stm(false);
     inst = stm.frequencyAlign(in);
@@ -151 +149 @@
   // before. Need to check with the Offline User Test data
   STHeader hdr = inst->getHeader();
-  //const Int nPol  = hdr.npol;
-  //const Int nChan = hdr.nchan;
   std::vector<uint> ifs = inst->getIFNos();
   int nIF = inst->nif();//ifs.size();
@@ -177 +173 @@
   // Create the output file and write static data.
   Int status;
-//   status = writer_->create(String(filename), hdr.observer, hdr.project,
-//                            hdr.antennaname, hdr.antennaposition,
-//                            hdr.obstype, hdr.fluxunit,
-//                            hdr.equinox, hdr.freqref,
-//                            nChan, nPol, havexpol, False);
   status = writer_->create(String(filename), hdr.observer, hdr.project,
                            inst->getAntennaName(), hdr.antennaposition,
                            hdr.obstype, hdr.fluxunit,
-                           hdr.equinox, hdr.freqref,
+                           hdr.equinox, freqframe,
                            nChan, nPol, havexpol, False);
   if ( status ) {
@@ -331 +322 @@
     ++scanit;
   }
-  ostringstream oss;
-  oss << "STWriter: wrote " << count << " rows to " << filename;
-  pushLog(String(oss));
-  
+  LogIO os( casa::LogOrigin("STWriter"));
+  os << "STWriter: wrote " << count << " rows to " << filename
+     << casa::LogIO::POST;
+
   writer_->close();
-  //if MS2 delete POINTING table exists and copy the one in the keyword
-  if ( format_ == "MS2" ) {
-    replacePtTab(table, filename);
-  }
+
   return 0;
 }
@@ -390 +378 @@
 }
 
-// For writing MS data, if there is the reference to
-// original pointing table it replace it by it.
-void STWriter::replacePtTab (const Table& tab, const std::string& fname)
-{
-  String oldPtTabName = fname;
-  oldPtTabName.append("/POINTING");
-  if ( tab.keywordSet().isDefined("POINTING") ) {
-    String PointingTab = tab.keywordSet().asString("POINTING");
-    if ( Table::isReadable(PointingTab) ) {
-      Table newPtTab(PointingTab, Table::Old);
-      newPtTab.copy(oldPtTabName, Table::New);
-      ostringstream oss;
-      oss << "STWriter: copied  " <<PointingTab  << " to " << fname;
-      pushLog(String(oss));
-    }
-  }
-}
 
 // get obsType string from SRCTYPE value

tags/asap-4.1.0/src/STWriter.h

@@ -38 +38 @@
 #include <casa/BasicSL/String.h>
 
-#include "Logger.h"
 #include "Scantable.h"
 
@@ -53 +52 @@
   * @version 2.0a
 */
-class STWriter : public Logger {
+class STWriter {
 public:
   explicit STWriter(const string &format = "SDFITS");
@@ -82 +81 @@
                       const casa::Table& tab);
 
-  void replacePtTab(const casa::Table& tab, const std::string& fname);
-
   casa::String getObsTypes( casa::Int srctype ) ;
 

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;

tags/asap-4.1.0/src/Scantable.h

@@ -39 +39 @@
 #include <tables/Tables/Table.h>
 
-#include "Logger.h"
+
 #include "MathUtils.h"
 #include "STFit.h"
@@ -74 +74 @@
   * @version
 */
-class Scantable : private Logger
+class Scantable
 {
 

tags/asap-4.1.0/src/python_asap.cpp

@@ -81 +81 @@
   asap::python::python_MSWriter();
   asap::python::python_LineCatalog();
-  asap::python::python_Logger();
   asap::python::python_LogSink();
   asap::python::python_STCoordinate();

tags/asap-4.1.0/test/test_nrofiller.py

@@ -8 +8 @@
 
 from nose.tools import *
+from nose.plugins.skip import SkipTest
 
 def tempdir_setup():
@@ -45 +46 @@
         assert_equal(self.st.stats('sum')[0],2183.681396484375)
 
+
     def test_frequency(self):
+        raise SkipTest("Currently disabled")
         rf=self.st.get_restfreqs()
         assert_equal(len(rf),2)