Commit in lcsim/src/org/lcsim/mc/fast/tracking on MAIN | |||
ReconTrack.java | +7 | -2 | 1.11 -> 1.12 |
fix/FastMCTrack.java | +9 | -2 | 1.2 -> 1.3 |
+16 | -4 |
Added calculation of track states
diff -u -r1.11 -r1.12 --- ReconTrack.java 18 Jun 2012 23:02:14 -0000 1.11 +++ ReconTrack.java 26 Jul 2012 16:46:14 -0000 1.12 @@ -7,8 +7,10 @@
import hep.physics.vec.Hep3Vector; import org.lcsim.event.Track; import org.lcsim.event.TrackState;
+import org.lcsim.event.base.BaseTrackState;
import java.io.*;
+import java.util.ArrayList;
import java.util.Collections; import java.util.List; import java.util.Random;
@@ -21,7 +23,7 @@
* are provided. <br> * * @author Tony Johnson, Wolfgang Walkowiak
- * @version $Id: ReconTrack.java,v 1.11 2012/06/18 23:02:14 jeremy Exp $
+ * @version $Id: ReconTrack.java,v 1.12 2012/07/26 16:46:14 grefe Exp $
*/ public class ReconTrack implements Track {
@@ -44,6 +46,7 @@
transient private Particle mc; private int m_tcharge; private double[] _refpoint = {0,0,0};
+ private List<TrackState> _trackStates;
ReconTrack(double bField, TrackResolutionTables parm, SimpleTables SmTbl, Random rand, Particle mc, boolean hist, boolean simple) {
@@ -97,6 +100,8 @@
aida.cloud1D("zNew").fill(m_smear.getZ0()); } m_tcharge = (int) (m_smear.getUnitCharge() * Math.abs(mc.getType().getCharge()));
+ _trackStates = new ArrayList<TrackState>(); + _trackStates.add(new BaseTrackState(m_smear.getTrackParameters(), bField));
} /**
@@ -564,6 +569,6 @@
public List<TrackState> getTrackStates() {
- return null;
+ return _trackStates;
} }
\ No newline at end of file
diff -u -r1.2 -r1.3 --- FastMCTrack.java 18 Jun 2012 23:02:14 -0000 1.2 +++ FastMCTrack.java 26 Jul 2012 16:46:14 -0000 1.3 @@ -1,5 +1,5 @@
/**
- * @version $Id: FastMCTrack.java,v 1.2 2012/06/18 23:02:14 jeremy Exp $
+ * @version $Id: FastMCTrack.java,v 1.3 2012/07/26 16:46:14 grefe Exp $
*/ package org.lcsim.mc.fast.tracking.fix;
@@ -7,6 +7,7 @@
import hep.physics.matrix.SymmetricMatrix; import hep.physics.vec.Hep3Vector;
+import java.util.ArrayList;
import java.util.List; import org.lcsim.event.LCIOParameters;
@@ -15,6 +16,7 @@
import org.lcsim.event.TrackState; import org.lcsim.event.TrackerHit; import org.lcsim.event.LCIOParameters.ParameterName;
+import org.lcsim.event.base.BaseTrackState;
import org.lcsim.spacegeom.CartesianPoint; import org.lcsim.spacegeom.CartesianVector; import org.lcsim.spacegeom.SpacePoint;
@@ -33,12 +35,15 @@
protected SpacePoint _referencePoint; protected int _charge; protected MCParticle _particle = null;
+ protected List<TrackState> _trackStates;
protected FastMCTrack(SpacePoint refPoint, LCIOParameters parameters, SymmetricMatrix errorMatrix, int charge) { _referencePoint = refPoint; _parameters = parameters; _charge = charge; _errorMatrix = errorMatrix;
+ _trackStates = new ArrayList<TrackState>(); + _trackStates.add(new BaseTrackState(parameters.getValues(), errorMatrix.asPackedArray(true), refPoint.v(), 0));
} protected FastMCTrack(SpacePoint refPoint, LCIOParameters parameters, SymmetricMatrix errorMatrix, int charge, MCParticle part) {
@@ -53,6 +58,8 @@
_errorMatrix = t.getErrorMatrix(); _referencePoint = new CartesianPoint(t.getReferencePoint()); _charge = t.getCharge();
+ _trackStates = new ArrayList<TrackState>(); + _trackStates.add(new BaseTrackState(_parameters.getValues(), _errorMatrix.asPackedArray(true), _referencePoint.v(), 0));
} public boolean fitSuccess() {
@@ -191,6 +198,6 @@
public List<TrackState> getTrackStates() {
- return null;
+ return _trackStates;
} }
\ No newline at end of file
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1