Changeset 2590 for branches

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.

Location:

branches/hpc34/external-alma/atnf/PKSIO

Files:

• NRODataset.cc (modified) (4 diffs)
• NROReader.cc (modified) (1 diff)

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

@@ -388 +388 @@
 
   // char -> int
-  vector<int> ispec( chmax_, 0 ) ;
+  int *ispec = new int[chmax_] ;
+  int *int_p = ispec ;
 
   static const int shift_right[] = {
@@ -403 +404 @@
     int ivalue = 0 ;
     if ( bit == 12 ) {  // 12 bit qunatization
-      const int idx = j + start_pos[i & 1];
+      const int ialt = i & 1 ;
+      const int idx = j + start_pos[ialt];
       const unsigned tmp = unsigned(cdata[idx]) << 8 | cdata[idx + 1];
-      ivalue = int((tmp >> shift_right[i & 1]) & 0xFFF);
-      j += incr[i & 1];
-    }
-
-    ispec[i] = ivalue ;
-    if ( ( ispec[i] < 0 ) || ( ispec[i] > 4096 ) ) {
+      ivalue = int((tmp >> shift_right[ialt]) & 0xFFF);
+      j += incr[ialt];
+    }
+
+    if ( ( ivalue < 0 ) || ( ivalue > 4096 ) ) {
       //cerr << "NRODataset::getSpectrum()  ispec[" << i << "] is out of range" << endl ;
       os << LogIO::SEVERE << "ispec[" << i << "] is out of range" << LogIO::EXCEPTION ;
+      delete ispec ;
       return bspec ;
     }
@@ -418 +420 @@
     //cout << "NRODataset::getSpectrum()  ispec[" << i << "] = " << ispec[i] << endl ;
     //
+    *int_p = ivalue ;
+    int_p++ ;
   }
 
   double *const spec = new double[ chmax_ ] ;  // spectrum "before" binding
   // int -> double 
+  int_p = ispec ;
+  double *double_p = spec ;
   for ( int i = 0 ; i < chmax_ ; i++ ) {
-    spec[i] = (double)( ispec[i] * scale + offset ) * dscale ; 
+    *double_p = (double)( (*int_p) * scale + offset ) * dscale ; 
     // DEBUG
     //cout << "NRODataset::getSpectrum()  spec[" << i << "] = " << spec[i] << endl ;
     //
-  }
+    int_p++ ;
+    double_p++ ;
+  }
+  delete ispec ;
 
   // channel binding
   if ( cbind != 1 ) {
-    int k = chmin ;
-    double sum0 = 0 ;
-    double sum1 = 0 ;
-    for ( int i = 0 ; i < nchan ; i++ ) {
-      for ( int j = k ; j < k + cbind ; j++ ) {
-        sum0 += spec[k] ;
-        sum1++ ;
+    double_p = &(spec[chmin]) ;
+    for ( vector<double>::iterator i = bspec.begin() ;
+          i != bspec.end() ; i++ ) {
+      double sum0 = 0 ;
+      double sum1 = 0 ;
+      for ( int j = 0 ; j < cbind ; j++ ) {
+        sum0 += *double_p ;
+        sum1 += 1.0 ;
+        double_p++ ;
       }
-      bspec[i] = sum0 / sum1 ;
-      k += cbind ;
+      *i = sum0 / sum1 ;
+      i++ ;
       // DEBUG
       //cout << "NRODataset::getSpectrum()  bspec[" << i << "] = " << bspec[i] << endl ;
@@ -447 +458 @@
   }
   else {
-    for ( int i = 0 ; i < nchan ; i++ ) 
-      bspec[i] = spec[i] ;
+    double_p = spec ;
+    for ( vector<double>::iterator i = bspec.begin() ;
+          i != bspec.end() ; i++ ) {
+      *i = *double_p ;
+      double_p++ ;
+    }
   }
   delete[] spec;

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 ) ;
   }