5 modified files
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/algorithms
diff -u -r1.1.1.1 -r1.2
--- ValidatorBase.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ ValidatorBase.java 1 Feb 2009 19:40:38 -0000 1.2
@@ -17,7 +17,7 @@
* Adapter class to simplify implementing {@link Validator} interface.
*
* @author D. Onoprienko
- * @version $Id: ValidatorBase.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: ValidatorBase.java,v 1.2 2009/02/01 19:40:38 onoprien Exp $
*/
public class ValidatorBase implements Validator {
@@ -86,7 +86,7 @@
_defMass = Double.parseDouble((String)value);
}
} else {
- throw new NoSuchParameterException(name, this.getClass());
+ throw new NoSuchParameterException(name);
}
} catch (ClassCastException x) {
throw new IllegalArgumentException(x);
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/cheat
diff -u -r1.1 -r1.2
--- RecoDefinition.java 24 Jan 2009 05:11:46 -0000 1.1
+++ RecoDefinition.java 1 Feb 2009 19:40:38 -0000 1.2
@@ -22,7 +22,7 @@
* the methods.
*
* @author D. Onoprienko
- * @version $Id: RecoDefinition.java,v 1.1 2009/01/24 05:11:46 onoprien Exp $
+ * @version $Id: RecoDefinition.java,v 1.2 2009/02/01 19:40:38 onoprien Exp $
*/
public class RecoDefinition implements IRecoDefinition {
@@ -103,7 +103,7 @@
}
}
} else {
- throw new NoSuchParameterException();
+ throw new NoSuchParameterException(name);
}
} catch (ClassCastException x) {
throw new IllegalArgumentException(x);
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/cheat
diff -u -r1.3 -r1.4
--- RecoDefinitionExtended.java 26 Jan 2009 05:29:59 -0000 1.3
+++ RecoDefinitionExtended.java 1 Feb 2009 19:40:38 -0000 1.4
@@ -24,7 +24,7 @@
* the methods.
*
* @author D. Onoprienko
- * @version $Id: RecoDefinitionExtended.java,v 1.3 2009/01/26 05:29:59 onoprien Exp $
+ * @version $Id: RecoDefinitionExtended.java,v 1.4 2009/02/01 19:40:38 onoprien Exp $
*/
public class RecoDefinitionExtended extends RecoDefinition {
@@ -106,7 +106,7 @@
for (Object o : values) _trackerHitListNames.add((String)o);
}
} else {
- throw new NoSuchParameterException();
+ throw new NoSuchParameterException(name);
}
} catch (ClassCastException x) {
throw new IllegalArgumentException(x);
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/infrastructure
diff -u -r1.1.1.1 -r1.2
--- CATSeed.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ CATSeed.java 1 Feb 2009 19:40:38 -0000 1.2
@@ -1,10 +1,14 @@
package org.lcsim.contrib.onoprien.crux.infrastructure;
+import java.util.*;
+
+import org.lcsim.event.MCParticle;
+
/**
* Stub to prevent build from failing.
*
* @author D. Onoprienko
- * @version $Id: CATSeed.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: CATSeed.java,v 1.2 2009/02/01 19:40:38 onoprien Exp $
*/
public class CATSeed {
@@ -12,7 +16,18 @@
public CATSeed() {
}
-
+
+// -- Getters : ---------------------------------------------------------------
+
+ /**
+ * Returns a list of <tt>MCParticles</tt> that contributed to this seed.
+ */
+ public ArrayList<MCParticle> getMCParticles() {
+ return _mcList;
+ }
+
// -- Private parts : ---------------------------------------------------------
+
+ ArrayList<MCParticle> _mcList = new ArrayList<MCParticle>(1);
}
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/infrastructure
diff -u -r1.4 -r1.5
--- CruxTrack.java 29 Jan 2009 20:35:39 -0000 1.4
+++ CruxTrack.java 1 Feb 2009 19:40:38 -0000 1.5
@@ -19,7 +19,7 @@
* Implementation of {@link ITrack} interface.
*
* @author D. Onoprienko
- * @version $Id: CruxTrack.java,v 1.4 2009/01/29 20:35:39 onoprien Exp $
+ * @version $Id: CruxTrack.java,v 1.5 2009/02/01 19:40:38 onoprien Exp $
*/
public class CruxTrack implements ITrack, Track {
@@ -42,7 +42,7 @@
private int _ndf;
private boolean _fitSuccess;
- private BField _bField;
+ private BField _bField = JobManager.defaultInstance().get(BField.class);
// -- Constructors : ----------------------------------------------------------
@@ -67,11 +67,6 @@
_ndf = 0;
_fitSuccess = true;
}
-
- /** Common initialization. */
- {
- _bField = JobManager.defaultInstance().get(BField.class);
- }
// -- Implementing org.lcsim.event.Track : ------------------------------------
@@ -193,7 +188,7 @@
Helix helix = fNode.node.getTrajectory();
Hep3Vector out = helix.getDirection(fNode.path);
if (out != null) {
- double p = BField.defaultInstance().getP(helix);
+ double p = _bField.getP(helix);
out = VecOp.mult(p,out);
}
return out;
CVSspam 0.2.8