Changeset 247 for trunk/src

Timestamp:

01/21/05 15:09:39 (20 years ago)

Author:

kil064

Message:

fix error in nRow test in function quotient

File:

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

trunk/src/SDMath.cc

@@ -374 +374 @@
   const uInt nRowOff = off->nRow();
   Bool ok = (nRowOff==1&&nRowOn>0) ||
-            (nRowOn>0&&nRowOn==nRowOff);
+            (nRowOff>=1&&nRowOn==nRowOff);
   if (!ok) {
      throw (AipsError("The reference Scan Table can have one row or the same number of rows as the source Scan Table"));
@@ -402 +402 @@
      MaskedArray<Float> mOn(on->rowAsMaskedArray(i));
      IPosition shpOn = mOn.shape(); 
+     tSysOn.get(i, tSysOnArr);
 //
      if (nRowOff>1) {
@@ -407 +408 @@
         pMOff = new MaskedArray<Float>(off->rowAsMaskedArray(i));
         shpOff = pMOff->shape();
-        if (!shpOn.isEqual(shpOff)) {
-           throw(AipsError("on/off data are not conformant"));
-        }
-//
         tSysOff.get(i, tSysOffArr);
-        tSysOn.get(i, tSysOnArr);
-        if (!tSysOnArr.shape().isEqual(tSysOffArr.shape())) {
-           throw(AipsError("on/off Tsys data are not conformant"));
-        }
-//
-        if (!shpOn.isEqual(tSysOnArr.shape())) {
-           throw(AipsError("Correlation and Tsys data are not conformant"));
-        }
+     }
+
+// Conformance
+
+     if (!shpOn.isEqual(shpOff)) {
+        throw(AipsError("on/off data are not conformant"));
+     }
+     if (!tSysOnArr.shape().isEqual(tSysOffArr.shape())) {
+        throw(AipsError("on/off Tsys data are not conformant"));
+     }
+     if (!shpOn.isEqual(tSysOnArr.shape())) {
+        throw(AipsError("Correlation and Tsys data are not conformant"));
      }