Commit in hps-java/src/main/java/org/lcsim/hps/users/phansson on MAIN | |||
WTrack.java | +5 | -4 | 1.2 -> 1.3 |
Add the HTF as member
diff -u -r1.2 -r1.3 --- WTrack.java 12 Oct 2012 05:54:07 -0000 1.2 +++ WTrack.java 16 Oct 2012 20:02:37 -0000 1.3 @@ -20,7 +20,7 @@
//public enum PARAM{P0X(0),P0Y(1),P0Z(2),E(3),X0(4),Y0(5),Z0(6);} public enum PARAM{TEST;} private double[] _parameters = new double[7];
- //HelicalTrackFit _canonical_track = null;
+ public HelicalTrackFit _htf = null;
double _bfield; double _bfield_constant;
@@ -29,14 +29,14 @@
public WTrack(double [] params, double bfield, int q) { _bfield = bfield; _q = q;
- _bfield_constant = Constants.fieldConversion*_bfield*_q;
+ _bfield_constant = -1*Constants.fieldConversion*_bfield*_q;
_parameters = params; } public WTrack(WTrack trk) { _bfield = trk._bfield; _q = trk.getCharge();
- _bfield_constant = Constants.fieldConversion*_bfield*_q;
+ _bfield_constant = -1*Constants.fieldConversion*_bfield*_q;
_parameters = trk.getParameters(); }
@@ -48,10 +48,11 @@
this.initWithTrack(track, bfield, flip); } public void initWithTrack(HelicalTrackFit track, double bfield, boolean flip) {
+ this._htf = track;
double signR = flip ? -1*Math.signum(track.R()): Math.signum(track.R()); _bfield = bfield; _q = (int) signR;
- _bfield_constant = Constants.fieldConversion*_bfield*_q;
+ _bfield_constant = -1*Constants.fieldConversion*_bfield*_q;
double a = _bfield_constant; double c = 1/(2*Math.abs(track.R())*signR); //note the different definition than in canonical track
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