Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/swim on MAIN
BField.java+2-21.3 -> 1.4
Helix.java+2-21.2 -> 1.3
ParVector.java+14-11.2 -> 1.3
+18-5
3 modified files
Minor fixes and improvements

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/swim
BField.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- BField.java	27 Jan 2009 20:48:53 -0000	1.3
+++ BField.java	29 Jan 2009 20:35:41 -0000	1.4
@@ -13,7 +13,7 @@
  * geometrical trajectory parameters into particle momentum.
  *
  * @author D. Onoprienko
- * @version $Id: BField.java,v 1.3 2009/01/27 20:48:53 onoprien Exp $
+ * @version $Id: BField.java,v 1.4 2009/01/29 20:35:41 onoprien Exp $
  */
 public class BField implements JobEventListener {
   
@@ -26,7 +26,7 @@
   /** Initialization - called by the framework. */
   public void detectorChanged(JobEvent jobEvent) {
     _bField = jobEvent.getDetector().getFieldMap().getField(ConstHep3Vector.V000).z();
-    _c2p = 0.299792458 * (_bField * Units.Tesla);
+    _c2p = 0.000299792458 * _bField;
   }
   
   /** Returns default instance of <tt>BField</tt>. */

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/swim
Helix.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Helix.java	22 Jan 2009 21:01:58 -0000	1.2
+++ Helix.java	29 Jan 2009 20:35:41 -0000	1.3
@@ -9,7 +9,7 @@
  * Helical {@link Trajectory} with its axis parallel to Z.
  *
  * @author D. Onoprienko
- * @version $Id: Helix.java,v 1.2 2009/01/22 21:01:58 onoprien Exp $
+ * @version $Id: Helix.java,v 1.3 2009/01/29 20:35:41 onoprien Exp $
  */
 public class Helix extends AbstractTrajectory {
   
@@ -81,7 +81,7 @@
     }
     double mag = direction.magnitude();
     _dir = new ConstHep3Vector(direction.x()/mag, direction.y()/mag, direction.z()/mag);
-    _c = curvature;
+    _c = curvature;
 
     _ro = Math.hypot(_dir.x(), _dir.y()) * _c;
   }

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/util/swim
ParVector.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- ParVector.java	22 Jan 2009 21:01:58 -0000	1.2
+++ ParVector.java	29 Jan 2009 20:35:41 -0000	1.3
@@ -7,7 +7,7 @@
  * described in {@link Helix.CRep} and {@link Helix.WRep} representations).
  *
  * @author D. Onoprienko
- * @version $Id: ParVector.java,v 1.2 2009/01/22 21:01:58 onoprien Exp $
+ * @version $Id: ParVector.java,v 1.3 2009/01/29 20:35:41 onoprien Exp $
  */
 public class ParVector<T extends Enum<T>> {
   
@@ -58,6 +58,19 @@
   public void set(T parameter, double value) {
     _pars[parameter.ordinal()] = value;
   }
+
+// -- Other methods :  ---------------------------------------------------------
+
+  public String toString() {
+    String out = _rep.getSimpleName() + " : ";
+    try {
+      T[] values = (T[]) _rep.getMethod("values").invoke(null);
+      for (T par : values) {
+        out += "  "+ par +" = "+ _pars[par.ordinal()];
+      }
+    } catch (Exception x) {throw new RuntimeException(x);}
+    return out;
+  }
   
 // -- Private parts :  ---------------------------------------------------------
   
CVSspam 0.2.8