Skip to content

Commit e446a85

Browse files
SilviaR98SilviaR98
authored
Merge pull request #53 from DUNE/feature/sand_cafs
Feature/sand cafs
2 parents 6269ef9 + 1d1b29d commit e446a85

File tree

7 files changed

+86
-13
lines changed

7 files changed

+86
-13
lines changed

‎duneanaobj/StandardRecord/SRDirectionBranch.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ namespace caf
1515
class SRDirectionBranch
1616
{
1717
public:
18-
SRVector3D lngtrk; ///< Direction reconstructed using the longest track
19-
SRVector3D heshw; ///< Direction reconstructed using the highest-energy shower
18+
SRVector3D lngtrk; ///< Direction reconstructed using the longest track
19+
SRVector3D heshw; ///< Direction reconstructed using the highest-energy shower
2020
SRVector3D calo; ///< Direction reconstructed using the calorimetric energy depositions
21+
SRVector3D part_mom_sum; ///< Direction reconstructed using the sum of reco particle momenta
2122

2223
// add others as needed
2324
};

‎duneanaobj/StandardRecord/SRECALCluster.h‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
////////////////////////////////////////////////////////////////////////
2+
/// \file SRECALCluster.h
3+
/// \brief Reconstructed ECAL cluster object
4+
/// \author D. Casazza, L. Di Noto
5+
/// \date Dec. 2024
6+
////////////////////////////////////////////////////////////////////////
7+
8+
#ifndef DUNEANAOBJ_SRECALCLUSTER_H
9+
#define DUNEANAOBJ_SRECALCLUSTER_H
10+
11+
#include "duneanaobj/StandardRecord/SRVector3D.h"
12+
#include "duneanaobj/StandardRecord/SRTrueParticle.h"
13+
14+
namespace caf
15+
{
16+
class SRECALCluster
17+
{
18+
public:
19+
int id; ///< Cluster id
20+
SRVector3D position; ///< Cluster barycenter position weighted on energy [cm]
21+
SRVector3D var_position; //< Cluster variance of x,y,z position coordinates [cm]
22+
float time; ///< Cluster time weighted on energy [ns]
23+
SRVector3D start; ///< Cluster 3D start point [cm]
24+
SRVector3D direction; ///< Cluster directiion versor
25+
float E; ///< Reconstructed energy [MeV]
26+
int num_cells; ///< Total number of cells in the cluster
27+
28+
std::vector<TrueParticleID> truth; ///< Associated SRTrueParticle(s), if relevant (use SRTruthBranch::Particle() with these IDs to grab them)
29+
std::vector<float> truthOverlap; ///< Fractional overlap between this shower and true particle
30+
};
31+
32+
}
33+
34+
#endif //DUNEANAOBJ_SRECALCluster_H

‎duneanaobj/StandardRecord/SRInteractionBranch.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ namespace caf
2020

2121
std::vector<SRInteraction> pandora; ///< Interactions from Pandora reconstruction
2222
std::size_t npandora;
23+
24+
std::vector<SRInteraction> sandreco; ///< Interactions from sadreco reconstruction
25+
std::size_t nsandreco;
26+
2327
};
2428
}
2529

‎duneanaobj/StandardRecord/SRRecoParticlesBranch.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ namespace caf
2424

2525
int npida = 0;
2626
std::vector<SRRecoParticle> pida; ///< Particles bearing weights from PIDA algorithm
27+
28+
int nsandreco = 0;
29+
std::vector<SRRecoParticle> sandreco; ///< Particles reconstructed by Sandreco code
30+
2731
};
2832

2933
} // caf

‎duneanaobj/StandardRecord/SRSAND.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "duneanaobj/StandardRecord/SRTrack.h"
1111
#include "duneanaobj/StandardRecord/SRShower.h"
1212
#include "duneanaobj/StandardRecord/SRRecoParticle.h"
13+
#include "duneanaobj/StandardRecord/SRECALCluster.h"
1314

1415

1516
namespace caf
@@ -23,6 +24,9 @@ namespace caf
2324

2425
std::vector<SRShower> showers;
2526
std::size_t nshowers = 0;
27+
28+
std::vector<SRECALCluster> ECALClusters;
29+
std::size_t nclusters=0;
2630
};
2731

2832
/// SAND reconstruction output
@@ -37,7 +41,7 @@ namespace caf
3741
};
3842

3943
std::size_t nixn = 0;
40-
std::vector<SRGArInt> ixn; ///< Reconstructed interactions
44+
std::vector<SRSANDInt> ixn; ///< Reconstructed interactions
4145

4246
};
4347

‎duneanaobj/StandardRecord/classes_def.xml‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
<version ClassVersion="10" checksum="2681983110"/>
6060
</class>
6161

62-
<class name="caf::SRInteractionBranch" ClassVersion="10">
62+
<class name="caf::SRInteractionBranch" ClassVersion="11">
63+
<version ClassVersion="11" checksum="3254538684"/>
6364
<version ClassVersion="10" checksum="1911225621"/>
6465
</class>
6566

@@ -69,8 +70,9 @@
6970
<version ClassVersion="10" checksum="2468658506"/>
7071
</class>
7172

72-
<class name="caf::SRDirectionBranch" ClassVersion="11">
73-
<version ClassVersion="11" checksum="2218604191"/>
73+
<class name="caf::SRDirectionBranch" ClassVersion="12">
74+
<version ClassVersion="12" checksum="2535179837"/>
75+
<version ClassVersion="11" checksum="1976339037"/>
7476
<version ClassVersion="10" checksum="2433306859"/>
7577
</class>
7678

@@ -85,16 +87,19 @@
8587
<version ClassVersion="10" checksum="1622576569"/>
8688
</class>
8789

88-
<class name="caf::SRNeutrinoEnergyBranch" ClassVersion="15">
89-
<version ClassVersion="15" checksum="3331961107"/>
90-
<version ClassVersion="14" checksum="1104425802"/>
90+
<class name="caf::SRNeutrinoEnergyBranch" ClassVersion="16">
91+
<version ClassVersion="16" checksum="3331961107"/>
92+
<version ClassVersion="15" checksum="3582001491"/>
93+
<version ClassVersion="14" checksum="3497414748"/>
9194
<version ClassVersion="13" checksum="3582001491"/>
9295
<version ClassVersion="12" checksum="1372801074"/>
9396
<version ClassVersion="11" checksum="3582001491"/>
9497
<version ClassVersion="10" checksum="1372801074"/>
9598
</class>
9699

97-
<class name="caf::SRRecoParticlesBranch" ClassVersion="11">
100+
<class name="caf::SRRecoParticlesBranch" ClassVersion="13">
101+
<version ClassVersion="13" checksum="1848688215"/>
102+
<version ClassVersion="12" checksum="3585828423"/>
98103
<version ClassVersion="11" checksum="3413162475"/>
99104
<version ClassVersion="10" checksum="684361603"/>
100105
</class>
@@ -144,6 +149,20 @@
144149
<class name="std::vector<caf::SRShower>">
145150
</class>
146151

152+
<class name="caf::SRECALCluster" ClassVersion="16">
153+
<version ClassVersion="16" checksum="3312245962"/>
154+
<version ClassVersion="15" checksum="1197469375"/>
155+
<version ClassVersion="14" checksum="772507687"/>
156+
<version ClassVersion="13" checksum="749498947"/>
157+
<version ClassVersion="12" checksum="0"/>
158+
<version ClassVersion="11" checksum="749498947"/>
159+
<version ClassVersion="10" checksum="2243636990"/>
160+
</class>
161+
162+
<class name="std::vector<caf::SRECALCluster>">
163+
</class>
164+
165+
147166
<!-- - - - - - - - - - FD specific - - - - - - - - - - - - - - - -->
148167

149168
<class name="caf::SRFDBranch" ClassVersion="13">
@@ -269,13 +288,20 @@
269288
<version ClassVersion="10" checksum="1667029942"/>
270289
</class>
271290

272-
<class name="caf::SRSAND" ClassVersion="13">
291+
<class name="caf::SRSAND" ClassVersion="14">
292+
<version ClassVersion="14" checksum="3811644425"/>
273293
<version ClassVersion="13" checksum="1270542721"/>
274294
<version ClassVersion="12" checksum="1233697569"/>
275295
<version ClassVersion="11" checksum="3795335384"/>
276296
<version ClassVersion="10" checksum="1443507594"/>
277297
</class>
278298

299+
<class name="caf::SRSANDInt" ClassVersion="12">
300+
<version ClassVersion="12" checksum="3038143830"/>
301+
<version ClassVersion="11" checksum="515563825"/>
302+
<version ClassVersion="10" checksum="87138233"/>
303+
</class>
304+
279305
<class name="caf::SRMINERvA" ClassVersion="10">
280306
<version ClassVersion="10" checksum="1718167975"/>
281307
</class>

‎ups/product_deps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,10 @@ end_product_list
318318
#
319319
####################################
320320
qualifier root srproxy notes
321-
e20:debug e20:p3915:debug py3915
322-
e20:prof e20:p3915:prof py3915
323321
c14:debug c14:p3915:debug py3915
324322
c14:prof c14:p3915:prof py3915
323+
e20:debug e20:p3915:debug py3915
324+
e20:prof e20:p3915:prof py3915
325325
e26:debug e26:p3915:debug py3915
326326
e26:prof e26:p3915:prof py3915
327327
end_qualifier_list

0 commit comments

Comments
 (0)