Changeset 2783 for trunk/external-alma/atnf/PKSIO/NRO45FITSReader.cc

Timestamp:

03/07/13 19:56:52 (11 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...

more refactoring on NRO filler.

File:

• trunk/external-alma/atnf/PKSIO/NRO45FITSReader.cc (modified) (1 diff)

trunk/external-alma/atnf/PKSIO/NRO45FITSReader.cc

@@ -56 +56 @@
 }
   
-// Read data header
-Int NRO45FITSReader::read() 
+// // Read data header
+// Int NRO45FITSReader::read() 
+// {
+//   LogIO os( LogOrigin( "NRO45FITSReader", "read()", WHERE ) ) ;
+
+//   // DEBUG
+//   //cout << "NRO45FITSReader::read()" << endl ;
+//   //
+//   int status = 0 ;
+
+//   // create NRO45Dataset
+//   dataset_ = new NROFITSDataset( filename_ ) ;
+
+//   // fill NROFITSDataset
+//   status = dataset_->fillHeader() ;
+
+//   if ( status != 0 ) {
+//     //cerr << "Failed to fill data header." << endl ;
+//     os << LogIO::SEVERE << "Failed to fill data header." << LogIO::EXCEPTION ;
+//   }
+
+//   return status ;
+// }
+
+void NRO45FITSReader::initDataset()
 {
-  LogIO os( LogOrigin( "NRO45FITSReader", "read()", WHERE ) ) ;
-
-  // DEBUG
-  //cout << "NRO45FITSReader::read()" << endl ;
-  //
-  int status = 0 ;
-
-  // create NRO45Dataset
   dataset_ = new NROFITSDataset( filename_ ) ;
-
-  // fill NROFITSDataset
-  status = dataset_->fillHeader() ;
-
-  if ( status != 0 ) {
-    //cerr << "Failed to fill data header." << endl ;
-    os << LogIO::SEVERE << "Failed to fill data header." << LogIO::EXCEPTION ;
-  }
-
-  return status ;
+  dataset_->initialize() ;
 }