Changeset 2643 for trunk/src

Timestamp:

08/24/12 10:52:04 (12 years ago)

Author:

ShinnosukeKawakami

Message:

hpc34 to trunk 24th Aug. 2012

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/FillerWrapper.h (modified) (1 prop)
• src/MSWriter.cpp (modified) (8 diffs)
• src/SConscript (modified) (1 prop)
• src/STMath.cpp (modified) (1 diff)

trunk/src/MSWriter.cpp

@@ -950 +950 @@
   {
     uInt nrow = potab.nrow() ;
-    potab.addRow( 1, True ) ;
+    potab.addRow() ;
 
     *poNumPolyRF = dir.ncolumn() - 1 ;
@@ -995 +995 @@
   {
     Int idx = -1 ;
-    uInt nEntry = ddEntry.nrow() ;
-    Vector<Int> key( 2 ) ;
-    key[0] = pid ;
-    key[1] = sid ;
+    uInt nItem = 2 ;
+    uInt len = ddEntry.nelements() ;
+    uInt nEntry = len / nItem ;
+    const Int *dd_p = ddEntry.storage() ;
     for ( uInt i = 0 ; i < nEntry ; i++ ) {
-      if ( allEQ( ddEntry.row(i), key ) ) {
+      Int pol = *dd_p ;
+      dd_p++ ;
+      Int spw = *dd_p ;
+      dd_p++ ;
+      if ( pid == pol && sid == spw ) {
         idx = i ;
         break ;
@@ -1016 +1020 @@
       idx = nrow ;
 
-      ddEntry.resize( nEntry+1, 2, True ) ;
-      ddEntry.row(nEntry) = key ;
+      ddEntry.resize( len+nItem ) ;
+      ddEntry[len] = pid ;
+      ddEntry[len+1] = sid ;
     }
 
@@ -1050 +1055 @@
       }
       processedFreqId[fid] = True ;
+    }
+    else {
+      return ;
     }
 
@@ -1085 +1093 @@
   {
     Int idx = -1 ;
-    uInt nEntry = feedEntry.nrow() ;
-    Vector<Int> key( 2 ) ;
-    key[0] = fid ;
-    key[1] = sid ;
+    uInt nItem = 2 ;
+    uInt len = feedEntry.nelements() ;
+    uInt nEntry = len / nItem ;
+    const Int *fe_p = feedEntry.storage() ;
     for ( uInt i = 0 ; i < nEntry ; i++ ) {
-      if ( allEQ( feedEntry.row(i), key ) ) {
+      Int feed = *fe_p ;
+      fe_p++ ;
+      Int spw = *fe_p ;
+      fe_p++ ;
+      if ( fid == feed && sid == spw ) {
         idx = i ;
         break ;
       }
     }
+
 
     if ( idx == -1 ) {
@@ -1131 +1144 @@
       tr.put( nrow ) ;
 
-      feedEntry.resize( nEntry+1, 2, True ) ;
-      feedEntry.row( nEntry ) = key ;
+      feedEntry.resize( len+nItem ) ;
+      feedEntry[len] = fid ;
+      feedEntry[len+1] = sid ;
     }
   }
@@ -1445 +1459 @@
 
   Vector<String> stateEntry;
-  Matrix<Int> ddEntry;
-  Matrix<Int> feedEntry;
+  Block<Int> ddEntry;
+  Block<Int> feedEntry;
   vector< Vector<Int> > polEntry;
   map<uInt,Bool> processedFreqId;
@@ -2052 +2066 @@
   //double endSec = mathutil::gettimeofday_sec() ;
   //os_ << "end MSWriter::write() endSec=" << endSec << " (" << endSec-startSec << "sec)" << LogIO::POST ;
+
+  os_ << "Exported data as MS" << LogIO::POST ;
 
   return True ;

trunk/src/STMath.cpp

@@ -2503 +2503 @@
     ArrayColumn<Float> specCol(tab, "SPECTRA");
     ArrayColumn<uChar> flagCol(tab, "FLAGTRA");
-    Vector<Float> tmpspec; specCol.get(0, tmpspec);
-    uInt nchan = tmpspec.nelements();
+    Vector<Float> spec = specCol( 0 );
+    uInt nchan = spec.nelements();
     Vector<Float> kvec = VectorKernel::make(type, width, nchan, True, False);
     Convolver<Float> conv(kvec, IPosition(1,nchan));
-    Vector<Float> spec;
     Vector<uChar> flag;
+    Vector<Bool> mask(nchan);
     for ( uInt i=0; i<tab.nrow(); ++i) {
       specCol.get(i, spec);
       flagCol.get(i, flag);
-      Vector<Bool> mask(flag.nelements());
       convertArray(mask, flag);
       Vector<Float> specout;