Skip to content

Commit 749dcd1

Browse files
baltzellbaltzell
committed
switch VTX track bank reading to enums
1 parent 8d7bcb9 commit 749dcd1

2 files changed

Lines changed: 46 additions & 48 deletions

File tree

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

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import java.util.HashMap;
55
import java.util.List;
66
import java.util.Map;
7+
import org.jlab.io.banks.REC__Particle;
8+
import org.jlab.io.banks.REC__Track;
9+
import org.jlab.io.banks.REC__UTrack;
710
import org.jlab.io.base.DataBank;
811
import org.jlab.io.base.DataEvent;
912
import org.jlab.rec.vtx.Particle;
@@ -55,40 +58,40 @@ public void readDataBanks(DataEvent event) {
5558
if(utrkBankEB!=null) {
5659
int nrows2 = utrkBankEB.rows();
5760
for(int loop = 0; loop < nrows2; loop++){
58-
int uindex = utrkBankEB.getInt("index", loop);
59-
double px = utrkBankEB.getFloat("px", loop);
60-
double py = utrkBankEB.getFloat("py", loop);
61-
double pz = utrkBankEB.getFloat("pz", loop);
62-
double vx = utrkBankEB.getFloat("vx", loop);
63-
double vy = utrkBankEB.getFloat("vy", loop);
64-
double vz = utrkBankEB.getFloat("vz", loop);
61+
int uindex = utrkBankEB.getInt(REC__UTrack.index, loop);
62+
double px = utrkBankEB.getFloat(REC__UTrack.px, loop);
63+
double py = utrkBankEB.getFloat(REC__UTrack.py, loop);
64+
double pz = utrkBankEB.getFloat(REC__UTrack.pz, loop);
65+
double vx = utrkBankEB.getFloat(REC__UTrack.vx, loop);
66+
double vy = utrkBankEB.getFloat(REC__UTrack.vy, loop);
67+
double vz = utrkBankEB.getFloat(REC__UTrack.vz, loop);
6568
double[] t = new double[]{px,py,pz,vx,vy,vz};
6669
uTrkMap.put(uindex, t);
6770
}
6871
}
6972
if(recBankEB!=null) {
7073
int nrows = recBankEB.rows();
7174
for(int loop = 0; loop < nrows; loop++){
72-
double px = recBankEB.getFloat("px", loop);
73-
double py = recBankEB.getFloat("py", loop);
74-
double pz = recBankEB.getFloat("pz", loop);
75-
double vx = recBankEB.getFloat("vx", loop);
76-
double vy = recBankEB.getFloat("vy", loop);
77-
double vz = recBankEB.getFloat("vz", loop);
75+
double px = recBankEB.getFloat(REC__Particle.px, loop);
76+
double py = recBankEB.getFloat(REC__Particle.py, loop);
77+
double pz = recBankEB.getFloat(REC__Particle.pz, loop);
78+
double vx = recBankEB.getFloat(REC__Particle.vx, loop);
79+
double vy = recBankEB.getFloat(REC__Particle.vy, loop);
80+
double vz = recBankEB.getFloat(REC__Particle.vz, loop);
7881
double[] t = new double[]{px,py,pz,vx,vy,vz};
7982
pTrkMap.put(loop, t);
8083
}
8184
}
8285
if(trkBankEB!=null) {
8386
int nrows2 = trkBankEB.rows();
8487
for(int loop = 0; loop < nrows2; loop++){
85-
int pindex = trkBankEB.getInt("pindex", loop);
86-
int detector = trkBankEB.getInt("detector", loop);
87-
qMap.put(pindex, trkBankEB.getInt("q", loop));
88+
int pindex = trkBankEB.getInt(REC__Track.pindex, loop);
89+
int detector = trkBankEB.getInt(REC__Track.detector, loop);
90+
qMap.put(pindex, trkBankEB.getInt(REC__Track.q, loop));
8891

8992
if(detector!=5)
9093
continue;
91-
int index = trkBankEB.getInt("index", loop);
94+
int index = trkBankEB.getInt(REC__Track.index, loop);
9295
if(uTrkMap.containsKey(index) && pTrkMap.containsKey(pindex)) {
9396
pTrkMap.put(pindex, uTrkMap.get(index));
9497
}
@@ -97,17 +100,17 @@ public void readDataBanks(DataEvent event) {
97100
if(recBankEB!=null && trkBankEB!=null) {
98101
int nrows = recBankEB.rows();
99102
for(int loop = 0; loop < nrows; loop++){
100-
int pid = recBankEB.getInt("pid", loop);
103+
int pid = recBankEB.getInt(REC__Particle.pid, loop);
101104
int q = 0;
102105
if(qMap.containsKey(loop))
103106
q = qMap.get(loop);
104107
if(q==0) continue;
105-
double px = recBankEB.getFloat("px", loop);
106-
double py = recBankEB.getFloat("py", loop);
107-
double pz = recBankEB.getFloat("pz", loop);
108-
double vx = recBankEB.getFloat("vx", loop);
109-
double vy = recBankEB.getFloat("vy", loop);
110-
double vz = recBankEB.getFloat("vz", loop);
108+
double px = recBankEB.getFloat(REC__Particle.px, loop);
109+
double py = recBankEB.getFloat(REC__Particle.py, loop);
110+
double pz = recBankEB.getFloat(REC__Particle.pz, loop);
111+
double vx = recBankEB.getFloat(REC__Particle.vx, loop);
112+
double vy = recBankEB.getFloat(REC__Particle.vy, loop);
113+
double vz = recBankEB.getFloat(REC__Particle.vz, loop);
111114
if(this.updateWithUTrack && pTrkMap.containsKey(loop)) {
112115
double[] t = pTrkMap.get(loop);
113116
px = t[0];

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

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
/*
2-
* To change this license header, choose License Headers in Project Properties.
3-
* To change this template file, choose Tools | Templates
4-
* and open the template in the editor.
5-
*/
61
package org.jlab.rec.vtx.banks;
72

83
import java.util.List;
4+
import org.jlab.io.banks.REC__VertDoca;
95
import org.jlab.io.base.DataBank;
106
import org.jlab.io.base.DataEvent;
117
import org.jlab.rec.vtx.Vertex;
@@ -20,27 +16,26 @@ public DataBank VtxBank(DataEvent event, List<Vertex> vtx) {
2016
DataBank bank = event.createBank("REC::VertDoca", vtx.size());
2117

2218
for (int i = 0; i < vtx.size(); i++) {
23-
bank.setShort("index1", i, (short) vtx.get(i).getP1().getIndex());
24-
bank.setShort("index2", i, (short) vtx.get(i).getP2().getIndex());
25-
bank.setFloat("x", i, (float) vtx.get(i).getP0().getVx());
26-
bank.setFloat("y", i, (float) vtx.get(i).getP0().getVy());
27-
bank.setFloat("z", i, (float) vtx.get(i).getP0().getVz());
28-
bank.setFloat("x1", i, (float) vtx.get(i).getP1().getVx());
29-
bank.setFloat("y1", i, (float) vtx.get(i).getP1().getVy());
30-
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());
34-
bank.setFloat("x2", i, (float) vtx.get(i).getP2().getVx());
35-
bank.setFloat("y2", i, (float) vtx.get(i).getP2().getVy());
36-
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());
40-
bank.setFloat("r", i, (float) vtx.get(i).getR());
19+
bank.setShort(REC__VertDoca.index1, i, (short) vtx.get(i).getP1().getIndex());
20+
bank.setShort(REC__VertDoca.index2, i, (short) vtx.get(i).getP2().getIndex());
21+
bank.setFloat(REC__VertDoca.x, i, (float) vtx.get(i).getP0().getVx());
22+
bank.setFloat(REC__VertDoca.y, i, (float) vtx.get(i).getP0().getVy());
23+
bank.setFloat(REC__VertDoca.z, i, (float) vtx.get(i).getP0().getVz());
24+
bank.setFloat(REC__VertDoca.x1, i, (float) vtx.get(i).getP1().getVx());
25+
bank.setFloat(REC__VertDoca.y1, i, (float) vtx.get(i).getP1().getVy());
26+
bank.setFloat(REC__VertDoca.z1, i, (float) vtx.get(i).getP1().getVz());
27+
bank.setFloat(REC__VertDoca.cx1, i, (float) vtx.get(i).getP1().getPx());
28+
bank.setFloat(REC__VertDoca.cy1, i, (float) vtx.get(i).getP1().getPy());
29+
bank.setFloat(REC__VertDoca.cz1, i, (float) vtx.get(i).getP1().getPz());
30+
bank.setFloat(REC__VertDoca.x2, i, (float) vtx.get(i).getP2().getVx());
31+
bank.setFloat(REC__VertDoca.y2, i, (float) vtx.get(i).getP2().getVy());
32+
bank.setFloat(REC__VertDoca.z2, i, (float) vtx.get(i).getP2().getVz());
33+
bank.setFloat(REC__VertDoca.cx2, i, (float) vtx.get(i).getP2().getPx());
34+
bank.setFloat(REC__VertDoca.cy2, i, (float) vtx.get(i).getP2().getPy());
35+
bank.setFloat(REC__VertDoca.cz2, i, (float) vtx.get(i).getP2().getPz());
36+
bank.setFloat(REC__VertDoca.r, i, (float) vtx.get(i).getR());
4137
}
4238

43-
//bank.show();
4439
return bank;
4540
}
4641
}

0 commit comments

Comments
 (0)