Skip to content

Commit 5e2c797

Browse files
author
Mun Jung Jung
committed
Merge branch 'feature/munjung-cnn_hit_class_michel' of https://github.com/SBNSoftware/sbnobj into feature/munjung-cnn_hit_class_michel
pull for checksum update
2 parents 25cf28d + 83fd38b commit 5e2c797

12 files changed

Lines changed: 104 additions & 5 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
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.07 LANGUAGES CXX)
17+
project(sbnobj VERSION 09.17.10 LANGUAGES CXX)
1818

1919
message(STATUS
2020
"\n-- ============================================================================="

‎sbnobj/Common/Calibration/TrackCaloSkimmerObj.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define SBN_TrackCaloSkimmerObj
33

44
#include <climits>
5+
#include <limits> // for std::numeric_limits
56

67
#include <vector>
78

@@ -206,6 +207,9 @@ namespace sbn {
206207
std::vector<TrueHit> truehits1; //!< List of True "hits" of this particle on Plane 1
207208
std::vector<TrueHit> truehits2; //!< List of True "hits" of this particle on Plane 2
208209

210+
std::vector<Vector3D> traj; //!< True trajectory of particle
211+
std::vector<Vector3D> traj_sce; //!< True trajectory of particle, deflected by space charge
212+
209213
TrueParticle():
210214
plane0VisE(std::numeric_limits<float>::signaling_NaN()),
211215
plane1VisE(std::numeric_limits<float>::signaling_NaN()),

‎sbnobj/Common/Calibration/classes_def.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<class name="sbn::TrackTruth" ClassVersion="10">
66
<version ClassVersion="10" checksum="2749399767"/>
77
</class>
8-
<class name="sbn::TrueParticle" ClassVersion="11">
8+
<class name="sbn::TrueParticle" ClassVersion="12">
9+
<version ClassVersion="12" checksum="3355992085"/>
910
<version ClassVersion="11" checksum="855399631"/>
1011
<version ClassVersion="10" checksum="2150513055"/>
1112
</class>

‎sbnobj/Common/PMT/Data/V1730channelConfiguration.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define SBNOBJ_COMMON_PMT_DATA_V1730CHANNELCONFIGURATION_H
1111

1212
// LArSoft libraries
13+
#include <cstdint> // uint16_t in OpDetWaveform.h
1314
#include "lardataobj/RawData/OpDetWaveform.h" // raw::Channel_t
1415

1516
// C/C++ standard libraries

‎sbnobj/Common/Reco/MVAPID.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "messagefacility/MessageLogger/MessageLogger.h"
55

66
#include <algorithm>
7+
#include <limits> // for std::numeric_limits
78

89
void sbn::MVAPID::AddScore(int pdg, float score)
910
{

‎sbnobj/Common/Reco/TPCPMTBarycenterMatch.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "sbnobj/Common/Reco/TPCPMTBarycenterMatch.h"

‎sbnobj/Common/Reco/TPCPMTBarycenterMatch.h‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/**
2+
* @file sbnobj/Common/Reco/TPCPMTBarycenterMatch.h
3+
* @author Jack Smedley (jsmedley@fnal.gov)
4+
* @date June 21, 2023
5+
*
6+
*/
7+
8+
#include <limits>
9+
#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
10+
11+
12+
#ifndef SBNOBJ_COMMON_RECO_TPCPMTBARYCENTERMATCH_H
13+
#define SBNOBJ_COMMON_RECO_TPCPMTBARYCENTERMATCH_H
14+
15+
namespace sbn {
16+
/**
17+
* @brief Information on matching of a reconstructed TPC object with a optical flash via barycenter matching algorithm.
18+
*/
19+
class TPCPMTBarycenterMatch {
20+
public:
21+
22+
// NaN value to initialize data members
23+
static constexpr float fDefault = std::numeric_limits<float>::signaling_NaN();
24+
25+
/// @name Data members related to the slice barycenter determination
26+
/// @{
27+
float chargeTotal { fDefault }; ///< Total charge in slice contributing to barycenter (integrated ADC counts)
28+
float chargeCenterXLocal { fDefault }; ///< Weighted mean X position of spacepoints, measured with respect to the cathode (cm)
29+
geo::Point_t chargeCenter { fDefault, fDefault, fDefault }; ///< Weighted mean spacepoint position in X,Y,Z (cm)
30+
geo::Vector_t chargeWidth { fDefault, fDefault, fDefault }; ///< Weighted standard devitation of spacepoint position in X,Y,Z (cm)
31+
/// @}
32+
33+
34+
/// @name Data members related to matched recob::OpFlash, also reachable by association
35+
/// @{
36+
float flashTime { fDefault }; ///< Matched OpFlash time (us)
37+
float flashFirstHit { fDefault }; ///< Time of first OpHit in matched OpFlash (us)
38+
float flashPEs { fDefault }; ///< Total PEs in matched flash
39+
float flashAsymmetry { fDefault }; ///< East-West asymmetry of PEs in matched flash
40+
geo::Point_t flashCenter { fDefault, fDefault, fDefault }; ///< Weighted mean ophit position in X,Y,Z [no meaingful X info for ophits] (cm)
41+
geo::Vector_t flashWidth { fDefault, fDefault, fDefault }; ///< Weighted standard devitation of ophit position in X,Y,Z [no meaingful X info for ophits] (cm)
42+
/// @}
43+
44+
45+
/// @name Data members related to quality of match
46+
/// @{
47+
float deltaY { fDefault }; ///< | Matched flash Y center - charge Y center | (cm)
48+
float deltaZ { fDefault }; ///< | Matched flash Z center - charge Z center | (cm)
49+
float radius { fDefault }; ///< Hypotenuse of DeltaY and DeltaZ (cm)
50+
float deltaT { fDefault }; ///< | Matched flash time - anab::T0 | when available (us)
51+
float overlapY { fDefault }; ///< Spatial overlap of flash and charge centroids in Y [>0] OR distance apart if no overlap [<0] (cm)
52+
float overlapZ { fDefault }; ///< Spatial overlap of flash and charge centroids in Z [>0] OR distance apart if no overlap [<0] (cm)
53+
float deltaZ_Trigger { fDefault }; ///< | Triggering flash Z center - charge Z center | (cm)
54+
float deltaY_Trigger { fDefault }; ///< | Triggering flash Y center - charge Y center | (cm)
55+
float radius_Trigger { fDefault }; ///< Hypotenuse of DeltaY_Trigger and DeltaZ_Trigger (cm)
56+
/// @}
57+
58+
};
59+
}
60+
61+
#endif

‎sbnobj/Common/Reco/classes.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "sbnobj/Common/Reco/CRUMBSResult.h"
2828
#include "sbnobj/Common/Reco/OpT0FinderResult.h"
2929
#include "sbnobj/Common/Reco/CNNScore.h"
30+
#include "sbnobj/Common/Reco/TPCPMTBarycenterMatch.h"
31+
3032

3133
#include <utility>
3234
#include <vector>

‎sbnobj/Common/Reco/classes_def.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,5 +262,27 @@
262262
<class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::Shower>>" />
263263
<class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::PFParticle, recob::Track>>" />
264264

265+
<class name="sbn::TPCPMTBarycenterMatch" ClassVersion="10">
266+
<version ClassVersion="10" checksum="3504890228"/>
267+
</class>
268+
<class name="std::vector<sbn::TPCPMTBarycenterMatch>" />
269+
<class name="art::Wrapper<sbn::TPCPMTBarycenterMatch>" />
270+
<class name="art::Ptr<sbn::TPCPMTBarycenterMatch>" />
271+
<class name="art::Wrapper<std::vector<sbn::TPCPMTBarycenterMatch>>" />
272+
<!-- Assns (TPCPMTBarycenterMatch, Slice) -->
273+
<class name="art::Assns<sbn::TPCPMTBarycenterMatch, recob::Slice, void>" />
274+
<class name="art::Assns<recob::Slice, sbn::TPCPMTBarycenterMatch, void>" />
275+
<class name="std::pair<sbn::TPCPMTBarycenterMatch, recob::Slice>" />
276+
<class name="std::pair<recob::Slice, sbn::TPCPMTBarycenterMatch>" />
277+
<class name="art::Wrapper<art::Assns<sbn::TPCPMTBarycenterMatch, recob::Slice, void>>" />
278+
<class name="art::Wrapper<art::Assns<recob::Slice, sbn::TPCPMTBarycenterMatch, void>>" />
279+
<!-- Assns (TPCPMTBarycenterMatch, OpFlash) -->
280+
<class name="art::Assns<sbn::TPCPMTBarycenterMatch, recob::OpFlash, void>" />
281+
<class name="art::Assns<recob::OpFlash, sbn::TPCPMTBarycenterMatch, void>" />
282+
<class name="std::pair<sbn::TPCPMTBarycenterMatch, recob::OpFlash>" />
283+
<class name="std::pair<recob::OpFlash, sbn::TPCPMTBarycenterMatch>" />
284+
<class name="art::Wrapper<art::Assns<sbn::TPCPMTBarycenterMatch, recob::OpFlash, void>>" />
285+
<class name="art::Wrapper<art::Assns<recob::OpFlash, sbn::TPCPMTBarycenterMatch, void>>" />
286+
265287
<class name="std::vector<geo::PlaneID>"/>
266288
</lcgdict>

‎sbnobj/ICARUS/PMT/Trigger/Data/TriggerGateData.tcc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@ auto icarus::trigger::TriggerGateData<TK, TI>::SymmetricCombination(
428428
struct GateStatus_t {
429429
// protecting against Clang bug 33298 (at least until Clang 8)
430430
// (https://bugs.llvm.org/show_bug.cgi?id=33298)
431-
#if defined(__clang__) && (__clang_major__ < 9)
431+
// both c7 and c14 complain
432+
#if defined(__clang__)
432433
# pragma clang diagnostic push
433434
# pragma clang diagnostic ignored "-Wunused-local-typedef"
434435
#endif // __clang_major__ < 9

0 commit comments

Comments
 (0)