Changeset 1320 for branches/Release2.1.2/src/STMath.cpp

Timestamp:

03/02/07 11:02:27 (17 years ago)

Author:

mar637

Message:

merge from trunk, to get most recent bug fixes

File:

• branches/Release2.1.2/src/STMath.cpp (modified) (3 diffs)

branches/Release2.1.2/src/STMath.cpp

@@ -167 +167 @@
         Vector<Bool> bflag(flag.shape());
         convertArray(bflag, flag);
+        /*
         if ( allEQ(bflag, True) ) {
-          continue;//don't accumulate
+        continue;//don't accumulate
         }
+        */
         specCol.get(k, spec);
         tsysCol.get(k, tsys);
@@ -904 +906 @@
     scaleByVector(tab,factors, false);
   } else if ( etaap > 0.0) {
-    Instrument inst =
-      STAttr::convertInstrument(tab.keywordSet().asString("AntennaName"), True);
-    STAttr sda;
-    if (d < 0) d = sda.diameter(inst);
+    if (d < 0) {
+      Instrument inst =
+        STAttr::convertInstrument(tab.keywordSet().asString("AntennaName"), 
+                                  True);
+      STAttr sda;
+      d = sda.diameter(inst);
+    }
     jyperk = STAttr::findJyPerK(etaap, d);
     ostringstream oss;
@@ -976 +981 @@
   for ( uInt i=0; i<tab.nrow(); ++i) {
     Float zdist = Float(C::pi_2) - elev(i);
-    Float factor = exp(tau)/cos(zdist);
+    Float factor = exp(tau/cos(zdist));
     MaskedArray<Float> ma = maskedArray(specCol(i), flagCol(i));
     ma *= factor;