Changeset 184 for trunk/src

Timestamp:

01/10/05 16:45:34 (20 years ago)

Author:

mar637

Message:

Bug fix: scanAv wasn't working properly, as 'nPts' wasn't rest after each scan.
Bug fix: scanid was not reflecting the case of across table quotients.

File:

• trunk/src/SDMath.cc (modified) (5 diffs)

trunk/src/SDMath.cc

@@ -274 +274 @@
            timeSum = 0.0;
            intSum = 0.0;
+           nPts = 0.0; // reset this too!!!
 
 // Increment
@@ -284 +285 @@
            oldScanID = scanID;
            outScanID += 1;               // Scan ID for next accumulation period
-        }
+
+}
 
 // Accumulate
@@ -294 +296 @@
        oldSourceName = sourceName;
        oldFreqID = freqID;
-    }
+     }
   }
 
@@ -303 +305 @@
 //
 // Normalize data in 'sum' accumulation array according to weighting scheme
-
   normalize (sum, sumSq, nPts, wtType, axis, nAxesSub);
 
@@ -382 +383 @@
 // Fill container for this row
 
-     SDContainer sc = on->getSDContainer();
+     SDContainer sc = on->getSDContainer(i);
 //
      putDataInSDC (sc, out, outflagsb);
      sc.putTsys(tsarr);
-     sc.scanid = 0;
+     sc.scanid = i;
 
 // Put new row in output Table