Skip to content

Commit 63bd2b4

Browse files
kjplowskjplows
authored
Merge branch 'develop' into feature/lynnt_cafpot_dev
2 parents 5ee3fb2 + b1f47a8 commit 63bd2b4

4 files changed

Lines changed: 61 additions & 7 deletions

File tree

‎sbncode/CAFMaker/CAFMakerParams.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,12 @@ namespace caf
345345
"crttracks" // sbnd
346346
};
347347

348+
Atom<string> SBNDCRTVetoLabel {
349+
Name("SBNDCRTVetoLabel"),
350+
Comment("Label of sbnd CRT Veto."),
351+
"crtveto" // sbnd
352+
};
353+
348354
Atom<string> SBNDFrameShiftInfoLabel {
349355
Name("SBNDFrameShiftInfoLabel"),
350356
Comment("Label of sbnd frame shift."),

‎sbncode/CAFMaker/CAFMaker_module.cc‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@
118118
#include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
119119
#include "sbnobj/Common/Reco/CRUMBSResult.h"
120120
#include "sbnobj/Common/Reco/OpT0FinderResult.h"
121+
#include "sbnobj/SBND/CRT/CRTVeto.hh"
121122
#include "sbnobj/Common/Reco/CorrectedOpFlashTiming.h"
122123
#include "sbnobj/SBND/Timing/TimingInfo.hh"
123124
#include "sbnobj/SBND/Timing/FrameShiftInfo.hh"
124125

125-
126126
// GENIE
127127
#include "Framework/EventGen/EventRecord.h"
128128
#include "Framework/Ntuple/NtpMCEventRecord.h"
@@ -267,6 +267,8 @@ class CAFMaker : public art::EDProducer {
267267
double fGenieEvtRec_brEvtXSec = 0.0; ////< Cross section for selected event (1e-38 cm2)
268268
double fGenieEvtRec_brEvtDXSec = 0.0; ////< Cross section for selected event kinematics (1e-38 cm2 / {K^n})
269269
unsigned int fGenieEvtRec_brEvtKPS = 0; ////< Kinematic phase space variables. See $GENIE/src/Framework/Conventions/KinePhaseSpace.h -> KinePhaseSpace_t
270+
int fGenieEvtRec_brSctType = 0; ///< See [`genie::EScatteringType`](https://hep.ph.liv.ac.uk/~costasa/genie_doxygen/master/html/namespacegenie.html#ab97d2b4d1f37af8d967dadd15be88d0b)
271+
int fGenieEvtRec_brIntType = 0; ///< See [`genie::EInteractionType`](https://hep.ph.liv.ac.uk/~costasa/genie_doxygen/master/html/namespacegenie.html#a554f81bb9954c9e46bbabadfcd403111)
270272
double fGenieEvtRec_brEvtWght = 0.0; ////< Weight for that event
271273
double fGenieEvtRec_brEvtProb = 0.0; ////< Probability for that event (given cross section, path lengths, etc)
272274
double fGenieEvtRec_brEvtVtx[4] = {0.0}; ////< Event vertex position in detector coord syst (SI)
@@ -1198,6 +1200,8 @@ void CAFMaker::InitializeOutfiles()
11981200
fFlatGenieTree->Branch("GenieEvtRec.EvtXSec", &fGenieEvtRec_brEvtXSec, "GenieEvtRec.EvtXSec/D" );
11991201
fFlatGenieTree->Branch("GenieEvtRec.EvtDXSec", &fGenieEvtRec_brEvtDXSec, "GenieEvtRec.EvtDXSec/D" );
12001202
fFlatGenieTree->Branch("GenieEvtRec.EvtKPS", &fGenieEvtRec_brEvtKPS, "GenieEvtRec.EvtKPS/i" );
1203+
fFlatGenieTree->Branch("GenieEvtRec.SctType", &fGenieEvtRec_brSctType, "GenieEvtRec.SctType/I" );
1204+
fFlatGenieTree->Branch("GenieEvtRec.IntType", &fGenieEvtRec_brIntType, "GenieEvtRec.IntType/I" );
12011205
fFlatGenieTree->Branch("GenieEvtRec.EvtWght", &fGenieEvtRec_brEvtWght, "GenieEvtRec.EvtWght/D" );
12021206
fFlatGenieTree->Branch("GenieEvtRec.EvtProb", &fGenieEvtRec_brEvtProb, "GenieEvtRec.EvtProb/D" );
12031207
fFlatGenieTree->Branch("GenieEvtRec.EvtVtx", fGenieEvtRec_brEvtVtx, "GenieEvtRec.EvtVtx[4]/D" );
@@ -1564,6 +1568,8 @@ void CAFMaker::produce(art::Event& evt) noexcept {
15641568
fGenieEvtRec_brEvtXSec = genie_rec->XSec() * (1e+38/genie::units::cm2);
15651569
fGenieEvtRec_brEvtDXSec = genie_rec->DiffXSec() * (1e+38/genie::units::cm2);
15661570
fGenieEvtRec_brEvtKPS = genie_rec->DiffXSecVars();
1571+
fGenieEvtRec_brSctType = genie_rec->Summary()->ProcInfo().ScatteringTypeId();
1572+
fGenieEvtRec_brIntType = genie_rec->Summary()->ProcInfo().InteractionTypeId();
15671573
fGenieEvtRec_brEvtWght = genie_rec->Weight();
15681574
fGenieEvtRec_brEvtProb = genie_rec->Probability();
15691575
fGenieEvtRec_brEvtVtx[0] = genie_rec->Vertex()->X();
@@ -1730,6 +1736,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
17301736
std::vector<caf::SRCRTTrack> srcrttracks;
17311737
std::vector<caf::SRCRTSpacePoint> srcrtspacepoints;
17321738
std::vector<caf::SRSBNDCRTTrack> srsbndcrttracks;
1739+
caf::SRSBNDCRTVeto srsbndcrtveto;
17331740
caf::SRSBNDFrameShiftInfo srsbndframeshiftinfo;
17341741
caf::SRSBNDTimingInfo srsbndtiminginfo;
17351742

@@ -1800,6 +1807,24 @@ void CAFMaker::produce(art::Event& evt) noexcept {
18001807
FillSBNDCRTTrack(sbndcrttracks[i], srsbndcrttracks.back());
18011808
}
18021809
}
1810+
1811+
// Fill CRT Veto
1812+
art::Handle<std::vector<sbnd::crt::CRTVeto>> sbndcrtveto_handle;
1813+
GetByLabelStrict(evt, fParams.SBNDCRTVetoLabel(), sbndcrtveto_handle);
1814+
// fill into event
1815+
if (sbndcrtveto_handle.isValid()) {
1816+
const std::vector<sbnd::crt::CRTVeto> &sbndcrtveto_vec = *sbndcrtveto_handle;
1817+
// Only one valid veto per event
1818+
if (sbndcrtveto_vec.size() == 1) {
1819+
// And associated SpacePoint objects
1820+
art::FindManyP<sbnd::crt::CRTSpacePoint> spAssoc(sbndcrtveto_handle, evt, fParams.SBNDCRTVetoLabel());
1821+
if (spAssoc.isValid()) {
1822+
// There is one vector of SpacePoints per Veto --> can be empty if no veto condition was satisfied
1823+
const std::vector<art::Ptr<sbnd::crt::CRTSpacePoint>>& veto_sp_v(spAssoc.at(0));
1824+
FillSBNDCRTVeto(sbndcrtveto_vec[0], veto_sp_v, srsbndcrtveto);
1825+
}
1826+
}
1827+
}
18031828

18041829
art::Handle<sbnd::timing::FrameShiftInfo> sbndframeshiftinfo_handle;
18051830
GetByLabelStrict(evt, fParams.SBNDFrameShiftInfoLabel(), sbndframeshiftinfo_handle);
@@ -2558,6 +2583,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
25582583
rec.ncrt_spacepoints = srcrtspacepoints.size();
25592584
rec.sbnd_crt_tracks = srsbndcrttracks;
25602585
rec.nsbnd_crt_tracks = srsbndcrttracks.size();
2586+
rec.sbnd_crt_veto = srsbndcrtveto;
25612587
rec.opflashes = srflashes;
25622588
rec.nopflashes = srflashes.size();
25632589
rec.sbnd_frames = srsbndframeshiftinfo;

‎sbncode/CAFMaker/FillReco.cxx‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,25 @@ namespace caf
188188
srsbndcrttrack.tof = track.ToF();
189189
}
190190

191+
void FillSBNDCRTVeto(const sbnd::crt::CRTVeto &veto,
192+
const std::vector<art::Ptr<sbnd::crt::CRTSpacePoint>> &points,
193+
caf::SRSBNDCRTVeto &srsbndcrtveto,
194+
bool allowEmpty)
195+
{
196+
srsbndcrtveto.V0 = veto.V0();
197+
srsbndcrtveto.V1 = veto.V1();
198+
srsbndcrtveto.V2 = veto.V2();
199+
srsbndcrtveto.V3 = veto.V3();
200+
srsbndcrtveto.V4 = veto.V4();
201+
202+
// add the CRTSpacePoint associations to the SR Veto
203+
for(auto const& sp : points) {
204+
srsbndcrtveto.sp_position.emplace_back(sp->X(), sp->Y(), sp->Z());
205+
srsbndcrtveto.sp_time.push_back(sp->Ts0()); // ns for SBND CRT SpacePoints
206+
srsbndcrtveto.sp_pe.push_back(sp->PE());
207+
}
208+
}
209+
191210
void FillSBNDFrameShiftInfo(const sbnd::timing::FrameShiftInfo &frame,
192211
caf::SRSBNDFrameShiftInfo &srsbndframe,
193212
bool allowEmpty)
@@ -349,13 +368,10 @@ namespace caf
349368
slice.correctedOpFlash.setDefault();
350369
if ( slcCorrectedOpFlash.empty()==false ) {
351370
const sbn::CorrectedOpFlashTiming &_correctedOpFlash = *slcCorrectedOpFlash[0];
352-
//TODO: use the score of the match to fill the information accordingly
353371
slice.correctedOpFlash.OpFlashT0 = _correctedOpFlash.OpFlashT0;
354-
slice.correctedOpFlash.UpstreamTime_lightonly = _correctedOpFlash.UpstreamTime_lightonly;
355-
slice.correctedOpFlash.UpstreamTime_tpczcorr = _correctedOpFlash.UpstreamTime_tpczcorr;
356-
slice.correctedOpFlash.UpstreamTime_propcorr_tpczcorr = _correctedOpFlash.UpstreamTime_propcorr_tpczcorr;
357-
slice.correctedOpFlash.FMScore = _correctedOpFlash.FMScore;
358-
slice.correctedOpFlash.SliceNuScore = _correctedOpFlash.SliceNuScore;
372+
slice.correctedOpFlash.NuToFLight = _correctedOpFlash.NuToFLight;
373+
slice.correctedOpFlash.NuToFCharge = _correctedOpFlash.NuToFCharge;
374+
slice.correctedOpFlash.OpFlashT0Corrected = _correctedOpFlash.OpFlashT0Corrected;
359375
}
360376
}
361377

‎sbncode/CAFMaker/FillReco.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "sbnobj/Common/CRT/CRTTrack.hh"
4343
#include "sbnobj/SBND/CRT/CRTSpacePoint.hh"
4444
#include "sbnobj/SBND/CRT/CRTTrack.hh"
45+
#include "sbnobj/SBND/CRT/CRTVeto.hh"
4546
#include "sbnobj/Common/CRT/CRTPMTMatching.hh"
4647
#include "sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh"
4748
#include "sbnobj/Common/PMT/Data/PMTBeamSignal.hh"
@@ -277,6 +278,11 @@ namespace caf
277278
void FillSBNDCRTTrack(const sbnd::crt::CRTTrack &track,
278279
caf::SRSBNDCRTTrack &srsbndcrttrack,
279280
bool allowEmpty = false);
281+
282+
void FillSBNDCRTVeto(const sbnd::crt::CRTVeto &veto,
283+
const std::vector<art::Ptr<sbnd::crt::CRTSpacePoint>> &points,
284+
caf::SRSBNDCRTVeto &srsbndcrtveto,
285+
bool allowEmpty = false);
280286

281287
void FillICARUSOpFlash(const recob::OpFlash &flash,
282288
std::vector<recob::OpHit const*> const& hits,

0 commit comments

Comments
 (0)