Skip to content

Jna dev #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbutti merged 2 commits into from
Feb 18, 2021
Merged

Jna dev #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b513e
Support for alignment using Kalman Tracks
pbutti Feb 17, 2021
c717de2
Fix conflicts
pbutti Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,15 @@ public Pair<double[], SymmetricMatrix> getCorrectedPerigeeParameters(HelicalTrac

// Get the jacobian
// Calculate the updated covariance
Matrix jacobian = GblUtils.getCLToPerigeeJacobian(helicalTrackFit, helicalTrackFitCorrected, bfield);

Matrix jacobian = null;
try {
jacobian = GblUtils.getCLToPerigeeJacobian(helicalTrackFit, helicalTrackFitCorrected, bfield);
}
catch (RuntimeException e) {
return null;
}

Matrix helixCovariance = jacobian.times(locCov.times(jacobian.transpose()));
SymmetricMatrix cov = new SymmetricMatrix(5);
for (int i = 0; i < 5; i++) {
Expand Down Expand Up @@ -339,7 +347,15 @@ public Pair<double[], SymmetricMatrix> getCorrectedPerigeeParameters(HelicalTrac
//System.out.printf("params at IP: d0 %f z0 %f \n \n", helicalTrackFitAtIPCorrected.dca(), helicalTrackFitAtIPCorrected.z0());

// Calculate the updated covariance
Matrix jacobian = GblUtils.getCLToPerigeeJacobian(helicalTrackFit, helicalTrackFitAtIPCorrected, bfield);
Matrix jacobian = null;

try {
jacobian = GblUtils.getCLToPerigeeJacobian(helicalTrackFit, helicalTrackFitAtIPCorrected, bfield);
}
catch (RuntimeException e) {
return null;
}

Matrix helixCovariance = jacobian.times(locCov.times(jacobian.transpose()));
SymmetricMatrix cov = new SymmetricMatrix(5);
for (int i = 0; i < 5; i++) {
Expand Down
71 changes: 55 additions & 16 deletions tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutputDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class GBLOutputDriver extends Driver {
private AIDA aidaGBL; // era public
private String outputPlots = "GBLplots_ali.root";
private String trackCollectionName = "GBLTracks";
private String trackResidualsRelColName = "TrackResidualsGBLRelations";
private List<HpsSiSensor> sensors = new ArrayList<HpsSiSensor>();
private double bfield;
public boolean debug = false;
Expand All @@ -64,8 +65,9 @@ public class GBLOutputDriver extends Driver {
String trkpDetailFolder="/trk_detail/";
String resFolder="/res/";
String hitFolder="/hit/";
private boolean b_doGBLkinks = true;
private boolean b_doDetailPlots = false;
private boolean b_doGBLkinks = true;
private boolean b_doGBLresiduals = true;
private boolean b_doDetailPlots = false;

//This should be moved to the GBL Refitter!!!
//The field map for extrapolation
Expand All @@ -82,6 +84,18 @@ public void setBsZ (double input) {
bsZ = input;
}

public void setDoGBLresiduals (boolean input) {
b_doGBLresiduals = input;
}

public void setDoGBLkinks (boolean input) {
b_doGBLkinks = input;
}

public void setTrackResidualsRelColName (String val) {
trackResidualsRelColName = val;
}

public void setChi2Cut(double input) {
chi2Cut = input;
}
Expand Down Expand Up @@ -121,14 +135,14 @@ protected void detectorChanged(Detector detector) {
public void process(EventHeader event) {
List<Track> tracks = event.get(Track.class, trackCollectionName);

RelationalTable trackMatchTable = null;
trackMatchTable = new BaseRelationalTable(RelationalTable.Mode.ONE_TO_ONE, RelationalTable.Weighting.UNWEIGHTED);
List<LCRelation> trackMatchRelation = event.get(LCRelation.class, "MatchedToGBLTrackRelations");
for (LCRelation relation : trackMatchRelation) {
if (relation != null && relation.getFrom() != null && relation.getTo() != null) {
trackMatchTable.add(relation.getFrom(), relation.getTo());
}
}
//RelationalTable trackMatchTable = null;
//trackMatchTable = new BaseRelationalTable(RelationalTable.Mode.ONE_TO_ONE, RelationalTable.Weighting.UNWEIGHTED);
//List<LCRelation> trackMatchRelation = event.get(LCRelation.class, "MatchedToGBLTrackRelations");
//for (LCRelation relation : trackMatchRelation) {
// if (relation != null && relation.getFrom() != null && relation.getTo() != null) {
// trackMatchTable.add(relation.getFrom(), relation.getTo());
// }
//}

RelationalTable hitToStrips = TrackUtils.getHitToStripsTable(event);
RelationalTable hitToRotated = TrackUtils.getHitToRotatedTable(event);
Expand All @@ -137,7 +151,7 @@ public void process(EventHeader event) {
if (trk.getChi2() > chi2Cut)
continue;
GenericObject gblKink = GBLKinkData.getKinkData(event, trk);
Track matchedTrack = (Track) trackMatchTable.from(trk);
//Track matchedTrack = (Track) trackMatchTable.from(trk);
Map<HpsSiSensor, TrackerHit> sensorHits = new HashMap<HpsSiSensor, TrackerHit>();
Map<HpsSiSensor, Integer> sensorNums = new HashMap<HpsSiSensor, Integer>();
List<TrackerHit> hitsOnTrack = TrackUtils.getStripHits(trk, hitToStrips, hitToRotated);
Expand All @@ -157,8 +171,32 @@ public void process(EventHeader event) {
i++;

}


//THIS IS TEMPORARY AND NEEDED FOR FIXING THE LOOP ON THE SENSORS ON TRACK FOR KALMAN TRACKS

if (hitsOnTrack.size() == 0) {
for (TrackerHit hit : trk.getTrackerHits()) {
HpsSiSensor sensor = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement());
if (sensor != null) {
sensorHits.put(sensor, hit);
sensorNums.put(sensor, i);
if (debug)
System.out.printf("adding sensor %d \n", i);
}

if (debug && sensor == null)
System.out.printf("TrackerHit null sensor %s \n", hit.toString());
i++;

}

}

doBasicGBLtrack(trk,sensorHits);
doGBLresiduals(trk, sensorHits,event);
if (b_doGBLresiduals)
doGBLresiduals(trk, sensorHits,event);

//doMTresiduals(matchedTrack, sensorHits);
if (b_doGBLkinks)
doGBLkinks(trk,gblKink, sensorNums);
Expand Down Expand Up @@ -446,9 +484,9 @@ private void doGBLresiduals(Track trk, Map<HpsSiSensor, TrackerHit> sensorHits,
}//loop on sensor hits

RelationalTable trackResidualsTable = null;
if (event.hasCollection(LCRelation.class, "TrackResidualsGBLRelations")) {
if (event.hasCollection(LCRelation.class, trackResidualsRelColName)) {
trackResidualsTable = new BaseRelationalTable(RelationalTable.Mode.ONE_TO_ONE, RelationalTable.Weighting.UNWEIGHTED);
List<LCRelation> trackresRelation = event.get(LCRelation.class, "TrackResidualsGBLRelations");
List<LCRelation> trackresRelation = event.get(LCRelation.class, trackResidualsRelColName);
for (LCRelation relation : trackresRelation) {
if (relation != null && relation.getFrom() != null && relation.getTo() != null) {
trackResidualsTable.add(relation.getFrom(), relation.getTo());
Expand Down Expand Up @@ -477,10 +515,11 @@ private void doGBLresiduals(Track trk, Map<HpsSiSensor, TrackerHit> sensorHits,
//get the bias first
for (int i_hit =0; i_hit <= nres-1 ; i_hit+=2) {
if (trackRes.getIntVal(i_hit)!=-999) {
//System.out.println("PF::DEBUG:: "+ trackCollectionName+ " trackRes.getIntVal(i_hit) " + trackRes.getIntVal(i_hit));
String sensorName = (sensorMPIDs.get(trackRes.getIntVal(i_hit))).getName();
if (debug) {
System.out.printf("NHits %d MPID sensor:%d %s %d\n", nres,trackRes.getIntVal(i_hit), sensorName,i_hit);
System.out.printf("Track residuals: %s %.5f %.5f\n",sensorName, trackRes.getDoubleVal(i_hit),trackRes.getFloatVal(i_hit));
//System.out.printf("NHits %d MPID sensor:%d %s %d\n", nres,trackRes.getIntVal(i_hit), sensorName,i_hit);
//System.out.printf("Track residuals: %s %.5f %.5f\n",sensorName, trackRes.getDoubleVal(i_hit),trackRes.getFloatVal(i_hit));
}
//General residuals Per volume
aidaGBL.histogram1D(resFolder+"bresidual_GBL"+vol).fill(trackRes.getDoubleVal(i_hit));
Expand Down
10 changes: 10 additions & 0 deletions tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ public static Pair<Track, GBLKinkData> makeCorrectedTrack(FittedGblTrajectory fi

// Set state at IP
Pair<double[], SymmetricMatrix> correctedHelixParams = fittedGblTrajectory.getCorrectedPerigeeParameters(helicalTrackFit, FittedGblTrajectory.GBLPOINT.IP, bfield);

if (correctedHelixParams == null) {
return null;
}


trk.setTrackParameters(correctedHelixParams.getFirst(), bfield);// hack to set the track charge
trk.getTrackStates().clear();
TrackState stateIP = new BaseTrackState(correctedHelixParams.getFirst(), ref, correctedHelixParams.getSecond().asPackedArray(true), TrackState.AtIP, bfield);
Expand Down Expand Up @@ -190,6 +196,10 @@ public static Pair<Pair<Track, GBLKinkData>, FittedGblTrajectory> refitTrackWith
if(fit==null) return null;
for (int i = 0; i < nIterations; i++) {
Pair<Track, GBLKinkData> newTrack = makeCorrectedTrack(fit, helix, allHthList, trackType, bfield);

if (newTrack == null)
return null;

helix = TrackUtils.getHTF(newTrack.getFirst());
fit = doGBLFit(helix, sortedStripHits, scattering, bfield, 0,includeMS);
if (fit == null)
Expand Down
Loading