Skip to content

Commit d011842

Browse files
miquelnebotmiquelnebot
committed
Merge branch 'release/v09_17_11'
2 parents a87141a + a071c0e commit d011842

37 files changed

Lines changed: 955 additions & 126 deletions

‎CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1515

1616
find_package(cetmodules 3.20.00 REQUIRED)
17-
project(sbnobj VERSION 09.17.10 LANGUAGES CXX)
17+
project(sbnobj VERSION 09.17.11 LANGUAGES CXX)
1818

1919
message(STATUS
2020
"\n-- ============================================================================="
@@ -28,8 +28,7 @@ cet_cmake_env()
2828
cet_set_compiler_flags(DIAGS CAUTIOUS
2929
WERROR
3030
NO_UNDEFINED
31-
EXTRA_FLAGS -pedantic
32-
EXTRA_CXX_FLAGS -Wno-unused-local-typedefs
31+
EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs
3332
)
3433

3534
cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE)

‎sbnobj/Common/CRT/classes_def.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,13 @@
6363
<class name="std::vector<sbnd::crt::CRTTzero>"/>
6464
<class name="art::Wrapper< std::vector<sbnd::crt::CRTTzero> >"/>
6565

66-
<class name="sbnd::crt::CRTTrack" ClassVersion="10">
67-
<version ClassVersion="10" checksum="2681413750"/>
68-
</class>
69-
<class name="std::vector<sbnd::crt::CRTTrack>"/>
70-
<class name="art::Wrapper< std::vector<sbnd::crt::CRTTrack> >"/>
71-
7266
<!-- associations -->
7367

7468
<class name="art::Assns<sbnd::crt::CRTTzero, sbnd::crt::CRTHit, void>" />
7569
<class name="art::Wrapper< art::Assns<sbnd::crt::CRTTzero, sbnd::crt::CRTHit, void> >" />
7670
<class name="art::Assns<sbnd::crt::CRTHit, sbnd::crt::CRTTzero, void>" />
7771
<class name="art::Wrapper< art::Assns<sbnd::crt::CRTHit, sbnd::crt::CRTTzero, void> >" />
7872

79-
<class name="art::Assns<sbnd::crt::CRTTrack, sbnd::crt::CRTHit, void>" />
80-
<class name="art::Wrapper< art::Assns<sbnd::crt::CRTTrack, sbnd::crt::CRTHit, void> >" />
81-
<class name="art::Assns<sbnd::crt::CRTHit, sbnd::crt::CRTTrack, void>" />
82-
<class name="art::Wrapper< art::Assns<sbnd::crt::CRTHit, sbnd::crt::CRTTrack, void> >" />
83-
8473

8574
<class name="art::Assns<icarus::crt::CRTHit,sim::AuxDetIDE,void>"/>
8675
<class name="art::Assns<sim::AuxDetIDE,icarus::crt::CRTHit,void>"/>

‎sbnobj/Common/POTAccounting/EXTCountInfo.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace sbn {
1313
class EXTCountInfo {
1414
public:
15-
16-
int gates_since_last_trigger;
15+
16+
float gates_since_last_trigger;
1717

1818
};
1919
} // end namespace sbn

‎sbnobj/Common/POTAccounting/classes_def.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<version ClassVersion="11" checksum="4062206176"/>
1212
<version ClassVersion="10" checksum="3057205612"/>
1313
</class>
14-
<class name="sbn::EXTCountInfo" ClassVersion="11">
14+
<class name="sbn::EXTCountInfo" ClassVersion="12">
15+
<version ClassVersion="12" checksum="3174434766"/>
1516
<version ClassVersion="11" checksum="2738807909"/>
1617
<version ClassVersion="10" checksum="1347272"/>
1718
</class>

‎sbnobj/Common/Reco/CNNScore.cc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#include "sbnobj/Common/Reco/CNNScore.h"
2+
3+
sbn::PFPCNNScore::PFPCNNScore(float pfpTrackScore, float pfpShowerScore, float pfpNoiseScore, float pfpMichelScore, float pfpEndMichelScore, int nClusters)
4+
: pfpTrackScore(pfpTrackScore)
5+
, pfpShowerScore(pfpShowerScore)
6+
, pfpNoiseScore(pfpNoiseScore)
7+
, pfpMichelScore(pfpMichelScore)
8+
, pfpEndMichelScore(pfpEndMichelScore)
9+
, nClusters(nClusters)
10+
{
11+
}

‎sbnobj/Common/Reco/CNNScore.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include <limits>
2+
3+
#ifndef sbnobj_CNNScore_HH
4+
#define sbnobj_CNNScore_HH
5+
6+
namespace sbn {
7+
8+
constexpr float nan_float = std::numeric_limits<float>::signaling_NaN();
9+
10+
class PFPCNNScore {
11+
public:
12+
PFPCNNScore(float pfpTrackScore = nan_float, float pfpShowerScore = nan_float, float pfpNoiseScore = nan_float, float pfpMichelScore = nan_float, float pfpEndMichelScore = nan_float, int nClusters = 0);
13+
14+
float pfpTrackScore; //!< shower score for PFP, average over all associated hits
15+
float pfpShowerScore; //!< shower score for PFP, average over all associated hits
16+
float pfpNoiseScore; //!< shower score for PFP, average over all associated hits
17+
float pfpMichelScore; //!< michel score for PFP, average over all associated hits
18+
float pfpEndMichelScore; //!< end michel score for PFP, average over defined area around the endpoint
19+
int nClusters; //!< number of clusters used for calculating average score
20+
};
21+
}
22+
23+
#endif

‎sbnobj/Common/Reco/CRUMBSResult.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ sbn::CRUMBSResult::CRUMBSResult(float score, float ccnumuscore, float ccnuescore
44
float tpc_CRFracHitsInLongestTrack, float tpc_CRLongestTrackDeflection, float tpc_CRLongestTrackDirY,
55
int tpc_CRNHitsMax, float tpc_NuEigenRatioInSphere, int tpc_NuNFinalStatePfos, int tpc_NuNHitsTotal,
66
int tpc_NuNSpacePointsInSphere, float tpc_NuVertexY, float tpc_NuWeightedDirZ, float tpc_StoppingChi2CosmicRatio,
7-
float pds_FMTotalScore, float pds_FMPE, float pds_FMTime, float crt_TrackScore, float crt_HitScore,
8-
float crt_TrackTime, float crt_HitTime)
7+
float pds_FMTotalScore, float pds_FMPE, float pds_FMTime, float pds_OpT0Score, float pds_OpT0MeasuredPE,
8+
float crt_TrackScore, float crt_SPScore, float crt_TrackTime, float crt_SPTime)
99
: score(score)
1010
, ccnumuscore(ccnumuscore)
1111
, ccnuescore(ccnuescore)
@@ -26,10 +26,12 @@ sbn::CRUMBSResult::CRUMBSResult(float score, float ccnumuscore, float ccnuescore
2626
, pds_FMTotalScore(pds_FMTotalScore)
2727
, pds_FMPE(pds_FMPE)
2828
, pds_FMTime(pds_FMTime)
29+
, pds_OpT0Score(pds_OpT0Score)
30+
, pds_OpT0MeasuredPE(pds_OpT0MeasuredPE)
2931
, crt_TrackScore(crt_TrackScore)
30-
, crt_HitScore(crt_HitScore)
32+
, crt_SPScore(crt_SPScore)
3133
, crt_TrackTime(crt_TrackTime)
32-
, crt_HitTime(crt_HitTime)
34+
, crt_SPTime(crt_SPTime)
3335
{
3436
}
3537

‎sbnobj/Common/Reco/CRUMBSResult.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ namespace sbn {
1717
float tpc_CRLongestTrackDirY = default_float, int tpc_CRNHitsMax = default_int, float tpc_NuEigenRatioInSphere = default_float,
1818
int tpc_NuNFinalStatePfos = default_int, int tpc_NuNHitsTotal = default_int, int tpc_NuNSpacePointsInSphere = default_int,
1919
float tpc_NuVertexY = default_float, float tpc_NuWeightedDirZ = default_float, float tpc_StoppingChi2CosmicRatio = default_float,
20-
float pds_FMTotalScore = default_float, float pds_FMPE = default_float, float pds_FMTime = default_float, float crt_TrackScore = default_float,
21-
float crt_HitScore = default_float, float crt_TrackTime = default_float, float crt_HitTime = default_float);
20+
float pds_FMTotalScore = default_float, float pds_FMPE = default_float, float pds_FMTime = default_float, float pds_OpT0Score = default_float,
21+
float pds_OpT0MeasuredPE = default_float, float crt_TrackScore = default_float, float crt_SPScore = default_float, float crt_TrackTime = default_float,
22+
float crt_SPTime = default_float);
2223

2324
float score; //!< CRUMBS result, for inclusive neutrino signal
2425
float ccnumuscore; //!< CRUMBS result, for CCNuMu signal
@@ -40,10 +41,12 @@ namespace sbn {
4041
float pds_FMTotalScore; //!< the total flash match score
4142
float pds_FMPE; //!< the total number of photoelectrons in the associated flash
4243
float pds_FMTime; //!< the time associated with the flash [us]
44+
float pds_OpT0Score; //!< the agreement score from the OpT0 falsh matcher
45+
float pds_OpT0MeasuredPE; //!< the PE of the reconstructed flash matched by OpT0
4346
float crt_TrackScore; //!< a combination of the DCA and angle between the best matched TPC & CRT tracks
44-
float crt_HitScore; //!< the best distance from an extrapolated TPC track to a CRT hit [cm]
47+
float crt_SPScore; //!< the best distance from an extrapolated TPC track to a CRT spacepoint [cm]
4548
float crt_TrackTime; //!< the time associated with the matched CRT track [us]
46-
float crt_HitTime; //!< the time associated with the matched CRT hit [us]
49+
float crt_SPTime; //!< the time associated with the matched CRT spacepoint [us]
4750
};
4851
}
4952

‎sbnobj/Common/Reco/classes.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "sbnobj/Common/Reco/MVAPID.h"
2727
#include "sbnobj/Common/Reco/CRUMBSResult.h"
2828
#include "sbnobj/Common/Reco/OpT0FinderResult.h"
29+
#include "sbnobj/Common/Reco/CNNScore.h"
2930
#include "sbnobj/Common/Reco/TPCPMTBarycenterMatch.h"
3031

3132
#include <utility>

‎sbnobj/Common/Reco/classes_def.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@
5454
<class name="art::Assns<sbn::SimpleFlashMatch,recob::PFParticle, void>" />
5555
<class name="art::Wrapper<art::Assns<sbn::SimpleFlashMatch, recob::PFParticle, void> >" />
5656

57-
<class name="sbn::CRUMBSResult" ClassVersion="11">
57+
<class name="sbn::CRUMBSResult" ClassVersion="13">
58+
<version ClassVersion="13" checksum="2221682896"/>
59+
<version ClassVersion="12" checksum="526337898"/>
5860
<version ClassVersion="11" checksum="2038758639"/>
5961
<version ClassVersion="10" checksum="1001500335"/>
6062
</class>
@@ -92,6 +94,22 @@
9294
<class name="art::Wrapper<art::Assns<recob::OpFlash, sbn::OpT0Finder>>" />
9395
<class name="art::Wrapper<art::Assns<sbn::OpT0Finder, recob::OpFlash, void>>" />
9496

97+
<class name="sbn::PFPCNNScore" ClassVersion="15">
98+
<version ClassVersion="15" checksum="3783368588"/>
99+
<version ClassVersion="14" checksum="3262687246"/>
100+
<version ClassVersion="13" checksum="587801397"/>
101+
<version ClassVersion="12" checksum="2317961223"/>
102+
</class>
103+
<class name="std::vector<sbn::PFPCNNScore>" />
104+
<class name="art::Wrapper<sbn::PFPCNNScore>" />
105+
<class name="art::Wrapper<std::vector<sbn::PFPCNNScore>>" />
106+
107+
<class name="art::Assns<recob::PFParticle,sbn::PFPCNNScore,void>" />
108+
<class name="art::Wrapper<art::Assns<recob::PFParticle,sbn::PFPCNNScore,void>>" />
109+
110+
<class name="art::Assns<sbn::PFPCNNScore,recob::PFParticle,void>" />
111+
<class name="art::Wrapper<art::Assns<sbn::PFPCNNScore,recob::PFParticle,void>>" />
112+
95113
<class name="sbn::ShowerDensityFit" ClassVersion="10">
96114
<version ClassVersion="10" checksum="942453570"/>
97115
</class>
@@ -237,13 +255,15 @@
237255
<class name="art::Assns<recob::PFParticle, sbn::MVAPID>" />
238256
<class name="art::Wrapper<art::Assns<recob::Track, sbn::MVAPID>>" />
239257
<class name="art::Wrapper<art::Assns<recob::Shower, sbn::MVAPID>>" />
258+
<class name="art::Wrapper<art::Assns<recob::PFParticle, sbn::MVAPID>>" />
240259
<class name="art::Wrapper<art::Assns<recob::PFParticle, recob::Track, sbn::MVAPID>>" />
241260

242261
<class name="art::Assns<sbn::MVAPID, recob::Track>" />
243262
<class name="art::Assns<sbn::MVAPID, recob::Shower>" />
244263
<class name="art::Assns<sbn::MVAPID, recob::PFParticle>" />
245264
<class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::Track>>" />
246265
<class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::Shower>>" />
266+
<class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::PFParticle>>" />
247267
<class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::PFParticle, recob::Track>>" />
248268

249269
<class name="sbn::TPCPMTBarycenterMatch" ClassVersion="10">

0 commit comments

Comments
 (0)