Changeset 2289 for trunk/external-alma/atnf/PKSIO

Timestamp:

09/08/11 19:35:40 (13 years ago)

Author:

ShinnosukeKawakami

Message:

merged parallel branch to trunk

Location:

trunk/external-alma

Files:

• . (modified) (1 prop)
• atnf/PKSIO/NRODataset.cc (modified) (8 diffs)
• atnf/PKSIO/NRODataset.h (modified) (1 diff)
• atnf/PKSIO/NROReader.cc (modified) (6 diffs)
• atnf/PKSIO/NROReader.h (modified) (2 diffs)

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

@@ -71 +71 @@
   dataid_ = -1 ;
 
-  // OS endian 
-  int i = 1 ;
-  endian_ = -1 ;
-  if ( *reinterpret_cast<char *>(&i) == 1 ) {
-    endian_ = LITTLE_ENDIAN ;
-    os << LogIO::NORMAL << "LITTLE_ENDIAN " << LogIO::POST ;
-  }
-  else {
-    endian_ = BIG_ENDIAN ;
-    os << LogIO::NORMAL << "BIG_ENDIAN " << LogIO::POST ;
-  }
+  // endian matches
   same_ = -1 ;
 
@@ -353 +343 @@
 vector< vector<double> > NRODataset::getSpectrum()
 {
-  vector< vector<double> > spec;
+  vector< vector<double> > spec(rowNum_);
 
   for ( int i = 0 ; i < rowNum_ ; i++ ) {
-    spec.push_back( getSpectrum( i ) ) ;
+    spec[i] = getSpectrum( i ) ;
   }
 
@@ -370 +360 @@
   //
   // size of spectrum is not chmax_ but dataset_->getNCH() after binding
-  int nchan = NUMCH ;
-  vector<double> spec( chmax_, 0.0 ) ;  // spectrum "before" binding
+  const int nchan = NUMCH ;
   vector<double> bspec( nchan, 0.0 ) ;  // spectrum "after" binding
   // DEBUG
@@ -379 +368 @@
   NRODataRecord *record = getRecord( i ) ;
 
-  int bit = IBIT ;   // fixed to 12 bit
+  const int bit = IBIT ;   // fixed to 12 bit
   double scale = record->SFCTR ;
   // DEBUG
@@ -392 +381 @@
     return bspec ;
   }
-  char *cdata = record->LDATA ;
+  unsigned char *cdata = (unsigned char *)record->LDATA ;
   vector<double> mscale = MLTSCF ;
   double dscale = mscale[getIndex( i )] ;
@@ -400 +389 @@
   // char -> int
   vector<int> ispec( chmax_, 0 ) ;
-  union SharedMemory {
-    int ivalue ;
-    unsigned char cbuf[4] ;
-  } ;
-  SharedMemory u ;
+
+  static const int shift_right[] = {
+    4, 0
+  };
+  static const int start_pos[] = {
+    0, 1
+  };
+  static const int incr[] = {
+    0, 3
+  };
   int j = 0 ;
-  char ctmp = 0x00 ;
-  int sw = 0 ;
   for ( int i = 0 ; i < chmax_ ; i++ ) {
+    int ivalue = 0 ;
     if ( bit == 12 ) {  // 12 bit qunatization
-      u.ivalue = 0 ;
-
-      if ( endian_ == BIG_ENDIAN ) {
-        // big endian
-        if ( sw == 0 ) {
-          char c0 = (cdata[j] >> 4) & 0x0f ;
-          char c1 = ((cdata[j] << 4) & 0xf0) | ((cdata[j+1] >> 4) & 0x0f) ;
-          ctmp = cdata[j+1] & 0x0f ;
-          u.cbuf[2] = c0 ;
-          u.cbuf[3] = c1 ;
-          j += 2 ;
-          sw = 1 ;
-        }
-        else if ( sw == 1 ) {
-          u.cbuf[2] = ctmp ;
-          u.cbuf[3] = cdata[j] ;
-          j++ ;
-          sw = 0 ;
-        }
-      }
-      else if ( endian_ == LITTLE_ENDIAN ) {
-        // little endian
-        if ( sw == 0 ) {
-          char c0 = (cdata[j] >> 4) & 0x0f ;
-          char c1 = ((cdata[j] << 4) & 0xf0) | ((cdata[j+1] >> 4) & 0x0f) ;
-          ctmp = cdata[j+1] & 0x0f ;
-          u.cbuf[1] = c0 ;
-          u.cbuf[0] = c1 ;
-          j += 2 ;
-          sw = 1 ;
-        }
-        else if ( sw == 1 ) {
-          u.cbuf[1] = ctmp ;
-          u.cbuf[0] = cdata[j] ;
-          j++ ;
-          sw = 0 ;
-        }
-      }
-    }
-    
-    ispec[i] = u.ivalue ;
+      const int idx = j + start_pos[i & 1];
+      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 ) ) {
       //cerr << "NRODataset::getSpectrum()  ispec[" << i << "] is out of range" << endl ;
@@ -461 +420 @@
   }
 
+  double *const spec = new double[ chmax_ ] ;  // spectrum "before" binding
   // int -> double 
   for ( int i = 0 ; i < chmax_ ; i++ ) {
@@ -490 +450 @@
       bspec[i] = spec[i] ;
   }
+  delete[] spec;
 
   // DEBUG

trunk/external-alma/atnf/PKSIO/NRODataset.h

@@ -506 +506 @@
 
   // OS endian
-  int endian_ ;
   int same_ ;
 

trunk/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 )
+{
+  static const IPosition oneByOne( 1, 1 );
+
   // DEBUG
   //cout << "NROReader::getScanInfo()  irow = " << irow << endl ;
@@ -589 +591 @@
 
   // restfreq (for MOLECULE_ID)
-  Vector<Double> rf( IPosition( 1, 1 ) ) ;
-  rf( 0 ) = record->FREQ0 ;
-  restfreq = rf ;
+  restfreq.resize( oneByOne ) ;
+  restfreq[0] = record->FREQ0 ;
   //cout << "restfreq = " << rf << endl ;
 
@@ -617 +618 @@
   // spectra
   vector<double> spec = dataset_->getSpectrum( irow ) ;
-  Array<Float> sp( IPosition( 1, 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 ;
+  flagtra.resize( spectra.nelements() ) ;
+  flagtra.set( 0 ) ;
   //cout << "flag.size() = " << flag.size() << endl ;
 
   // tsys
-  Array<Float> tmp( IPosition( 1, 1 ), record->TSYS ) ;
-  tsys = tmp ;
+  tsys.resize( oneByOne ) ;
+  tsys[0] = record->TSYS ;
   //cout << "tsys[0] = " << tsys[0] << endl ;
 
@@ -693 +692 @@
 
   // propermotion
-  Array<Double> srcarr( IPosition( 1, 2 ) ) ;
-  srcarr = 0.0 ;
-  propermotion = srcarr ;
-  //cout << "propermotion = [" << propermotion[0] << ", " << propermotion[1] << "]" << endl ; 
+  // do nothing
 
   // srcdir
@@ -703 +699 @@
 
   // scanrate
-  Array<Double> sr( IPosition( 1, 1 ) ) ;
-  sr = 0.0 ;
-  scanrate = sr ;
-  //cout << "scanrate = " << scanrate[0] << endl ;
+  // do nothing
 
   return 0 ;

trunk/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