Changeset 2590 for branches/hpc34/external-alma/atnf/PKSIO/NROReader.cc

Timestamp:

07/09/12 14:41:03 (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...

In NROReader::getScanInfo, replaced a loop using casa::Vector<T>::iteratorSTL
with direct data access.

In NRODataset::getSpectrum, optimized operation and a few bug fixes.

File:

• branches/hpc34/external-alma/atnf/PKSIO/NROReader.cc (modified) (1 diff)

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

@@ -613 +613 @@
   spectra.resize( spec.size() ) ;
   int index = 0 ;
-  for ( Vector<Float>::iterator itr = spectra.begin() ; itr != spectra.end() ; itr++ ) {
-    *itr = spec[index++] ;
-  }
+  Bool b ;
+  Float *fp = spectra.getStorage( b ) ;
+  Float *wp = fp ;
+  for ( vector<double>::iterator i = spec.begin() ;
+        i != spec.end() ; i++ ) {
+    *wp = *i ;
+    wp++ ;
+  }
+  spectra.putStorage( fp, b ) ;
   //cout << "spec.size() = " << spec.size() << endl ;
   
   // flagtra
   bool setValue = !( flagtra.nelements() == spectra.nelements() ) ; 
-  flagtra.resize( spectra.nelements() ) ;
   if ( setValue ) {
     //cout << "flagtra resized. reset values..." << endl ;
+    flagtra.resize( spectra.nelements() ) ;
     flagtra.set( 0 ) ;
   }