Changeset 3106 for trunk/src/STAttr.cpp


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/STAttr.cpp

    r2658 r3106  
    4545#include "STAttr.h"
    4646
    47 using namespace casa;
     47using namespace casacore;
    4848using namespace asap;
    4949
     
    123123                                      const Vector<Float>& freqs) const
    124124{
    125    casa::LogIO os( casa::LogOrigin( "STAttr", "beamEfficiency()" ) );
     125   casacore::LogIO os( casacore::LogOrigin( "STAttr", "beamEfficiency()" ) );
    126126   // Look at date where appropriate
    127127   MVTime t(dateObs.getValue());
     
    134134          if (year<2003) {
    135135            os << "There is no beam efficiency data from before 2003"
    136                <<" - using 2003 data" << casa::LogIO::POST;
     136               <<" - using 2003 data" << casacore::LogIO::POST;
    137137            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_);
    138138          } else if (year==2003) {
    139             os << "Using beam efficiency data from 2003" << casa::LogIO::POST;
     139            os << "Using beam efficiency data from 2003" << casacore::LogIO::POST;
    140140            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_);
    141141          } else {
    142             os << "Using beam efficiency data from 2004" << casa::LogIO::POST;
     142            os << "Using beam efficiency data from 2004" << casacore::LogIO::POST;
    143143            facs = interp(freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_);
    144144          }
     
    148148     {
    149149       os << "No beam efficiency data for this instrument - assuming unity"
    150           << casa::LogIO::POST;
     150          << casacore::LogIO::POST;
    151151     }
    152152   }
     
    158158                                         const Vector<Float>& freqs) const
    159159{
    160    casa::LogIO os( casa::LogOrigin( "STAttr", "apertureEfficiency()" ) );
     160   casacore::LogIO os( casacore::LogOrigin( "STAttr", "apertureEfficiency()" ) );
    161161  // Look at date where appropriate
    162162  MVTime t(dateObs.getValue());
     
    169169      if (year<2004) {
    170170        os << "There is no aperture efficiency data from before 2004"
    171            << " - using 2004 data" << casa::LogIO::POST;
     171           << " - using 2004 data" << casacore::LogIO::POST;
    172172        facs = interp(freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
    173173      } else {
    174         os << "Using aperture efficiency data from 2004" << casa::LogIO::POST;
     174        os << "Using aperture efficiency data from 2004" << casacore::LogIO::POST;
    175175        facs = interp(freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
    176176      }
     
    185185    {
    186186      os << "No aperture efficiency data for this instrument"
    187          <<  " - assuming unity" << casa::LogIO::POST;
     187         <<  " - assuming unity" << casacore::LogIO::POST;
    188188    }
    189189  }
Note: See TracChangeset for help on using the changeset viewer.