Changeset 2264

Timestamp:

08/08/11 13:30:12 (13 years ago)

Author:

KohjiNakamura

Message:

optimize getScanInfo method

File:

• branches/parallel/external-alma/atnf/PKSIO/NROReader.cc (modified) (4 diffs)

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

@@ -552 +552 @@
                             Vector<Double> &scanrate )
 {
+  static const IPosition oneByOne( 1, 1 );
+
   // DEBUG
   //cout << "NROReader::getScanInfo()  irow = " << irow << endl ;
@@ -589 +591 @@
 
   // restfreq (for MOLECULE_ID)
-  if ( restfreq.size() != 1 )
-    restfreq.resize( 1 ) ;
+  restfreq.resize( oneByOne ) ;
   restfreq[0] = record->FREQ0 ;
   //cout << "restfreq = " << rf << endl ;
@@ -617 +618 @@
   // spectra
   vector<double> spec = dataset_->getSpectrum( irow ) ;
-  if ( spectra.size() != spec.size() )
-    spectra.resize( spec.size() ) ;
+  spectra.resize( spec.size() ) ;
   int index = 0 ;
   for ( Vector<Float>::iterator itr = spectra.begin() ; itr != spectra.end() ; itr++ ) {
@@ -626 +626 @@
   
   // flagtra
-  if ( flagtra.size() != spectra.size() ) 
-    flagtra.resize( spectra.nelements() ) ;
+  flagtra.resize( spectra.nelements() ) ;
   flagtra.set( 0 ) ;
   //cout << "flag.size() = " << flag.size() << endl ;
 
   // tsys
-  if ( tsys.size() != 1 )
-    tsys.resize( 1 ) ;
+  tsys.resize( oneByOne ) ;
   tsys[0] = record->TSYS ;
   //cout << "tsys[0] = " << tsys[0] << endl ;