Changeset 2783 for trunk/external-alma/atnf/PKSIO/NROFITSDataset.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/NROFITSDataset.cc (modified) (4 diffs)

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

@@ -47 +47 @@
 NROFITSDataset::NROFITSDataset( string name )
   : NRODataset( name ) 
-{
-  LogIO os( LogOrigin( "NROFITSDataset", "NROFITSDataset()", WHERE ) ) ;
-
-  fp_ = NULL ;
-  dataid_ = -1 ;
-  record_ = new NRODataRecord() ;
-  record_->LDATA = NULL ; // never use LDATA 
+{}
+
+// destructor 
+NROFITSDataset::~NROFITSDataset() 
+{
+  // close file
+  close() ;
+}
+
+// data initialization
+void NROFITSDataset::initialize()
+{
+  LogIO os( LogOrigin( "NROFITSDataset", "initialize()", WHERE ) ) ;
 
   // open file
   if ( open() ) 
     os << LogIO::SEVERE << "error while opening file " << filename_ << LogIO::EXCEPTION ;
- 
-  // data initialization
+
+  // field names, units, and sizes
   readHeader( numField_, "TFIELDS", same_ ) ;
   names_.resize( numField_ ) ;
@@ -88 +94 @@
   }
 
-  // memory allocation
-  initialize() ;
-}
-
-// destructor 
-NROFITSDataset::~NROFITSDataset() 
-{
-  // close file
-  close() ;
-}
-
-// data initialization
-void NROFITSDataset::initialize()
-{
-  LogIO os( LogOrigin( "NROFITSDataset", "initialize()", WHERE ) ) ;
-
+  // initialization
   int status = 0 ;
   status = readHeader( ARYNM, "ARYNM", same_ ) ;
@@ -182 +173 @@
 
   refFreq_.resize( ARYNM, 0.0 ) ;
-}
-
-// fill data header
-int NROFITSDataset::fillHeader() 
-{
-  LogIO os( LogOrigin( "NROFITSDataset", "fillHeader()", WHERE ) ) ;
-
-  // open file
-  if ( open() ) {
-    os << LogIO::SEVERE << "Error opening file " << filename_ << "." << LogIO::EXCEPTION ;
-    return -1 ;
-  }
-
-  // fill
-  int status = fillHeader( same_ ) ;
-
-  return status ;
+
+  // NRODataRecord
+  record_ = new NRODataRecord() ;
+  record_->LDATA = NULL ;
 }
 
@@ -862 +840 @@
 //   nro_debug_output( "DSBFC", ARYNM, DSBFC ) ;
   //
-
-  show() ;
 
   return 0 ;