Changeset 536 for trunk

Timestamp:

03/08/05 11:36:26 (20 years ago)

Author:

kil064

Message:

add 'TINTSYS' weighting to averageTime

Location:

trunk/src

Files:

• SDMath.cc (modified) (5 diffs)
• SDMath.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -267 +267 @@
      scanIDCol.attach(tabIn, "SCANID");
 
-// Find list of start/end rows for each scan
-
 // Loop over rows in Table
 
@@ -1833 +1831 @@
          itMask.next();
       }
-   } else if (wtType==TSYS) {
+   } else if (wtType==TSYS || wtType==TINTSYS) {
 
 // We are going to average the data, weighted by 1/Tsys**2 for each pol, beam and IF.
@@ -1843 +1841 @@
       VectorIterator<Float> itData(valuesIn, axis);
       ReadOnlyVectorIterator<Float> itTSys(tSys, axis);
+      IPosition pos(nAxesSub,0);  
+//
       Float fac = 1.0;
-      IPosition pos(nAxesSub,0);  
-//
+      if (wtType==TINTSYS) fac *= interval;
       while (!itData.pastEnd()) {
          Float t = itTSys.vector()[0];
-         fac = 1.0/t/t;
+         fac *= 1.0/t/t;
 
 // Scale data
@@ -1915 +1914 @@
          itData.next();
       }
-   } else if (wtType==TSYS) {
+   } else if (wtType==TSYS || wtType==TINTSYS) {
    
-// Normalize each spectrum by sum(1/Tsys**2) where the pseudo
+// Normalize each spectrum by sum(1/Tsys**2) (TSYS) or
+// sum(Tint/Tsys**2) (TINTSYS) where the pseudo
 // replication over channel for Tsys has been dropped.
 
@@ -1974 +1974 @@
      wtType = VAR;
      msg = String("Weighting type selected : Variance");
+  } else if (tStr.contains(String("TINTSYS"))) {
+       wtType = TINTSYS;
+       msg = String("Weighting type selected : Tint&Tsys");
   } else if (tStr.contains(String("TINT"))) {
      wtType = TINT;

trunk/src/SDMath.h

@@ -136 +136 @@
 // Weighting type for time averaging
 
-  enum WeightType {NONE,VAR,TSYS,TINT};
+  enum WeightType {NONE=0,VAR,TSYS,TINT,TINTSYS,nWeightTypes};
 
 // Function to use accumulate data during time averaging