Changeset 2317

Timestamp:

09/29/11 17:11:53 (13 years ago)

Author:

Malte Marquarding

Message:

Ticket #250: make averageChannel work as previously for multibeam data

File:

• trunk/src/STMath.cpp (modified) (5 diffs)

trunk/src/STMath.cpp

@@ -396 +396 @@
     vector< Vector<Double> > dirs ;
     vector<int> indexes ;
+    // Handle MX mode averaging
+    if (in->nbeam() > 1 ) {      
+      length = 1;
+    }
     for ( Int i = 0 ; i < length ; i++ ) {
       Vector<Double> t = dircol(i).getAngle(Unit(String("rad"))).getValue() ;
@@ -419 +423 @@
     for ( uInt i = 0 ; i < rowNum ; i++ ) {
       TableCopy::copyRows(tout, subt, outrowCount+i, indexes[i], 1) ;
+      // Handle MX mode averaging
       if ( avmode != "SCAN") {
-        //scanColOut.put(outrowCount+i, uInt(0));
+        scanColOut.put(outrowCount+i, uInt(0));
       }
     }
@@ -426 +431 @@
     dircolOut.attach( tout, "DIRECTION" ) ;
     for ( uInt irow = 0 ; irow < rowNum ; irow++ ) {
-      Vector<Double> t = dircolOut(outrowCount+irow).getAngle(Unit(String("rad"))).getValue() ;
+      Vector<Double> t = \
+        dircolOut(outrowCount+irow).getAngle(Unit(String("rad"))).getValue() ;
       Vector<Float> tmp;
       specCol.get(0, tmp);
@@ -435 +441 @@
       // mask spectra for different DIRECTION
       for ( uInt jrow = 0 ; jrow < subt.nrow() ; jrow++ ) {
-        Vector<Double> direction = dircol(jrow).getAngle(Unit(String("rad"))).getValue() ;
+        Vector<Double> direction = \
+          dircol(jrow).getAngle(Unit(String("rad"))).getValue() ;
         //if ( t[0] != direction[0] || t[1] != direction[1] ) {
         Double dx = t[0] - direction[0] ;
@@ -441 +448 @@
         Double dd = sqrt( dx * dx + dy * dy ) ;
         //if ( !allNearAbs( t, direction, tol ) ) {
-        if ( dd > tol ) {
+        if ( dd > tol &&  in->nbeam() < 2 ) {
           flags[jrow] = userflag ;
         }