Skip to content

Commit a87141a

Browse files
committed
Merge branch 'release/v09_17_10'
2 parents 9fe95ba + 59a07d9 commit a87141a

6 files changed

Lines changed: 87 additions & 2 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.09 LANGUAGES CXX)
17+
project(sbnobj VERSION 09.17.10 LANGUAGES CXX)
1818

1919
message(STATUS
2020
"\n-- ============================================================================="
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "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: 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/TPCPMTBarycenterMatch.h"
2930

3031
#include <utility>
3132
#include <vector>

sbnobj/Common/Reco/classes_def.xml

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

249+
<class name="sbn::TPCPMTBarycenterMatch" ClassVersion="10">
250+
<version ClassVersion="10" checksum="3504890228"/>
251+
</class>
252+
<class name="std::vector<sbn::TPCPMTBarycenterMatch>" />
253+
<class name="art::Wrapper<sbn::TPCPMTBarycenterMatch>" />
254+
<class name="art::Ptr<sbn::TPCPMTBarycenterMatch>" />
255+
<class name="art::Wrapper<std::vector<sbn::TPCPMTBarycenterMatch>>" />
256+
<!-- Assns (TPCPMTBarycenterMatch, Slice) -->
257+
<class name="art::Assns<sbn::TPCPMTBarycenterMatch, recob::Slice, void>" />
258+
<class name="art::Assns<recob::Slice, sbn::TPCPMTBarycenterMatch, void>" />
259+
<class name="std::pair<sbn::TPCPMTBarycenterMatch, recob::Slice>" />
260+
<class name="std::pair<recob::Slice, sbn::TPCPMTBarycenterMatch>" />
261+
<class name="art::Wrapper<art::Assns<sbn::TPCPMTBarycenterMatch, recob::Slice, void>>" />
262+
<class name="art::Wrapper<art::Assns<recob::Slice, sbn::TPCPMTBarycenterMatch, void>>" />
263+
<!-- Assns (TPCPMTBarycenterMatch, OpFlash) -->
264+
<class name="art::Assns<sbn::TPCPMTBarycenterMatch, recob::OpFlash, void>" />
265+
<class name="art::Assns<recob::OpFlash, sbn::TPCPMTBarycenterMatch, void>" />
266+
<class name="std::pair<sbn::TPCPMTBarycenterMatch, recob::OpFlash>" />
267+
<class name="std::pair<recob::OpFlash, sbn::TPCPMTBarycenterMatch>" />
268+
<class name="art::Wrapper<art::Assns<sbn::TPCPMTBarycenterMatch, recob::OpFlash, void>>" />
269+
<class name="art::Wrapper<art::Assns<recob::OpFlash, sbn::TPCPMTBarycenterMatch, void>>" />
270+
249271
<class name="std::vector<geo::PlaneID>"/>
250272
</lcgdict>

ups/product_deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ defaultqual e26
246246
#
247247
####################################
248248
product version qual flags <table_format=2>
249-
lardataobj v09_16_03 -
249+
lardataobj v09_17_01 -
250250
cetmodules v3_21_01 - only_for_build
251251
end_product_list
252252
####################################

0 commit comments

Comments
 (0)