Changeset 1321 for trunk/src

Timestamp:

03/06/07 14:30:28 (18 years ago)

Author:

mar637

Message:

Hopefully final fix to ticket #78;had to do a sub selection of BEAMNO,IFNO,POLNO fisrt, and also TIME column is MJD, which is in datys not seconds.

File:

• trunk/src/STMath.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -406 +406 @@
     const TableRecord& rec = row.get(i);
     Double ontime = rec.asDouble("TIME");
-    ROScalarColumn<Double> offtimeCol(offs, "TIME");
+    Table presel = offs(offs.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))
+                        && offs.col("IFNO") == Int(rec.asuInt("IFNO"))
+                        && offs.col("POLNO") == Int(rec.asuInt("POLNO")) );
+    ROScalarColumn<Double> offtimeCol(presel, "TIME");
+
     Double mindeltat = min(abs(offtimeCol.getColumn() - ontime));
     // Timestamp may vary within a cycle ???!!!
-    // increase this by 0.5 sec in case of rounding errors...
+    // increase this by 0.01 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")) );
+    // fix to this fix. TIME is MJD, so 1.0d not 1.0s
+    mindeltat += 0.01/24./60./60.;
+    Table sel = presel( abs(presel.col("TIME")-ontime) <= mindeltat);
 
     if ( sel.nrow() < 1 )  {