Changeset 2263 for branches/parallel/external-alma

Timestamp:

08/04/11 15:42:43 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: No

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...

Tuning NROFiller.
Filler is about 6 times faster than before (~660sec->~110sec).

Location:

branches/parallel/external-alma/atnf/PKSIO

Files:

• NROReader.cc (modified) (6 diffs)
• NROReader.h (modified) (2 diffs)

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

@@ -531 +531 @@
                             String &srcname,
                             String &fieldname,
-                            Array<Float> &spectra,
-                            Array<uChar> &flagtra,
-                            Array<Float> &tsys,
-                            Array<Double> &direction,
+                            Vector<Float> &spectra,
+                            Vector<uChar> &flagtra,
+                            Vector<Float> &tsys,
+                            Vector<Double> &direction,
                             Float &azimuth,
                             Float &elevation,
@@ -548 +548 @@
                             Float &winddir,      
                             Double &srcvel,
-                            Array<Double> &propermotion,
+                            Vector<Double> &propermotion,
                             Vector<Double> &srcdir,
-                            Array<Double> &scanrate )
+                            Vector<Double> &scanrate )
 {
   // DEBUG
@@ -589 +589 @@
 
   // restfreq (for MOLECULE_ID)
-  Vector<Double> rf( IPosition( 1, 1 ) ) ;
-  rf( 0 ) = record->FREQ0 ;
-  restfreq = rf ;
+  if ( restfreq.size() != 1 )
+    restfreq.resize( 1 ) ;
+  restfreq[0] = record->FREQ0 ;
   //cout << "restfreq = " << rf << endl ;
 
@@ -617 +617 @@
   // spectra
   vector<double> spec = dataset_->getSpectrum( irow ) ;
-  Array<Float> sp( IPosition( 1, spec.size() ) ) ;
+  if ( spectra.size() != spec.size() )
+    spectra.resize( spec.size() ) ;
   int index = 0 ;
-  for ( Array<Float>::iterator itr = sp.begin() ; itr != sp.end() ; itr++ ) {
+  for ( Vector<Float>::iterator itr = spectra.begin() ; itr != spectra.end() ; itr++ ) {
     *itr = spec[index++] ;
   }
-  spectra = sp ;
   //cout << "spec.size() = " << spec.size() << endl ;
   
   // flagtra
-  Array<uChar> flag( spectra.shape() ) ;
-  flag.set( 0 ) ;
-  flagtra = flag ;
+  if ( flagtra.size() != spectra.size() ) 
+    flagtra.resize( spectra.nelements() ) ;
+  flagtra.set( 0 ) ;
   //cout << "flag.size() = " << flag.size() << endl ;
 
   // tsys
-  Array<Float> tmp( IPosition( 1, 1 ), record->TSYS ) ;
-  tsys = tmp ;
+  if ( tsys.size() != 1 )
+    tsys.resize( 1 ) ;
+  tsys[0] = record->TSYS ;
   //cout << "tsys[0] = " << tsys[0] << endl ;
 
@@ -693 +694 @@
 
   // propermotion
-  Array<Double> srcarr( IPosition( 1, 2 ) ) ;
-  srcarr = 0.0 ;
-  propermotion = srcarr ;
-  //cout << "propermotion = [" << propermotion[0] << ", " << propermotion[1] << "]" << endl ; 
+  // do nothing
 
   // srcdir
@@ -703 +701 @@
 
   // scanrate
-  Array<Double> sr( IPosition( 1, 1 ) ) ;
-  sr = 0.0 ;
-  scanrate = sr ;
-  //cout << "scanrate = " << scanrate[0] << endl ;
+  // do nothing
 
   return 0 ;

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

@@ -139 +139 @@
                            String &srcname,
                            String &fieldname,
-                           Array<Float> &spectra,
-                           Array<uChar> &flagtra,
-                           Array<Float> &tsys,
-                           Array<Double> &direction,
+                           Vector<Float> &spectra,
+                           Vector<uChar> &flagtra,
+                           Vector<Float> &tsys,
+                           Vector<Double> &direction,
                            Float &azimuth,
                            Float &elevation,
@@ -156 +156 @@
                            Float &winddir,      
                            Double &srcvel,
-                           Array<Double> &propermotion,
+                           Vector<Double> &propermotion,
                            Vector<Double> &srcdir,
-                           Array<Double> &scanrate ) ;
+                           Vector<Double> &scanrate ) ;
 
   // Get scan type