Visitar URL original
switch to px/py/pz schema · JeffersonLab/coatjava@7b76eec · GitHub
Skip to content

Commit 7b76eec

Browse files
baltzellbaltzell
committed
switch to px/py/pz schema
1 parent 7a35939 commit 7b76eec

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

  • common-tools/clas-decay-tools/src/main/java/org/jlab/clas/decay/analysis
  • reconstruction/vtx/src/main/java/org/jlab/rec/vtx/banks

‎common-tools/clas-decay-tools/src/main/java/org/jlab/clas/decay/analysis/Decay.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -596,15 +596,15 @@ private boolean checkVertDocaBank(Particle p1, Particle p2) {
596596
double vx1 = (double) getVertBank().getFloat("x1", loop2);
597597
double vy1 = (double) getVertBank().getFloat("y1", loop2);
598598
double vz1 = (double) getVertBank().getFloat("z1", loop2);
599-
double px1 = (double) getVertBank().getFloat("cx1", loop2);
600-
double py1 = (double) getVertBank().getFloat("cy1", loop2);
601-
double pz1 = (double) getVertBank().getFloat("cz1", loop2);
599+
double px1 = (double) getVertBank().getFloat("px1", loop2);
600+
double py1 = (double) getVertBank().getFloat("py1", loop2);
601+
double pz1 = (double) getVertBank().getFloat("pz1", loop2);
602602
double vx2 = (double) getVertBank().getFloat("x2", loop2);
603603
double vy2 = (double) getVertBank().getFloat("y2", loop2);
604604
double vz2 = (double) getVertBank().getFloat("z2", loop2);
605-
double px2 = (double) getVertBank().getFloat("cx2", loop2);
606-
double py2 = (double) getVertBank().getFloat("cy2", loop2);
607-
double pz2 = (double) getVertBank().getFloat("cz2", loop2);
605+
double px2 = (double) getVertBank().getFloat("px2", loop2);
606+
double py2 = (double) getVertBank().getFloat("py2", loop2);
607+
double pz2 = (double) getVertBank().getFloat("pz2", loop2);
608608
p1.setVx(vx1);
609609
p1.setVy(vy1);
610610
p1.setVz(vz1);
@@ -631,15 +631,15 @@ private boolean checkVertDocaBank(Particle p1, Particle p2) {
631631
double vx1 = (double) getVertBank().getFloat("x2", loop2);
632632
double vy1 = (double) getVertBank().getFloat("y2", loop2);
633633
double vz1 = (double) getVertBank().getFloat("z2", loop2);
634-
double px1 = (double) getVertBank().getFloat("cx2", loop2);
635-
double py1 = (double) getVertBank().getFloat("cy2", loop2);
636-
double pz1 = (double) getVertBank().getFloat("cz2", loop2);
634+
double px1 = (double) getVertBank().getFloat("px2", loop2);
635+
double py1 = (double) getVertBank().getFloat("py2", loop2);
636+
double pz1 = (double) getVertBank().getFloat("pz2", loop2);
637637
double vx2 = (double) getVertBank().getFloat("x1", loop2);
638638
double vy2 = (double) getVertBank().getFloat("y1", loop2);
639639
double vz2 = (double) getVertBank().getFloat("z1", loop2);
640-
double px2 = (double) getVertBank().getFloat("cx1", loop2);
641-
double py2 = (double) getVertBank().getFloat("cy1", loop2);
642-
double pz2 = (double) getVertBank().getFloat("cz1", loop2);
640+
double px2 = (double) getVertBank().getFloat("px1", loop2);
641+
double py2 = (double) getVertBank().getFloat("py1", loop2);
642+
double pz2 = (double) getVertBank().getFloat("pz1", loop2);
643643
p1.setVx(vx1);
644644
p1.setVy(vy1);
645645
p1.setVz(vz1);

‎reconstruction/vtx/src/main/java/org/jlab/rec/vtx/banks/Writer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public DataBank VtxBank(DataEvent event, List<Vertex> vtx) {
2828
bank.setFloat("x1", i, (float) vtx.get(i).getP1().getVx());
2929
bank.setFloat("y1", i, (float) vtx.get(i).getP1().getVy());
3030
bank.setFloat("z1", i, (float) vtx.get(i).getP1().getVz());
31-
bank.setFloat("cx1", i, (float) vtx.get(i).getP1().getPx());
32-
bank.setFloat("cy1", i, (float) vtx.get(i).getP1().getPy());
33-
bank.setFloat("cz1", i, (float) vtx.get(i).getP1().getPz());
31+
bank.setFloat("px1", i, (float) vtx.get(i).getP1().getPx());
32+
bank.setFloat("py1", i, (float) vtx.get(i).getP1().getPy());
33+
bank.setFloat("pz1", i, (float) vtx.get(i).getP1().getPz());
3434
bank.setFloat("x2", i, (float) vtx.get(i).getP2().getVx());
3535
bank.setFloat("y2", i, (float) vtx.get(i).getP2().getVy());
3636
bank.setFloat("z2", i, (float) vtx.get(i).getP2().getVz());
37-
bank.setFloat("cx2", i, (float) vtx.get(i).getP2().getPx());
38-
bank.setFloat("cy2", i, (float) vtx.get(i).getP2().getPy());
39-
bank.setFloat("cz2", i, (float) vtx.get(i).getP2().getPz());
37+
bank.setFloat("px2", i, (float) vtx.get(i).getP2().getPx());
38+
bank.setFloat("py2", i, (float) vtx.get(i).getP2().getPy());
39+
bank.setFloat("pz2", i, (float) vtx.get(i).getP2().getPz());
4040
bank.setFloat("r", i, (float) vtx.get(i).getR());
4141
}
4242

0 commit comments

Comments
 (0)