Changeset 14 for trunk

Timestamp:

06/24/04 16:05:19 (20 years ago)

Author:

mmarquar

Message:

I am now using ArrayIterators everywhere. This gives an ENORMOUS performance boost.

Location:

trunk/src

Files:

• SDContainer.cc (modified) (3 diffs)
• SDReader.cc (modified) (3 diffs)

trunk/src/SDContainer.cc

@@ -71 +71 @@
   aa1.reset(aa1.begin(whichIF));
   
-  uInt nChan = spec.nrow();
-  uInt nPol  = spec.ncolumn();
-  Vector<Float> pols(nPol);
-  uInt chani = 0;
-  uInt poli = 0;
+  //Vector<Float> pols(nPol);
+  ArrayAccessor<Float, Axis<0> > j(spec);
+  IPosition shp0 = spectrum_.shape();
+  IPosition shp1 = spec.shape();
+  if ( (shp0(2) != shp1(0)) || (shp0(3) != shp1(1)) ) {
+    cerr << "Arrays not conformant" << endl;      
+    return False;
+  }
+  //uInt chani = 0;
+  //uInt poli = 0;
   // assert dimensions are the same....
   for (ArrayAccessor<Float, Axis<2> > i(aa1);i != i.end(); ++i) {
-    pols = spec.row(chani);
+    //pols = spec.row(chani);    
+    ArrayAccessor<Float, Axis<1> > jj(j);
     for (ArrayAccessor<Float, Axis<3> > ii(i);ii != ii.end(); ++ii) {
-      (*ii) = pols[poli];
-      poli++;
+      //(*ii) = pols[poli];      
+      (*ii) = (*jj);
+      //poli++;
+      jj++;
     }
-    poli = 0;
-    chani++;
+    //poli = 0;
+    //chani++;
+    j++;
   }
   // unset flags for this spectrum, they might be set again by the
   // setFlags method
+
   IPosition shp = flags_.shape();
   IPosition start(4,whichBeam,whichIF,0,0);
@@ -103 +113 @@
   aa1.reset(aa1.begin(whichIF));
   
-  uInt nChan = flag.nrow();
-  uInt nPol  = flag.ncolumn();
-  Vector<uChar> pols(nPol);
-  uInt chani = 0;
-  uInt poli = 0;
+  ArrayAccessor<uChar, Axis<0> > j(flag);
+  IPosition shp0 = flags_.shape();
+  IPosition shp1 = flag.shape();
+  if ( (shp0(2) != shp1(0)) || (shp0(3) != shp1(1)) ) {
+    cerr << "Arrays not conformant" << endl;      
+    return False;
+  }
+
   // assert dimensions are the same....
   for (ArrayAccessor<uChar, Axis<2> > i(aa1);i != i.end(); ++i) {
-    pols = flag.row(chani);
+    ArrayAccessor<uChar, Axis<1> > jj(j);
     for (ArrayAccessor<uChar, Axis<3> > ii(i);ii != ii.end(); ++ii) {
-      (*ii) = uChar(pols[poli]);
-      poli++;
+      (*ii) = (*jj);
+      jj++;
     }
-    poli = 0;
-    chani++;
+    j++;
   }
 }
@@ -128 +140 @@
   // assert dimensions are the same....
   uInt idx = 0;
-  
+
+
   for (ArrayAccessor<Float, Axis<2> > i(aa1);i != i.end(); ++i) {    
     idx = 0;
+    ArrayAccessor<Float, Axis<0> > j(tsys);
     for (ArrayAccessor<Float, Axis<3> > ii(i);ii != ii.end(); ++ii) {
-      (*ii) = tsys[idx];
-      idx++;
+      (*ii) = (*j);
+      j++;
     }
   }

trunk/src/SDReader.cc

@@ -200 +200 @@
         // IFno beamNo are 1-relative
         // refPix = nChan/2+1 in  Integer arith.!
+        
         uInt refPix = header_.nchan/2+1; 
         //uInt frqslot = sdft.addFrequency(refPix, refFreq, freqInc);
@@ -219 +220 @@
 
         // cerr << "SDReader::read -  after SDContainer" << endl;
-
+        
       }
     }
@@ -225 +226 @@
       // insert container into table/list
       table_->putSDContainer(sc);
-      cout << "Reading integration " << seqi << endl;
+      //cout << "Reading integration " << seqi << endl;
       seqi++;// next in list
     }