Changeset 410 for trunk

Timestamp:

02/11/05 12:49:04 (20 years ago)

Author:

kil064

Message:

fix problems in average_time with output scan information being off by 1 scan !

File:

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

trunk/src/SDMath.cc

@@ -167 +167 @@
   ROScalarColumn<Double> intCol;
   ROArrayColumn<uInt> fqIDCol;
+  ROScalarColumn<Int> scanIDCol;
 
 // Create accumulation MaskedArray. We accumulate for each channel,if,pol,beam
@@ -252 +253 @@
      intCol.attach(tabIn, "INTERVAL");
      fqIDCol.attach(tabIn, "FREQID");
+     scanIDCol.attach(tabIn, "SCANID");
+
+// Find list of start/end rows for each scan
 
 // Loop over rows in Table
@@ -268 +272 @@
 // frequency setup and warn if averaging across them
 
-// Get copy of Scan Container for this row
-
-        SDContainer sc = in[iTab]->getSDContainer(iRow);
-        scanID = sc.scanid;
+        scanIDCol.getScalar(iRow, scanID);
 
 // Get quantities from columns
@@ -300 +301 @@
            normalize(sum, sumSq, nPts, wtType, asap::ChanAxis, nAxesSub);
 
+// Get ScanContainer for the first row of this averaged Scan
+
+           SDContainer scOut = in[iTab]->getSDContainer(rowStart);
+
 // Fill scan container. The source and freqID come from the
 // first row of the first table that went into this average (
@@ -305 +310 @@
 
            Float nR(nAccum);
-           fillSDC(sc, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
+           fillSDC(scOut, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
                     timeSum/nR, intSum, sourceNameStart, freqIDStart);
 
 // Write container out to Table
 
-           pTabOut->putSDContainer(sc);
+           pTabOut->putSDContainer(scOut);
 
 // Reset accumulators
@@ -351 +356 @@
 //
 // Normalize data in 'sum' accumulation array according to weighting scheme
+
   normalize(sum, sumSq, nPts, wtType, asap::ChanAxis, nAxesSub);
 
@@ -358 +364 @@
 
   Float nR(nAccum);
-  SDContainer sc = in[tableStart]->getSDContainer(rowStart);
-  fillSDC(sc, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
+  SDContainer scOut = in[tableStart]->getSDContainer(rowStart);
+  fillSDC(scOut, sum.getMask(), sum.getArray(), tSysSum/nR, outScanID,
            timeSum/nR, intSum, sourceNameStart, freqIDStart);
-  pTabOut->putSDContainer(sc);
+  pTabOut->putSDContainer(scOut);
   pTabOut->resetCursor();
 //