Skip to content

Jna dev #786

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 10 commits into from
Feb 18, 2021
Merged

Jna dev #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1048e28
Update to alignment code
pbutti Sep 23, 2020
88a9f0b
Merge branch 'jna-dev' of https://github.com/JeffersonLab/hps-java in…
pbutti Sep 23, 2020
73cab09
Additional momentum plots and fix on MultiVtx plots
pbutti Oct 1, 2020
76e2c9a
Fix compilation issue
pbutti Oct 1, 2020
319afd0
Updates to GBLOutputDriver
pbutti Jan 12, 2021
ea8c529
Update Simple GBL Traj Ali Driver
pbutti Jan 12, 2021
057377a
Update to GBLRefitterDriver
pbutti Jan 12, 2021
4d6d014
Add check if a track is hole or slot side
pbutti Jan 12, 2021
5130af3
Remove dependency from jeigen
pbutti Jan 12, 2021
ba9ef8e
Merge branch 'alignment_dev' into jna-dev
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
46 changes: 33 additions & 13 deletions recon/src/main/java/org/hps/recon/vertexing/MultipleEventsVertexingDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public final class MultipleEventsVertexingDriver extends Driver {
private List<Track> accumulatedTracksBot = new ArrayList<Track>();
private List<BilliorTrack> accumulatedBTracksBot = new ArrayList<BilliorTrack>();


private String trackCollectionName = "GBLTracks";
protected double[] beamSize = {0.001, 0.130, 0.050}; // rough estimate from harp scans during engineering run
private double[] beamPositionToUse = new double[3];
Expand All @@ -35,13 +36,26 @@ public final class MultipleEventsVertexingDriver extends Driver {
private AIDA aida;
private String vtxFold="MultiEventVtx/";
private int _ntrks = 100;
private int _nhits = -1;
private String outputPlots = "multiEvt.root";

public void setNhits(int nhits) {
_nhits = nhits;
}

public void setTrackCollectionName(String val) {
trackCollectionName = val;
}

public void setNtrks( int ntrks) {
_ntrks = ntrks;
}

public void setVtxFold( String val) {
vtxFold = val;
}


@Override
protected void detectorChanged(Detector detector) {

Expand Down Expand Up @@ -82,19 +96,23 @@ protected void process(EventHeader event) {
}

for (Track track : trackCollection) {
accumulatedTracks.add(track);
accumulatedBTracks.add(new BilliorTrack(track));

if (track.getTrackStates().get(0).getTanLambda() > 0) {
accumulatedTracksTop.add(track);
accumulatedBTracksTop.add(new BilliorTrack(track));
}

else {
accumulatedTracksBot.add(track);
accumulatedBTracksBot.add(new BilliorTrack(track));
}

if (_nhits < 0 || track.getTrackerHits().size() == _nhits) {

//accumulatedTracks.add(track);
accumulatedBTracks.add(new BilliorTrack(track));

if (track.getTrackStates().get(0).getTanLambda() > 0) {
//accumulatedTracksTop.add(track);
accumulatedBTracksTop.add(new BilliorTrack(track));
}

else {
//accumulatedTracksBot.add(track);
accumulatedBTracksBot.add(new BilliorTrack(track));
}

}
}
}

Expand All @@ -116,14 +134,16 @@ protected void endOfData() {
vtxFitter.setDebug(debug);
vtxFitter.doBeamSpotConstraint(false);


//Randomize the tracks ? Better to do something more reproducible

Collections.shuffle(accumulatedBTracks);
FitMultiVtx(accumulatedBTracks,vtxFitter,"");

FitMultiVtx(accumulatedBTracksTop,vtxFitter,"_top");
FitMultiVtx(accumulatedBTracksBot,vtxFitter,"_bottom");




}

Expand Down
44 changes: 44 additions & 0 deletions tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,4 +1931,48 @@ public static boolean detectorElementContainsPoint(Hep3Vector trackPosition, Det
return detectorElementContainsPoint( trackPosition, sensor,0.0);
}


//This methods checks if a track has only hole hits in the back of the detector
//return true if all back layers have hole hits, false if all back layers have slot hits

public static boolean isHoleTrack(Track trk) {

boolean holeTrack = false;

TrackState trackState = trk.getTrackStates().get(0);
boolean isTop = true;
if (trackState.getTanLambda()<0)
isTop=false;

//System.out.println("--------------");
for (TrackerHit hit : trk.getTrackerHits()) {

int stripLayer = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement()).getLayerNumber();
int hpslayer = (stripLayer + 1 ) / 2;
String side = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement()).getSide();

if (isTop) {
if (hpslayer == 5 || hpslayer ==6 || hpslayer==7)
if (side=="ELECTRON")
holeTrack=true;
}
else {
if (hpslayer == 5 || hpslayer ==6 || hpslayer==7)
if (side=="ELECTRON")
holeTrack=true;
}

String moduleName = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement()).getName();
int hpsmodule = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement()).getModuleNumber();
int MPID = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement()).getMillepedeId();

//System.out.println("Hit on track :: " + moduleName);
//System.out.println("Layer="+hpslayer+" Module=" + hpsmodule +" MPID=" + MPID+" side="+side +" top=" +isTop);

}
//System.out.println("Track is hole=" + holeTrack);
//System.out.println("==========");

return holeTrack;
}
}
109 changes: 98 additions & 11 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 @@ -65,7 +65,7 @@ public class GBLOutputDriver extends Driver {
String resFolder="/res/";
String hitFolder="/hit/";
private boolean b_doGBLkinks = true;
private boolean b_doDetailPlots = true;
private boolean b_doDetailPlots = false;

//This should be moved to the GBL Refitter!!!
//The field map for extrapolation
Expand Down Expand Up @@ -157,7 +157,7 @@ public void process(EventHeader event) {
i++;

}
doBasicGBLtrack(trk);
doBasicGBLtrack(trk,sensorHits);
doGBLresiduals(trk, sensorHits,event);
//doMTresiduals(matchedTrack, sensorHits);
if (b_doGBLkinks)
Expand Down Expand Up @@ -220,7 +220,14 @@ private void FillGBLTrackPlot(String str, String isTop, String charge, double va
aidaGBL.histogram2D(str+isTop+charge).fill(valX,valY);
}

private void doBasicGBLtrack(Track trk) {
private void FillGBLTrackPlot(String str, String isTop, String charge, double valX, double valY, double valZ) {
aidaGBL.histogram3D(str+isTop).fill(valX,valY,valZ);
aidaGBL.histogram3D(str+isTop+charge).fill(valX,valY,valZ);
}



private void doBasicGBLtrack(Track trk, Map<HpsSiSensor, TrackerHit> sensorHits) {

TrackState trackState = trk.getTrackStates().get(0);

Expand All @@ -232,13 +239,14 @@ private void doBasicGBLtrack(Track trk) {
if (trk.getType()==1 && trk.getTrackerHits().size() < 12) {
return;
}

List<Integer> missingHits;
missingHits = findMissingLayer(trk);

if (trackState.getTanLambda() > 0) {
isTop = "_top";
}




String charge = "_pos";
if (trk.getCharge()<0)
charge = "_neg";
Expand All @@ -252,9 +260,41 @@ private void doBasicGBLtrack(Track trk) {
FillGBLTrackPlot(trkpFolder+"p",isTop,charge,trackp);
if (trk.getTrackerHits().size()==7)
FillGBLTrackPlot(trkpFolder+"p7h",isTop,charge,trackp);

if (trk.getTrackerHits().size()==6)
FillGBLTrackPlot(trkpFolder+"p6h",isTop,charge,trackp);
if (trk.getTrackerHits().size()==5)
FillGBLTrackPlot(trkpFolder+"p5h",isTop,charge,trackp);

if (TrackUtils.isHoleTrack(trk))
FillGBLTrackPlot(trkpFolder+"p_hole",isTop,charge,trackp);
else
FillGBLTrackPlot(trkpFolder+"p_slot",isTop,charge,trackp);


//Momentum maps
FillGBLTrackPlot(trkpFolder+"p_vs_phi",isTop,charge,trackState.getPhi(),trackp);
FillGBLTrackPlot(trkpFolder+"p_vs_tanLambda",isTop,charge,trackState.getTanLambda(),trackp);
FillGBLTrackPlot(trkpFolder+"p_vs_phi_tanLambda",isTop,charge,trackState.getPhi(),trackState.getTanLambda(),trackp);

double tanLambda = trackState.getTanLambda();
double cosLambda = 1. / (Math.sqrt(1+tanLambda*tanLambda));

FillGBLTrackPlot(trkpFolder+"pT_vs_phi",isTop,charge,trackState.getPhi(),trackp*cosLambda);
FillGBLTrackPlot(trkpFolder+"pT_vs_tanLambda",isTop,charge,trackState.getTanLambda(),trackp*cosLambda);


if (trk.getTrackerHits().size()==6)
FillGBLTrackPlot(trkpFolder+"p_Missing1Hit",isTop,charge,missingHits.get(0),trackp);

if (missingHits.size()==1 && missingHits.get(0)==7)
FillGBLTrackPlot(trkpFolder+"p_MissingLastLayer",isTop,charge,trackp);


FillGBLTrackPlot(trkpFolder+"Chi2",isTop,charge,trk.getChi2());

FillGBLTrackPlot(trkpFolder+"Chi2_vs_p",isTop,charge,trackp,trk.getChi2());



aidaGBL.histogram1D(trkpFolder+"nHits" + isTop).fill(trk.getTrackerHits().size());
aidaGBL.histogram1D(trkpFolder+"nHits" + isTop+charge).fill(trk.getTrackerHits().size());

Expand Down Expand Up @@ -507,6 +547,37 @@ private void doGBLresiduals(Track trk, Map<HpsSiSensor, TrackerHit> sensorHits,
}
}//doGBLresiduals

private List<Integer> findMissingLayer(Track trk) {

List<Integer> layers = new ArrayList<Integer>();
layers.add(1);
layers.add(2);
layers.add(3);
layers.add(4);
layers.add(5);
layers.add(6);
layers.add(7);

List<Integer> LayersOnTrack = new ArrayList<Integer>();
List<Integer> missingHits = new ArrayList<Integer>();

for (TrackerHit hit : trk.getTrackerHits()) {

int stripLayer = ((HpsSiSensor) ((RawTrackerHit) hit.getRawHits().get(0)).getDetectorElement()).getLayerNumber();

int hpslayer = (stripLayer + 1 ) / 2;
LayersOnTrack.add(hpslayer);
}

for (Integer layer : layers) {
if (!LayersOnTrack.contains(layer))
missingHits.add(layer);
}

return missingHits;
}


private void setupPlots() {


Expand Down Expand Up @@ -579,8 +650,8 @@ private void setupPlots() {
if (sens.isTopLayer() && !sens.isAxial())
xmax = 0.001;
}
aidaGBL.histogram1D(kinkFolder+"lambda_kink_" + sensor.getName(), 50, -xmax, xmax);
aidaGBL.histogram1D(kinkFolder+"phi_kink_" + sensor.getName(), 50, -xmax, xmax);
aidaGBL.histogram1D(kinkFolder+"lambda_kink_" + sensor.getName(), 250, -xmax, xmax);
aidaGBL.histogram1D(kinkFolder+"phi_kink_" + sensor.getName(), 250, -xmax, xmax);
}

aidaGBL.histogram2D(kinkFolder+"lambda_kink_mod",mod_2dplot_bins,-0.5,mod_2dplot_bins-0.5,nbins,-0.001,0.001);
Expand Down Expand Up @@ -614,6 +685,11 @@ private void setupPlots() {
aidaGBL.histogram1D(trkpFolder+"tanLambda"+vol+charge,nbins_t,-0.2,0.2);
aidaGBL.histogram1D(trkpFolder+"p"+vol+charge,nbins_p,0.,pmax);
aidaGBL.histogram1D(trkpFolder+"p7h"+vol+charge,nbins_p,0.,pmax);
aidaGBL.histogram1D(trkpFolder+"p6h"+vol+charge,nbins_p,0.,pmax);
aidaGBL.histogram1D(trkpFolder+"p5h"+vol+charge,nbins_p,0.,pmax);
aidaGBL.histogram1D(trkpFolder+"p_MissingLastLayer"+vol+charge,nbins_p,0.,pmax);
aidaGBL.histogram1D(trkpFolder+"p_hole"+vol+charge,nbins_p,0.,pmax);
aidaGBL.histogram1D(trkpFolder+"p_slot"+vol+charge,nbins_p,0.,pmax);

aidaGBL.histogram1D(trkpFolder+"Chi2"+vol+charge,nbins_t*2,0,200);
aidaGBL.histogram1D(trkpFolder+"nHits"+vol+charge,15,0,15);
Expand All @@ -631,8 +707,9 @@ private void setupPlots() {


//TH2Ds

aidaGBL.histogram2D(trkpFolder+"d0_vs_phi"+vol+charge,nbins_t,-0.3,0.3,nbins_t,-5.0,5.0);
aidaGBL.histogram2D(trkpFolder+"Chi2_vs_p"+vol+charge,nbins_p,0.0,pmax,nbins_t*2,0,200);
//aidaGBL.histogram2D("d0_vs_phi_bs"+vol+charge,nbins_t,-5.0,5.0,nbins_t,-0.3,0.3);
aidaGBL.histogram2D(trkpFolder+"d0_vs_tanLambda"+vol+charge,nbins_t,-0.2,0.2,nbins_t,-5.0,5.0);
aidaGBL.histogram2D(trkpFolder+"d0_vs_p"+vol+charge, nbins_p,0.0,pmax,nbins_t,-5.0,5.0);
Expand All @@ -641,6 +718,16 @@ private void setupPlots() {
aidaGBL.histogram2D(trkpFolder+"z0bs_vs_p"+vol+charge,nbins_p,0.0,pmax,nbins_t,-z0bsmax,z0bsmax);
aidaGBL.histogram2D(trkpFolder+"z0_vs_tanLambda"+vol+charge, nbins_t,-0.1,0.1,nbins_t,-z0max,z0max);
aidaGBL.histogram2D(trkpFolder+"z0bs_vs_tanLambda"+vol+charge,nbins_t,-0.1,0.1,nbins_t,-z0bsmax,z0bsmax);

aidaGBL.histogram2D(trkpFolder+"p_Missing1Hit"+vol+charge,8,0,8,nbins_p,0.0,pmax);
aidaGBL.histogram2D(trkpFolder+"p_vs_phi"+vol+charge, nbins_t,-0.3,0.3, nbins_p,0.,pmax);
aidaGBL.histogram2D(trkpFolder+"p_vs_tanLambda"+vol+charge,nbins_t,-0.2,0.2,nbins_p,0.,pmax);
aidaGBL.histogram3D(trkpFolder+"p_vs_phi_tanLambda"+vol+charge, 50,-0.3,0.3,50,-0.2,0.2,100,0.,pmax);

aidaGBL.histogram2D(trkpFolder+"pT_vs_phi"+vol+charge, nbins_t,-0.3,0.3, nbins_p,0.,pmax);
aidaGBL.histogram2D(trkpFolder+"pT_vs_tanLambda"+vol+charge,nbins_t,-0.2,0.2,nbins_p,0.,pmax);



if (b_doDetailPlots) {
//TH2Ds - detail
Expand Down
21 changes: 15 additions & 6 deletions tracking/src/main/java/org/hps/recon/tracking/gbl/GBLRefitterDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.RelationalTable;
import org.lcsim.event.Track;
import org.lcsim.event.base.BaseTrack;

import org.lcsim.event.TrackerHit;
import org.lcsim.event.base.BaseLCRelation;
Expand Down Expand Up @@ -73,7 +74,7 @@ public class GBLRefitterDriver extends Driver {
private List<AlignableDetectorElement> Alignabledes = new ArrayList<AlignableDetectorElement>();
private List<SiSensor> sensors = new ArrayList<SiSensor>();
private boolean usePoints = true;

//Calculator for Frame to Frame derivatives
private FrameToFrameDers f2fD = new FrameToFrameDers();

Expand Down Expand Up @@ -216,7 +217,7 @@ protected void process(EventHeader event) {

List<Track> refittedTracks = new ArrayList<Track>();
List<LCRelation> trackRelations = new ArrayList<LCRelation>();

List<GBLKinkData> kinkDataCollection = new ArrayList<GBLKinkData>();
List<LCRelation> kinkDataRelations = new ArrayList<LCRelation>();

Expand Down Expand Up @@ -256,10 +257,18 @@ protected void process(EventHeader event) {

if (momentum.magnitude() < 1)
continue;
//At least 6 hits
if (gblTrk.getTrackerHits().size() < 6)
continue;

////At least 6 hits
//if (gblTrk.getTrackerHits().size() < 6)
//continue;

double[] trk_prms = track.getTrackParameters();
double tanLambda = trk_prms[BaseTrack.TANLAMBDA];

//Align with tracks without hole on track
if ((tanLambda > 0 && track.getTrackerHits().size() < 5) || (tanLambda < 0 && track.getTrackerHits().size() < 5 ))
continue;

}

//System.out.printf("gblTrkNDF %d gblTrkChi2 %f getMaxTrackChisq5 %f getMaxTrackChisq6 %f \n", gblTrk.getNDF(), gblTrk.getChi2(), cuts.getMaxTrackChisq(5), cuts.getMaxTrackChisq(6));
Expand Down Expand Up @@ -366,7 +375,7 @@ protected void process(EventHeader event) {
int flag = 1 << LCIOConstants.TRBIT_HITS;
event.put(outputCollectionName, refittedTracks, Track.class, flag);
event.put(trackRelationCollectionName, trackRelations, LCRelation.class, 0);

if (computeGBLResiduals) {
event.put(trackResidualsColName, trackResidualsCollection, TrackResidualsData.class, 0);
event.put(trackResidualsRelColName, trackResidualsRelations, LCRelation.class, 0);
Expand Down
Loading