Changeset 2596 for branches

Timestamp:

07/11/12 17:22:53 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: 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...

LogIO instance is created when it is needed.

Location:

branches/hpc34/external-alma/atnf/PKSIO

Files:

• NRODataset.cc (modified) (8 diffs)
• NROReader.cc (modified) (3 diffs)

branches/hpc34/external-alma/atnf/PKSIO/NRODataset.cc

@@ -58 +58 @@
 NRODataset::NRODataset( string name ) 
 {
-  LogIO os( LogOrigin( "NRODataset", "NRODataset()", WHERE ) ) ;
-
   // memory allocation
   initialize() ;
@@ -243 +241 @@
 NRODataRecord *NRODataset::getRecord( int i )
 {
-  LogIO os( LogOrigin( "NRODataset", "getRecord()", WHERE ) ) ;
-
   // DEBUG
   //cout << "NRODataset::getRecord()  Start " << i << endl ;
   //
   if ( i < 0 || i >= rowNum_ ) {
+    LogIO os( LogOrigin( "NRODataset", "getRecord()", WHERE ) ) ;
     //cerr << "NRODataset::getRecord()  data index out of range." << endl ;
     os << LogIO::SEVERE << "data index " << i << " out of range. return NULL." << LogIO::POST ;
@@ -267 +264 @@
   }
   else {
+    LogIO os( LogOrigin( "NRODataset", "getRecord()", WHERE ) ) ;
     //cerr << "NRODataset::getRecord()  error while reading data " << i << endl ;
     os << LogIO::SEVERE << "error while reading data " << i << ". return NULL." << LogIO::POST ;
@@ -278 +276 @@
 int NRODataset::fillRecord( int i ) 
 {
-  LogIO os( LogOrigin( "NRODataset", "fillRecord()", WHERE ) ) ;
-
   int status = 0 ;
 
@@ -295 +291 @@
   if ( (int)fread( record_, 1, SCAN_HEADER_SIZE, fp_ ) != SCAN_HEADER_SIZE ) {
     //cerr << "Failed to read scan header: " << i << endl ;
+    LogIO os( LogOrigin( "NRODataset", "fillRecord()", WHERE ) ) ;
     os << LogIO::SEVERE << "Failed to read scan header for " << i << "th row." << LogIO::POST ;
     return -1 ;
@@ -300 +297 @@
   if ( (int)fread( record_->LDATA, 1, dataLen_, fp_ ) != dataLen_ ) {
     //cerr << "Failed to read spectral data: " << i << endl ;
+    LogIO os( LogOrigin( "NRODataset", "fillRecord()", WHERE ) ) ;
     os << LogIO::SEVERE << "Failed to read spectral data for " << i << "th row." << LogIO::POST ;
     return -1 ;
@@ -354 +352 @@
 vector<double> NRODataset::getSpectrum( int i )
 {
-  LogIO os( LogOrigin( "NRODataset", "getSpectrum", WHERE ) ) ;
-  
   // DEBUG
   //cout << "NRODataset::getSpectrum() start process (" << i << ")" << endl ;
@@ -413 +409 @@
     if ( ( ivalue < 0 ) || ( ivalue > 4096 ) ) {
       //cerr << "NRODataset::getSpectrum()  ispec[" << i << "] is out of range" << endl ;
+      LogIO os( LogOrigin( "NRODataset", "getSpectrum", WHERE ) ) ;
       os << LogIO::SEVERE << "ispec[" << i << "] is out of range" << LogIO::EXCEPTION ;
       delete ispec ;

branches/hpc34/external-alma/atnf/PKSIO/NROReader.cc

@@ -300 +300 @@
 Vector<Double> NROReader::getSourceDirection()
 {
-  LogIO os( LogOrigin( "NROReader", "getSourceDirection()", WHERE ) ) ;
-
   if ( msrcdir_.nelements() == 2 )
     return msrcdir_ ;
@@ -323 +321 @@
     //<< srcra << "," << srcdec << ") B1950 to (" 
     //<< v( 0 ) << ","<< v( 1 ) << ") J2000" << endl ;
+    //LogIO os( LogOrigin( "NROReader", "getSourceDirection()", WHERE ) ) ;
     //os << LogIO::NORMAL << "SRCDIRECTION convert from (" 
     //   << srcra << "," << srcdec << ") B1950 to (" 
@@ -337 +336 @@
 Vector<Double> NROReader::getDirection( int i )
 {
-  LogIO os( LogOrigin( "NROReader", "getDirection()", WHERE ) ) ;
-
   Vector<Double> v( 2 ) ;
   NRODataRecord *record = dataset_->getRecord( i ) ;