Author: [log in to unmask]
Date: Tue Sep 8 16:45:15 2015
New Revision: 3557
Log:
now everything is fine
Modified:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java Tue Sep 8 16:45:15 2015
@@ -10,7 +10,7 @@
*/
public class FittedGblTrajectory {
public static enum GBLPARIDX {
- QOVERP(0),XTPRIME(1),YTPRIME(2),XT(3),YT(4);
+ QOVERP(0),YTPRIME(1),XTPRIME(2),XT(3),YT(4);
private int _value;
private GBLPARIDX(int value) {
_value = value;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java Tue Sep 8 16:45:15 2015
@@ -908,35 +908,35 @@
double qOverP = q / htf.p(Math.abs(B));
double phi = htf.phi0();
- _params.setElement(0, 0, qOverP);
- _params.setElement(0, 1, lambda);
- _params.setElement(0, 2, phi);
- _params.setElement(0, 3, xT);
- _params.setElement(0, 4, yT);
+ _params.setElement(0, FittedGblTrajectory.GBLPARIDX.QOVERP.getValue(), qOverP);
+ _params.setElement(0, FittedGblTrajectory.GBLPARIDX.YTPRIME.getValue(), lambda);
+ _params.setElement(0, FittedGblTrajectory.GBLPARIDX.XTPRIME.getValue(), phi);
+ _params.setElement(0, FittedGblTrajectory.GBLPARIDX.XT.getValue(), xT);
+ _params.setElement(0, FittedGblTrajectory.GBLPARIDX.YT.getValue(), yT);
}
public BasicMatrix getParams() {
return _params;
}
+ double getQoverP() {
+ return _params.e(0, FittedGblTrajectory.GBLPARIDX.QOVERP.getValue());
+ }
+
double getLambda() {
- return _params.e(0, 1);
- }
-
- double getQoverP() {
- return _params.e(0, 0);
+ return _params.e(0, FittedGblTrajectory.GBLPARIDX.YTPRIME.getValue());
}
double getPhi() {
- return _params.e(0, 2);
+ return _params.e(0, FittedGblTrajectory.GBLPARIDX.XTPRIME.getValue());
}
double getXt() {
- return _params.e(0, 3);
+ return _params.e(0, FittedGblTrajectory.GBLPARIDX.XT.getValue());
}
double getYt() {
- return _params.e(0, 4);
+ return _params.e(0, FittedGblTrajectory.GBLPARIDX.YT.getValue());
}
}
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java Tue Sep 8 16:45:15 2015
@@ -5,12 +5,10 @@
import hep.physics.vec.Hep3Matrix;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
-
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-
import org.apache.commons.math3.util.Pair;
import org.hps.recon.tracking.StrategyType;
import org.hps.recon.tracking.TrackType;
@@ -22,6 +20,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
+import org.lcsim.event.base.BaseTrack;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.fit.helicaltrack.HelixUtils;
@@ -88,8 +87,8 @@
SeedTrack seedTrack = (SeedTrack) fittedTraj.get_seed();
SeedCandidate trackseed = seedTrack.getSeedCandidate();
- // Create a new SeedTrack (SeedTrack extends BaseTrack)
- SeedTrack trk = new SeedTrack();
+ // Create a new BaeTrack
+ BaseTrack trk = new BaseTrack();
// Add the hits to the track
for (HelicalTrackHit hit : trackseed.getHits()) {
@@ -110,10 +109,10 @@
trk.setRefPointIsDCA(true);
// Set the strategy used to find this track
- trk.setStratetgy(trackseed.getSeedStrategy());
+// trk.setStratetgy(trackseed.getSeedStrategy());
// Set the SeedCandidate this track is based on
- trk.setSeedCandidate(trackseed);
+// trk.setSeedCandidate(trackseed);
// Add the GBL flag to the track type.
trk.setTrackType(TrackType.setGBL(seedTrack.getType(), true));
@@ -121,7 +120,7 @@
// Check the track - hook for plugging in external constraint
//if ((_trackCheck != null) && (! _trackCheck.checkTrack(trk))) continue;
// Add the track to the list of tracks
- tracks.add((Track) trk);
+ tracks.add(trk);
logger.info(String.format("helix chi2 %f ndf %d gbl chi2 %f ndf %d\n", helix.chisqtot(), helix.ndf()[0] + helix.ndf()[1], trk.getChi2(), trk.getNDF()));
if (logger.getLevel().intValue() <= Level.INFO.intValue()) {
for (int i = 0; i < 5; ++i) {
