Skip to content

changes to tuple maker #48

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
omar-moreno merged 2 commits into from
Apr 14, 2017
Merged

changes to tuple maker #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c56d431
changes to tuple maker
Apr 14, 2017
5357e97
Merge branch 'master' into iss47
Apr 14, 2017
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
33 changes: 27 additions & 6 deletions analysis/src/main/java/org/hps/analysis/tuple/TupleDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import hep.physics.vec.HepLorentzVector;
import hep.physics.vec.VecOp;

import hep.physics.matrix.Matrix;
import hep.physics.matrix.MatrixOp;

import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.util.ArrayList;
Expand Down Expand Up @@ -79,7 +82,12 @@ public abstract class TupleDriver extends Driver {
private final double[] botPos = {54.5,107.5,207.5};
protected final BasicHep3Matrix beamAxisRotation = BasicHep3Matrix.identity();
protected double ebeam = Double.NaN;
private int nLay = 6;

public void setNLay(int nLay) {
this.nLay = nLay;
}

public void setApplyBeamRotation(boolean applyBeamRotation) {
this.applyBeamRotation = applyBeamRotation;
}
Expand Down Expand Up @@ -269,6 +277,9 @@ protected void addVertexVariables() {
"tarVX/D", "tarVY/D", "tarVZ/D", "tarChisq/D", "tarM/D",
"vzcPX/D", "vzcPY/D", "vzcPZ/D", "vzcP/D",
"vzcVX/D", "vzcVY/D", "vzcVZ/D", "vzcChisq/D", "vzcM/D",
"uncCovXX/D","uncCovXY/D","uncCovXZ/D",
"uncCovYX/D","uncCovYY/D","uncCovYZ/D",
"uncCovZX/D","uncCovZY/D","uncCovZZ/D",
"uncElePX/D", "uncElePY/D", "uncElePZ/D", "uncPosPX/D", "uncPosPY/D", "uncPosPZ/D", "uncEleP/D", "uncPosP/D",
"bscElePX/D", "bscElePY/D", "bscElePZ/D", "bscPosPX/D", "bscPosPY/D", "bscPosPZ/D", "bscEleP/D", "bscPosP/D",
"tarElePX/D", "tarElePY/D", "tarElePZ/D", "tarPosPX/D", "tarPosPY/D", "tarPosPZ/D", "tarEleP/D", "tarPosP/D",
Expand Down Expand Up @@ -678,14 +689,14 @@ protected TrackState fillParticleVariables(EventHeader event, ReconstructedParti
TrackState tweakedTrackState = new BaseTrackState(param, trackState.getReferencePoint(), trackState.getCovMatrix(), trackState.getLocation(), bfield);
Hep3Vector pRot = VecOp.mult(beamAxisRotation, CoordinateTransformations.transformVectorToDetector(new BasicHep3Vector(tweakedTrackState.getMomentum())));

Double[] iso = TrackUtils.getIsolations(track, TrackUtils.getHitToStripsTable(event), TrackUtils.getHitToRotatedTable(event));
Double[] iso = TrackUtils.getIsolations(track, TrackUtils.getHitToStripsTable(event), TrackUtils.getHitToRotatedTable(event), nLay);
double minPositiveIso = 9999;
double minPositiveIsoL2 = 9999;
double minNegativeIso = 9999;
double minNegativeIsoL2 = 9999;
double isoStereo = -9999, isoAxial = -9999;
double isoStereoL2 = -9999, isoAxialL2 = -9999;
for (int i = 0; i < 6; i++) {
for (int i = 0; i < nLay; i++) {
if (iso[2 * i] != null) {
if (pRot.y() < 0) {
isoStereo = iso[2 * i];
Expand Down Expand Up @@ -762,10 +773,10 @@ protected TrackState fillParticleVariables(EventHeader event, ReconstructedParti
}

//////////////////////////////////////////////////////////////////////////
double rawHitTime[] = new double[6];
double rawHitTDiff[] = new double[6];
double rawHitMaxAmpl[] = new double[6];
double rawHitChisq[] = new double[6];
double rawHitTime[] = new double[nLay];
double rawHitTDiff[] = new double[nLay];
double rawHitMaxAmpl[] = new double[nLay];
double rawHitChisq[] = new double[nLay];
int nTrackHits = 0;
List <TrackerHit> allTrackHits = track.getTrackerHits();
for (TrackerHit iTrackHit : allTrackHits){
Expand Down Expand Up @@ -948,6 +959,7 @@ protected void fillVertexVariables(EventHeader event, List<BilliorTrack> billior
ReconstructedParticle bscV0 = HpsReconParticleDriver.makeReconstructedParticle(electron, positron, bsconVertex);
Hep3Vector bscMomRot = VecOp.mult(beamAxisRotation, bscV0.getMomentum());
Hep3Vector bscVtx = VecOp.mult(beamAxisRotation, bscV0.getStartVertex().getPosition());
Matrix uncCov = MatrixOp.mult(MatrixOp.mult(beamAxisRotation,uncV0.getStartVertex().getCovMatrix()),MatrixOp.transposed(beamAxisRotation));

vtxFitter.doTargetConstraint(true);
BilliorVertex tarVertex = vtxFitter.fitVertex(billiorTracks);
Expand Down Expand Up @@ -981,6 +993,15 @@ protected void fillVertexVariables(EventHeader event, List<BilliorTrack> billior
tupleMap.put("uncPosPZ/D", uncV0.getStartVertex().getParameters().get("p2Z"));
tupleMap.put("uncPosP/D", Math.sqrt(Math.pow(uncV0.getStartVertex().getParameters().get("p2X"), 2) + Math.pow(uncV0.getStartVertex().getParameters().get("p2Y"), 2)
+ Math.pow(uncV0.getStartVertex().getParameters().get("p2Z"), 2)));
tupleMap.put("uncCovXX/D", uncCov.e(0,0));
tupleMap.put("uncCovXY/D", uncCov.e(0,1));
tupleMap.put("uncCovXZ/D", uncCov.e(0,2));
tupleMap.put("uncCovYX/D", uncCov.e(1,0));
tupleMap.put("uncCovYY/D", uncCov.e(1,1));
tupleMap.put("uncCovYZ/D", uncCov.e(1,2));
tupleMap.put("uncCovZX/D", uncCov.e(2,0));
tupleMap.put("uncCovZY/D", uncCov.e(2,1));
tupleMap.put("uncCovZZ/D", uncCov.e(2,2));

tupleMap.put("bscPX/D", bscMomRot.x());
tupleMap.put("bscPY/D", bscMomRot.y());
Expand Down