Skip to content

Commit e13da02

Browse files
sindhu-kusindhu-ku
authored
Merge branch 'DeepLearnPhysics:develop' into neutrino_info
2 parents f856231 + 2785f06 commit e13da02

File tree

3 files changed

+85
-14
lines changed

3 files changed

+85
-14
lines changed

‎larcv/core/DataFormat/Particle.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace larcv {
2626

2727
ss << buf.str() << "Vertex (x, y, z, t) = (" << x() << "," << y() << "," << z() << "," << t() << ")" << std::endl
2828
<< buf.str() << "Momentum (px, py, pz) = (" << px() << "," << py() << "," << pz() << ")" << std::endl
29-
<< buf.str() << "Final Momentum (px_final, py_final, pz_final) = (" << px_final() << "," << py_final() << "," << pz_final() << ")" << std::endl
29+
<< buf.str() << "Final Momentum (end_px, end_py, end_pz) = (" << end_px() << "," << end_py() << "," << end_pz() << ")" << std::endl
3030
<< buf.str() << "Initial Energy = " << energy_init() << std::endl
3131
<< buf.str() << "Deposit Energy = " << energy_deposit() << std::endl
3232
<< buf.str() << "Creation Process = " << creation_process() << std::endl

‎larcv/core/DataFormat/Particle.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ namespace larcv {
4242
, _px (0.)
4343
, _py (0.)
4444
, _pz (0.)
45-
, _px_final (kINVALID_DOUBLE)
46-
, _py_final (kINVALID_DOUBLE)
47-
, _pz_final (kINVALID_DOUBLE)
45+
, _end_px (kINVALID_DOUBLE)
46+
, _end_py (kINVALID_DOUBLE)
47+
, _end_pz (kINVALID_DOUBLE)
4848
, _dist_travel (-1)
4949
, _energy_init (0.)
5050
, _energy_deposit (0.)
@@ -79,11 +79,11 @@ namespace larcv {
7979
inline double px () const { return _px; }
8080
inline double py () const { return _py; }
8181
inline double pz () const { return _pz; }
82-
inline double px_final () const { return _px_final; }
83-
inline double py_final () const { return _py_final; }
84-
inline double pz_final () const { return _pz_final; }
82+
inline double end_px () const { return _end_px; }
83+
inline double end_py () const { return _end_py; }
84+
inline double end_pz () const { return _end_pz; }
8585
inline double p () const { return sqrt(pow(_px,2)+pow(_py,2)+pow(_pz,2)); }
86-
inline double p_final () const { return sqrt(pow(_px_final,2)+pow(_py_final,2)+pow(_pz_final,2)); }
86+
inline double end_p () const { return sqrt(pow(_end_px,2)+pow(_end_py,2)+pow(_end_pz,2)); }
8787
inline const larcv::Vertex& position() const { return _vtx; }
8888
inline double x () const { return _vtx.x(); }
8989
inline double y () const { return _vtx.y(); }
@@ -142,7 +142,7 @@ namespace larcv {
142142
inline void gen_id (unsigned int id ) { _genid = id; }
143143
inline void pdg_code (int code) { _pdg = code; }
144144
inline void momentum (double px, double py, double pz) { _px = px; _py = py; _pz = pz; }
145-
inline void final_momentum (double px_final, double py_final, double pz_final) { _px_final = px_final; _py_final = py_final; _pz_final = pz_final; }
145+
inline void end_momentum (double end_px, double end_py, double end_pz) { _end_px = end_px; _end_py = end_py; _end_pz = end_pz; }
146146
inline void position (const larcv::Vertex& vtx) { _vtx = vtx; }
147147
inline void position (double x, double y, double z, double t) { _vtx = Vertex(x,y,z,t); }
148148
inline void end_position (const larcv::Vertex& vtx) { _end_pt = vtx; }
@@ -195,7 +195,7 @@ namespace larcv {
195195
unsigned int _genid; ///< Original generator ID, if different from Geant4 one (e.g.: GENIE particle ID)
196196
int _pdg; ///< PDG code
197197
double _px,_py,_pz; ///< (x,y,z) component of particle's initial momentum
198-
double _px_final,_py_final,_pz_final; ///< (x,y,z) component of particle's final momentum
198+
double _end_px,_end_py,_end_pz; ///< (x,y,z) component of particle's final momentum
199199
Vertex _vtx; ///< (x,y,z,t) of particle's vertex information
200200
Vertex _end_pt; ///< (x,y,z,t) at which particle disappeared from G4WorldVolume
201201
Vertex _first_step; ///< (x,y,z,t) of the first energy deposition point in the detector

‎ups/larcv2.table‎

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,108 @@ Product=larcv2
33

44
Group:
55

6+
Flavor = ANY
7+
Qualifiers = "c14:p3915:debug"
8+
Action = DefineFQ
9+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_c14_p3915_debug)
10+
Action = GetProducts
11+
setupRequired( root v6_28_10a -q +c14:+p3915:+debug )
12+
13+
14+
Flavor = ANY
15+
Qualifiers = "c14:p3915:prof"
16+
Action = DefineFQ
17+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_c14_p3915_prof)
18+
Action = GetProducts
19+
setupRequired( root v6_28_10a -q +c14:+p3915:+prof )
20+
21+
22+
Flavor = ANY
23+
Qualifiers = "e26:p3915:debug"
24+
Action = DefineFQ
25+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_e26_p3915_debug)
26+
Action = GetProducts
27+
setupRequired( root v6_28_10a -q +e26:+p3915:+debug )
28+
29+
30+
31+
Flavor = ANY
32+
Qualifiers = "e26:p3915:prof"
33+
Action = DefineFQ
34+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_e26_p3915_prof)
35+
Action = GetProducts
36+
setupRequired( root v6_28_10a -q +e26:+p3915:+prof )
37+
38+
39+
40+
41+
Flavor = ANY
42+
Qualifiers = "c14:p3913:debug"
43+
Action = DefineFQ
44+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_c14_p3913_debug)
45+
Action = GetProducts
46+
setupRequired( root v6_26_06b -q +c14:+p3913:+debug )
47+
48+
49+
Flavor = ANY
50+
Qualifiers = "c14:p3913:prof"
51+
Action = DefineFQ
52+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_c14_p3913_prof)
53+
Action = GetProducts
54+
setupRequired( root v6_26_06b -q +c14:+p3913:+prof )
55+
56+
57+
58+
Flavor = ANY
59+
Qualifiers = "e26:p3913:debug"
60+
Action = DefineFQ
61+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_e26_p3913_debug)
62+
Action = GetProducts
63+
setupRequired( root v6_26_06b -q +e26:+p3913:+debug )
64+
65+
66+
67+
Flavor = ANY
68+
Qualifiers = "e26:p3913:prof"
69+
Action = DefineFQ
70+
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_e26_p3913_prof)
71+
Action = GetProducts
72+
setupRequired( root v6_26_06b -q +e26:+p3913:+prof )
73+
74+
75+
676

777
Flavor = ANY
878
Qualifiers = "c7:p3913:debug"
979
Action = DefineFQ
1080
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_c7_p3913_debug)
1181
Action = GetProducts
12-
setupRequired( root v6_26_06a -q +c7:+p3913:+debug )
82+
setupRequired( root v6_26_06b -q +c7:+p3913:+debug )
1383

1484

1585
Flavor = ANY
1686
Qualifiers = "c7:p3913:prof"
1787
Action = DefineFQ
1888
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_c7_p3913_prof)
1989
Action = GetProducts
20-
setupRequired( root v6_26_06a -q +c7:+p3913:+prof )
90+
setupRequired( root v6_26_06b -q +c7:+p3913:+prof )
2191

2292

2393
Flavor = ANY
2494
Qualifiers = "e20:p3913:debug"
2595
Action = DefineFQ
2696
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_e20_p3913_debug)
2797
Action = GetProducts
28-
setupRequired( root v6_26_06a -q +e20:+p3913:+debug )
98+
setupRequired( root v6_26_06b -q +e20:+p3913:+debug )
2999

30100

31101
Flavor = ANY
32102
Qualifiers = "e20:p3913:prof"
33103
Action = DefineFQ
34104
envSet(LARCV2_FQ_DIR, ${UPS_PROD_DIR}/${UPS_PROD_FLAVOR}_e20_p3913_prof)
35105
Action = GetProducts
36-
setupRequired( root v6_26_06a -q +e20:+p3913:+prof )
106+
setupRequired( root v6_26_06b -q +e20:+p3913:+prof )
107+
37108

38109

39110
Flavor = ANY

0 commit comments

Comments
 (0)