Skip to content

make bank schema match software #1545

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

Open
baltzell wants to merge 2 commits into
base: development
Choose a base branch
from
Open

make bank schema match software #1545

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
1a6e641
change VertDoca bank schema
baltzell Oct 29, 2026
3c7e440
switch to px/py/pz schema
baltzell Oct 29, 2026
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
24 changes: 12 additions & 12 deletions common-tools/clas-decay-tools/src/main/java/org/jlab/clas/decay/analysis/Decay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,15 +596,15 @@ private boolean checkVertDocaBank(Particle p1, Particle p2) {
double vx1 = (double) getVertBank().getFloat("x1", loop2);
double vy1 = (double) getVertBank().getFloat("y1", loop2);
double vz1 = (double) getVertBank().getFloat("z1", loop2);
double px1 = (double) getVertBank().getFloat("cx1", loop2);
double py1 = (double) getVertBank().getFloat("cy1", loop2);
double pz1 = (double) getVertBank().getFloat("cz1", loop2);
double px1 = (double) getVertBank().getFloat("px1", loop2);
double py1 = (double) getVertBank().getFloat("py1", loop2);
double pz1 = (double) getVertBank().getFloat("pz1", loop2);
double vx2 = (double) getVertBank().getFloat("x2", loop2);
double vy2 = (double) getVertBank().getFloat("y2", loop2);
double vz2 = (double) getVertBank().getFloat("z2", loop2);
double px2 = (double) getVertBank().getFloat("cx2", loop2);
double py2 = (double) getVertBank().getFloat("cy2", loop2);
double pz2 = (double) getVertBank().getFloat("cz2", loop2);
double px2 = (double) getVertBank().getFloat("px2", loop2);
double py2 = (double) getVertBank().getFloat("py2", loop2);
double pz2 = (double) getVertBank().getFloat("pz2", loop2);
p1.setVx(vx1);
p1.setVy(vy1);
p1.setVz(vz1);
Expand All @@ -631,15 +631,15 @@ private boolean checkVertDocaBank(Particle p1, Particle p2) {
double vx1 = (double) getVertBank().getFloat("x2", loop2);
double vy1 = (double) getVertBank().getFloat("y2", loop2);
double vz1 = (double) getVertBank().getFloat("z2", loop2);
double px1 = (double) getVertBank().getFloat("cx2", loop2);
double py1 = (double) getVertBank().getFloat("cy2", loop2);
double pz1 = (double) getVertBank().getFloat("cz2", loop2);
double px1 = (double) getVertBank().getFloat("px2", loop2);
double py1 = (double) getVertBank().getFloat("py2", loop2);
double pz1 = (double) getVertBank().getFloat("pz2", loop2);
double vx2 = (double) getVertBank().getFloat("x1", loop2);
double vy2 = (double) getVertBank().getFloat("y1", loop2);
double vz2 = (double) getVertBank().getFloat("z1", loop2);
double px2 = (double) getVertBank().getFloat("cx1", loop2);
double py2 = (double) getVertBank().getFloat("cy1", loop2);
double pz2 = (double) getVertBank().getFloat("cz1", loop2);
double px2 = (double) getVertBank().getFloat("px1", loop2);
double py2 = (double) getVertBank().getFloat("py1", loop2);
double pz2 = (double) getVertBank().getFloat("pz1", loop2);
p1.setVx(vx1);
p1.setVy(vy1);
p1.setVz(vz1);
Expand Down
12 changes: 6 additions & 6 deletions etc/bankdefs/hipo4/event-ai.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,15 +582,15 @@
{"name":"x1", "type":"F", "info":"x-position of the first track at the DOCA point (cm)"},
{"name":"y1", "type":"F", "info":"y-position of the first track at the DOCA point (cm)"},
{"name":"z1", "type":"F", "info":"z-position of the first track at the DOCA point (cm)"},
{"name":"cx1", "type":"F", "info":"x-direction vector of the first track at the DOCA point (cm)"},
{"name":"cy1", "type":"F", "info":"y-direction vector of the first track at the DOCA point (cm)"},
{"name":"cz1", "type":"F", "info":"z-direction vector of the first track at the DOCA point (cm)"},
{"name":"px1", "type":"F", "info":"x-component of the momentum of the first track at the DOCA point (cm)"},
{"name":"py1", "type":"F", "info":"y-component of the momentum of the first track at the DOCA point (cm)"},
{"name":"pz1", "type":"F", "info":"z-component of the momentum of the first track at the DOCA point (cm)"},
{"name":"x2", "type":"F", "info":"x-position of the second track at the DOCA point (cm)"},
{"name":"y2", "type":"F", "info":"y-position of the second track at the DOCA point (cm)"},
{"name":"z2", "type":"F", "info":"z-position of the second track at the DOCA point (cm)"},
{"name":"cx2", "type":"F", "info":"x-direction vector of the second track at the DOCA point (cm)"},
{"name":"cy2", "type":"F", "info":"y-direction vector of the second track at the DOCA point (cm)"},
{"name":"cz2", "type":"F", "info":"z-direction vector of the second track at the DOCA point (cm)"},
{"name":"px2", "type":"F", "info":"x-component of the momentum of the second track at the DOCA point (cm)"},
{"name":"py2", "type":"F", "info":"y-component of the momentum of the second track at the DOCA point (cm)"},
{"name":"pz2", "type":"F", "info":"z-component of the momentum of the second track at the DOCA point (cm)"},
{"name":"r", "type":"F", "info":"The distance between two tracks (cm)"}
]
},
Expand Down
12 changes: 6 additions & 6 deletions etc/bankdefs/hipo4/event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,15 +587,15 @@
{"name":"x1", "type":"F", "info":"x-position of the first track at the DOCA point (cm)"},
{"name":"y1", "type":"F", "info":"y-position of the first track at the DOCA point (cm)"},
{"name":"z1", "type":"F", "info":"z-position of the first track at the DOCA point (cm)"},
{"name":"cx1", "type":"F", "info":"x-direction vector of the first track at the DOCA point (cm)"},
{"name":"cy1", "type":"F", "info":"y-direction vector of the first track at the DOCA point (cm)"},
{"name":"cz1", "type":"F", "info":"z-direction vector of the first track at the DOCA point (cm)"},
{"name":"px1", "type":"F", "info":"x-compoment of the momentum of the first track at the DOCA point (cm)"},
{"name":"py1", "type":"F", "info":"y-compoment of the momentum of the first track at the DOCA point (cm)"},
{"name":"pz1", "type":"F", "info":"z-compoment of the momentum of the first track at the DOCA point (cm)"},
{"name":"x2", "type":"F", "info":"x-position of the second track at the DOCA point (cm)"},
{"name":"y2", "type":"F", "info":"y-position of the second track at the DOCA point (cm)"},
{"name":"z2", "type":"F", "info":"z-position of the second track at the DOCA point (cm)"},
{"name":"cx2", "type":"F", "info":"x-direction vector of the second track at the DOCA point (cm)"},
{"name":"cy2", "type":"F", "info":"y-direction vector of the second track at the DOCA point (cm)"},
{"name":"cz2", "type":"F", "info":"z-direction vector of the second track at the DOCA point (cm)"},
{"name":"px2", "type":"F", "info":"x-compoment of the momentum of the second track at the DOCA point (cm)"},
{"name":"py2", "type":"F", "info":"y-compoment of the momentum of the second track at the DOCA point (cm)"},
{"name":"pz2", "type":"F", "info":"z-compoment of the momentum of the second track at the DOCA point (cm)"},
{"name":"r", "type":"F", "info":"The distance between two tracks (cm)"}
]
},
Expand Down
12 changes: 6 additions & 6 deletions reconstruction/vtx/src/main/java/org/jlab/rec/vtx/banks/Writer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ public DataBank VtxBank(DataEvent event, List<Vertex> vtx) {
bank.setFloat("x1", i, (float) vtx.get(i).getP1().getVx());
bank.setFloat("y1", i, (float) vtx.get(i).getP1().getVy());
bank.setFloat("z1", i, (float) vtx.get(i).getP1().getVz());
bank.setFloat("cx1", i, (float) vtx.get(i).getP1().getPx());
bank.setFloat("cy1", i, (float) vtx.get(i).getP1().getPy());
bank.setFloat("cz1", i, (float) vtx.get(i).getP1().getPz());
bank.setFloat("px1", i, (float) vtx.get(i).getP1().getPx());
bank.setFloat("py1", i, (float) vtx.get(i).getP1().getPy());
bank.setFloat("pz1", i, (float) vtx.get(i).getP1().getPz());
bank.setFloat("x2", i, (float) vtx.get(i).getP2().getVx());
bank.setFloat("y2", i, (float) vtx.get(i).getP2().getVy());
bank.setFloat("z2", i, (float) vtx.get(i).getP2().getVz());
bank.setFloat("cx2", i, (float) vtx.get(i).getP2().getPx());
bank.setFloat("cy2", i, (float) vtx.get(i).getP2().getPy());
bank.setFloat("cz2", i, (float) vtx.get(i).getP2().getPz());
bank.setFloat("px2", i, (float) vtx.get(i).getP2().getPx());
bank.setFloat("py2", i, (float) vtx.get(i).getP2().getPy());
bank.setFloat("pz2", i, (float) vtx.get(i).getP2().getPz());
bank.setFloat("r", i, (float) vtx.get(i).getR());
}

Expand Down
Loading