Changeset 1255

Timestamp:

09/11/06 13:59:54 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #78 - auto_quotient was not handling the case where no closest in tiem was found. Added 0.5s width around min(delta_t)

File:

• tags/Release2.1.0b/src/STMath.cpp (modified) (2 diffs)

tags/Release2.1.0b/src/STMath.cpp

@@ -350 +350 @@
   TableRow row(tout);
   ROScalarColumn<Double> offtimeCol(offs, "TIME");
-
   ArrayColumn<Float> outspecCol(tout, "SPECTRA");
   ROArrayColumn<Float> outtsysCol(tout, "TSYS");
@@ -359 +358 @@
     ROScalarColumn<Double> offtimeCol(offs, "TIME");
     Double mindeltat = min(abs(offtimeCol.getColumn() - ontime));
-    Table sel = offs( abs(offs.col("TIME")-ontime) <= mindeltat
+    // Timestamp may vary within a cycle ???!!!
+    // increase this by 0.5 sec in case of rounding errors...
+    // There might be a better way to do this.
+    mindeltat += 0.5;
+    Table sel = offs( abs(offs.col("TIME")-ontime) <= (mindeltat+0.5)
                        && offs.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
                        && offs.col("IFNO") == Int(rec.asuInt("IFNO"))
                        && offs.col("POLNO") == Int(rec.asuInt("POLNO")) );
 
+    if ( sel.nrow() < 1 )  {
+      throw(AipsError("No closest in time found... This could be a rounding "
+                      "issue. Try quotient instead."));
+    }
     TableRow offrow(sel);
     const TableRecord& offrec = offrow.get(0);//should only be one row