Skip to content

Commit 3443480

Browse files
kjplowskjplows
authored
Merge branch 'develop' into feature/gputnam-wiremod-gen-dev
2 parents 51bf49f + a415453 commit 3443480

12 files changed

Lines changed: 296 additions & 65 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

1818
find_package(cetmodules 3.20.00 REQUIRED)
19-
project(sbncode VERSION 10.10.02 LANGUAGES CXX)
19+
project(sbncode VERSION 10.10.03.02 LANGUAGES CXX)
2020

2121
message(STATUS "\n\n ========================== ${PROJECT_NAME} ==========================")
2222

‎sbncode/BeamSpillInfoRetriever/job/run_sbndbnbinfo_sbn.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ physics: {
3434
stream1: [ out1 ]
3535
}
3636

37-
physics.producers.sbndbnbinfo.module_type: "SBNDBNBRetriever"
37+
physics.producers.bnbinfo.module_type: "SBNDBNBRetriever"
3838

3939
outputs: {
4040
out1: {
@@ -45,4 +45,4 @@ outputs: {
4545
}
4646
}
4747

48-
physics.producers.sbndbnbinfo.fileNames: @local::outputs.out1.fileName
48+
physics.producers.bnbinfo.fileNames: @local::outputs.out1.fileName

‎sbncode/CAFMaker/CAFMakerParams.h‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace caf
1616
template<class T> using Atom = fhicl::Atom<T>;
1717
template<class T> using Sequence = fhicl::Sequence<T>;
1818
template<class T> using Table = fhicl::Table<T>;
19+
template<class T> using OptionalTable = fhicl::OptionalTable<T>;
1920
using Comment = fhicl::Comment;
2021
using Name = fhicl::Name;
2122
using string = std::string;
@@ -362,6 +363,12 @@ namespace caf
362363
"" //Empty by default, configured in icaruscode cafmaker_defs
363364
};
364365

366+
Atom<string> CorrectedOpFlashLabel {
367+
Name("CorrectedOpFlashLabel"),
368+
Comment("Label of CorrectedOpFlash containing tpc-corrected flash time."),
369+
""
370+
};
371+
365372
Atom<art::InputTag> NuGraphSliceHitLabel {
366373
Name("NuGraphSliceHitLabel"),
367374
Comment("Label of NuGraph slice hit map."),
@@ -470,6 +477,92 @@ namespace caf
470477
25.
471478
};
472479

480+
struct PFOCharLabels_t {
481+
Atom<string> EndFractionName {
482+
Name("EndFractionName"),
483+
Comment("Provide the tool name for the EndFraction BDT variable."),
484+
"LArThreeDChargeFeatureTool_EndFraction"
485+
};
486+
487+
Atom<string> FractionalSpreadName {
488+
Name("FractionalSpreadName"),
489+
Comment("Provide the tool name for the FractionalSpread BDT variable."),
490+
"LArThreeDChargeFeatureTool_FractionalSpread"
491+
};
492+
493+
Atom<string> DiffStraightLineMeanName {
494+
Name("DiffStraightLineMeanName"),
495+
Comment("Provide the tool name for the DiffStraightLineMean BDT variable."),
496+
"LArThreeDLinearFitFeatureTool_DiffStraightLineMean"
497+
};
498+
499+
Atom<string> LengthName {
500+
Name("LengthName"),
501+
Comment("Provide the tool name for the Length BDT variable."),
502+
"LArThreeDLinearFitFeatureTool_Length"
503+
};
504+
505+
Atom<string> MaxFitGapLengthName {
506+
Name("MaxFitGapLengthName"),
507+
Comment("Provide the tool name for the MaxFitGapLength BDT variable."),
508+
"LArThreeDLinearFitFeatureTool_MaxFitGapLength"
509+
};
510+
511+
Atom<string> SlidingLinearFitRMSName {
512+
Name("SlidingLinearFitRMSName"),
513+
Comment("Provide the tool name for the SlidingLinearFitRMS BDT variable."),
514+
"LArThreeDLinearFitFeatureTool_SlidingLinearFitRMS"
515+
};
516+
517+
Atom<string> AngleDiffName {
518+
Name("AngleDiffName"),
519+
Comment("Provide the tool name for the AngleDiff BDT variable."),
520+
"LArThreeDOpeningAngleFeatureTool_AngleDiff"
521+
};
522+
523+
Atom<string> SecondaryPCARatioName {
524+
Name("SecondaryPCARatioName"),
525+
Comment("Provide the tool name for the SecondaryPCARatio BDT variable."),
526+
"LArThreeDPCAFeatureTool_SecondaryPCARatio"
527+
};
528+
529+
Atom<string> TertiaryPCARatioName {
530+
Name("TertiaryPCARatioName"),
531+
Comment("Provide the tool name for the TertiaryPCARatio BDT variable."),
532+
"LArThreeDPCAFeatureTool_TertiaryPCARatio"
533+
};
534+
535+
Atom<string> VertexDistanceName {
536+
Name("VertexDistanceName"),
537+
Comment("Provide the tool name for the VertexDistance BDT variable."),
538+
"LArThreeDVertexDistanceFeatureTool_VertexDistance"
539+
};
540+
541+
Atom<string> HaloTotalRatioName {
542+
Name("HaloTotalRatioName"),
543+
Comment("Provide the tool name for the HaloTotalRatio BDT variable."),
544+
"LArConeChargeFeatureTool_HaloTotalRatio"
545+
};
546+
547+
Atom<string> ConcentrationName {
548+
Name("ConcentrationName"),
549+
Comment("Provide the tool name for the Concentration BDT variable."),
550+
"LArConeChargeFeatureTool_Concentration"
551+
552+
};
553+
554+
Atom<string> ConicalnessName {
555+
Name("ConicalnessName"),
556+
Comment("Provide the tool name for the Conicalness BDT variable."),
557+
"LArConeChargeFeatureTool_Conicalness"
558+
};
559+
};
560+
561+
OptionalTable<PFOCharLabels_t> PFOCharLabels {
562+
Name("PFOCharLabels"),
563+
Comment("Provide tool names for the Pandora track/shower discrimination BDT variables.")
564+
};
565+
473566
Atom<bool> ReferencePMTFromTriggerToBeam {
474567
Name("ReferencePMTFromTriggerToBeam"),
475568
Comment("Whether to switch the reference time of PMT reco from 'trigger' to 'beam spill' time."),

‎sbncode/CAFMaker/CAFMaker_module.cc‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +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/Common/Reco/CorrectedOpFlashTiming.h"
121122
#include "sbnobj/SBND/Timing/TimingInfo.hh"
122123
#include "sbnobj/SBND/Timing/FrameShiftInfo.hh"
123124

125+
124126
// GENIE
125127
#include "Framework/EventGen/EventRecord.h"
126128
#include "Framework/Ntuple/NtpMCEventRecord.h"
@@ -1628,6 +1630,8 @@ void CAFMaker::produce(art::Event& evt) noexcept {
16281630
// }
16291631

16301632
// try to find the result of the Flash trigger if it was run
1633+
mf::LogInfo("CAFMaker") << " New Trigger Time = " << srtrigger.global_trigger_det_time << " us\n"
1634+
<< " New Beam Gate Time = " << srtrigger.beam_gate_det_time << " us";
16311635
bool pass_flash_trig = false;
16321636
art::Handle<bool> flashtrig_handle;
16331637
GetByLabelStrict(evt, fParams.FlashTrigLabel(), flashtrig_handle);
@@ -1899,6 +1903,15 @@ void CAFMaker::produce(art::Event& evt) noexcept {
18991903
const sbn::TPCPMTBarycenterMatch *barycenterMatch
19001904
= foTPCPMTBarycenterMatch.isValid()? foTPCPMTBarycenterMatch.at(0).get(): nullptr;
19011905

1906+
1907+
art::FindManyP<sbn::CorrectedOpFlashTiming> fmCorrectedOpFlash =
1908+
FindManyPStrict<sbn::CorrectedOpFlashTiming>(sliceList, evt,
1909+
fParams.CorrectedOpFlashLabel() + slice_tag_suff);
1910+
std::vector<art::Ptr<sbn::CorrectedOpFlashTiming>> slcCorrectedOpFlash;
1911+
if (fmCorrectedOpFlash.isValid())
1912+
slcCorrectedOpFlash = fmCorrectedOpFlash.at(0);
1913+
1914+
19021915
art::FindOneP<lcvn::Result> foCVNResult =
19031916
FindOnePStrict<lcvn::Result>(sliceList, evt,
19041917
fParams.CVNLabel() + slice_tag_suff);
@@ -2154,6 +2167,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
21542167
FillSliceOpT0Finder(slcOpT0, recslc);
21552168
FillSliceBarycenter(slcHits, slcSpacePoints, recslc);
21562169
FillTPCPMTBarycenterMatch(barycenterMatch, recslc);
2170+
FillCorrectedOpFlashTiming(slcCorrectedOpFlash, recslc);
21572171
FillCVNScores(cvnResult, recslc);
21582172

21592173
// select slice
@@ -2253,7 +2267,24 @@ void CAFMaker::produce(art::Event& evt) noexcept {
22532267
}
22542268

22552269
const larpandoraobj::PFParticleMetadata *pfpMeta = (fmPFPMeta.at(iPart).empty()) ? NULL : fmPFPMeta.at(iPart).at(0).get();
2256-
FillPFPVars(thisParticle, primary, pfpMeta, thisPFPT0, pfp);
2270+
caf::CAFMakerParams::PFOCharLabels_t const& pfoCharParams
2271+
= fParams.PFOCharLabels().value_or(caf::CAFMakerParams::PFOCharLabels_t{});
2272+
const caf::PFOCharLabelsStruct pfoCharLabels {
2273+
pfoCharParams.EndFractionName(),
2274+
pfoCharParams.FractionalSpreadName(),
2275+
pfoCharParams.DiffStraightLineMeanName(),
2276+
pfoCharParams.LengthName(),
2277+
pfoCharParams.MaxFitGapLengthName(),
2278+
pfoCharParams.SlidingLinearFitRMSName(),
2279+
pfoCharParams.AngleDiffName(),
2280+
pfoCharParams.SecondaryPCARatioName(),
2281+
pfoCharParams.TertiaryPCARatioName(),
2282+
pfoCharParams.VertexDistanceName(),
2283+
pfoCharParams.HaloTotalRatioName(),
2284+
pfoCharParams.ConcentrationName(),
2285+
pfoCharParams.ConicalnessName()
2286+
};
2287+
FillPFPVars(thisParticle, primary, pfpMeta, thisPFPT0, pfp, pfoCharLabels);
22572288

22582289
if (fmCNNScores.isValid()) {
22592290
const sbn::PFPCNNScore *cnnScores = fmCNNScores.at(iPart).at(0).get();
@@ -2526,6 +2557,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
25262557
rec.hdr.ismc = !isRealData;
25272558
rec.hdr.det = fDet;
25282559
rec.hdr.fno = fFileNumber;
2560+
25292561
if(fFirstInSubRun)
25302562
{
25312563
rec.hdr.nbnbinfo = fBNBInfo.size();
@@ -2566,13 +2598,13 @@ void CAFMaker::produce(art::Event& evt) noexcept {
25662598
else {
25672599
std::cout << "Did not find this event in the spill info map." << std::endl;
25682600
}
2569-
2601+
25702602
if(fRecTree){
25712603
// Save the standard-record
25722604
StandardRecord* prec = &rec;
2605+
25732606
fRecTree->SetBranchAddress("rec", &prec);
25742607
fRecTree->Fill();
2575-
25762608
if(fFlatTree){
25772609
fFlatRecord->Clear();
25782610
fFlatRecord->Fill(rec);

‎sbncode/CAFMaker/FillReco.cxx‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,24 @@ namespace caf
295295
}
296296
}
297297

298+
299+
void FillCorrectedOpFlashTiming(const std::vector<art::Ptr<sbn::CorrectedOpFlashTiming>> &slcCorrectedOpFlash,
300+
caf::SRSlice& slice)
301+
{
302+
slice.correctedOpFlash.setDefault();
303+
if ( slcCorrectedOpFlash.empty()==false ) {
304+
const sbn::CorrectedOpFlashTiming &_correctedOpFlash = *slcCorrectedOpFlash[0];
305+
//TODO: use the score of the match to fill the information accordingly
306+
slice.correctedOpFlash.OpFlashT0 = _correctedOpFlash.OpFlashT0;
307+
slice.correctedOpFlash.UpstreamTime_lightonly = _correctedOpFlash.UpstreamTime_lightonly;
308+
slice.correctedOpFlash.UpstreamTime_tpczcorr = _correctedOpFlash.UpstreamTime_tpczcorr;
309+
slice.correctedOpFlash.UpstreamTime_propcorr_tpczcorr = _correctedOpFlash.UpstreamTime_propcorr_tpczcorr;
310+
slice.correctedOpFlash.FMScore = _correctedOpFlash.FMScore;
311+
slice.correctedOpFlash.SliceNuScore = _correctedOpFlash.SliceNuScore;
312+
}
313+
}
314+
315+
298316
std::vector<float> double_to_float_vector(const std::vector<double>& v)
299317
{
300318
std::vector<float> ret;
@@ -1005,6 +1023,7 @@ namespace caf
10051023
const larpandoraobj::PFParticleMetadata *pfpMeta,
10061024
const art::Ptr<anab::T0> t0,
10071025
caf::SRPFP& srpfp,
1026+
const PFOCharLabelsStruct& pfoCharLabels,
10081027
bool allowEmpty)
10091028
{
10101029
srpfp.id = particle.Self();
@@ -1028,19 +1047,19 @@ namespace caf
10281047
// Pfo Characterisation features
10291048
srpfp.pfochar.setDefault();
10301049

1031-
CopyPropertyIfSet(propertiesMap, "LArThreeDChargeFeatureTool_EndFraction", srpfp.pfochar.chgendfrac);
1032-
CopyPropertyIfSet(propertiesMap, "LArThreeDChargeFeatureTool_FractionalSpread", srpfp.pfochar.chgfracspread);
1033-
CopyPropertyIfSet(propertiesMap, "LArThreeDLinearFitFeatureTool_DiffStraightLineMean", srpfp.pfochar.linfitdiff);
1034-
CopyPropertyIfSet(propertiesMap, "LArThreeDLinearFitFeatureTool_Length", srpfp.pfochar.linfitlen);
1035-
CopyPropertyIfSet(propertiesMap, "LArThreeDLinearFitFeatureTool_MaxFitGapLength", srpfp.pfochar.linfitgaplen);
1036-
CopyPropertyIfSet(propertiesMap, "LArThreeDLinearFitFeatureTool_SlidingLinearFitRMS", srpfp.pfochar.linfitrms);
1037-
CopyPropertyIfSet(propertiesMap, "LArThreeDOpeningAngleFeatureTool_AngleDiff", srpfp.pfochar.openanglediff);
1038-
CopyPropertyIfSet(propertiesMap, "LArThreeDPCAFeatureTool_SecondaryPCARatio", srpfp.pfochar.pca2ratio);
1039-
CopyPropertyIfSet(propertiesMap, "LArThreeDPCAFeatureTool_TertiaryPCARatio", srpfp.pfochar.pca3ratio);
1040-
CopyPropertyIfSet(propertiesMap, "LArThreeDVertexDistanceFeatureTool_VertexDistance", srpfp.pfochar.vtxdist);
1041-
CopyPropertyIfSet(propertiesMap, "LArConeChargeFeatureTool_HaloTotalRatio", srpfp.pfochar.halototratio);
1042-
CopyPropertyIfSet(propertiesMap, "LArConeChargeFeatureTool_Concentration", srpfp.pfochar.concentration);
1043-
CopyPropertyIfSet(propertiesMap, "LArConeChargeFeatureTool_Conicalness", srpfp.pfochar.conicalness);
1050+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.EndFractionName, srpfp.pfochar.chgendfrac);
1051+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.FractionalSpreadName, srpfp.pfochar.chgfracspread);
1052+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.DiffStraightLineMeanName, srpfp.pfochar.linfitdiff);
1053+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.LengthName, srpfp.pfochar.linfitlen);
1054+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.MaxFitGapLengthName, srpfp.pfochar.linfitgaplen);
1055+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.SlidingLinearFitRMSName, srpfp.pfochar.linfitrms);
1056+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.AngleDiffName, srpfp.pfochar.openanglediff);
1057+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.SecondaryPCARatioName, srpfp.pfochar.pca2ratio);
1058+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.TertiaryPCARatioName, srpfp.pfochar.pca3ratio);
1059+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.VertexDistanceName, srpfp.pfochar.vtxdist);
1060+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.HaloTotalRatioName, srpfp.pfochar.halototratio);
1061+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.ConcentrationName, srpfp.pfochar.concentration);
1062+
CopyPropertyIfSet(propertiesMap, pfoCharLabels.ConicalnessName, srpfp.pfochar.conicalness);
10441063
}
10451064
if (t0) {
10461065
srpfp.t0 = t0->Time() / 1e3; /* ns -> us */
@@ -1163,6 +1182,8 @@ namespace caf
11631182
slice.barycenterFM.deltaZ_Trigger = matchInfo->deltaZ_Trigger;
11641183
slice.barycenterFM.deltaY_Trigger = matchInfo->deltaY_Trigger;
11651184
slice.barycenterFM.radius_Trigger = matchInfo->radius_Trigger;
1185+
slice.barycenterFM.score = matchInfo->score;
1186+
slice.barycenterFM.chi2 = matchInfo->chi2;
11661187
}
11671188
}
11681189

‎sbncode/CAFMaker/FillReco.h‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "sbnobj/Common/Reco/CRUMBSResult.h"
3737
#include "sbnobj/Common/Reco/OpT0FinderResult.h"
3838
#include "sbnobj/Common/Reco/TPCPMTBarycenterMatch.h"
39+
#include "sbnobj/Common/Reco/CorrectedOpFlashTiming.h"
3940
#include "sbnobj/Common/CRT/CRTHit.hh"
4041
#include "sbnobj/Common/CRT/CRTTrack.hh"
4142
#include "sbnobj/SBND/CRT/CRTSpacePoint.hh"
@@ -140,12 +141,29 @@ namespace caf
140141
caf::SRHit& srhit,
141142
bool allowEmpty = false);
142143

144+
struct PFOCharLabelsStruct {
145+
std::string EndFractionName;
146+
std::string FractionalSpreadName;
147+
std::string DiffStraightLineMeanName;
148+
std::string LengthName;
149+
std::string MaxFitGapLengthName;
150+
std::string SlidingLinearFitRMSName;
151+
std::string AngleDiffName;
152+
std::string SecondaryPCARatioName;
153+
std::string TertiaryPCARatioName;
154+
std::string VertexDistanceName;
155+
std::string HaloTotalRatioName;
156+
std::string ConcentrationName;
157+
std::string ConicalnessName;
158+
};
159+
143160
void FillPFPVars(const recob::PFParticle &particle,
144161
const recob::PFParticle *primary,
145162
const larpandoraobj::PFParticleMetadata *pfpMeta,
146163
const art::Ptr<anab::T0> t0,
147164
caf::SRPFP& srpfp,
148-
bool allowEmpty= false);
165+
const PFOCharLabelsStruct& pfoCharLabels,
166+
bool allowEmpty = false);
149167

150168
void FillCNNScores(const recob::PFParticle &particle,
151169
const sbn::PFPCNNScore *cnnscore,
@@ -277,6 +295,9 @@ namespace caf
277295
void FillTPCPMTBarycenterMatch(const sbn::TPCPMTBarycenterMatch *matchInfo,
278296
caf::SRSlice& slice);
279297

298+
void FillCorrectedOpFlashTiming(const std::vector<art::Ptr<sbn::CorrectedOpFlashTiming>> &slcCorrectedOpFlash,
299+
caf::SRSlice& slice);
300+
280301
void FillCVNScores(const lcvn::Result *cvnResult,
281302
caf::SRSlice& slice);
282303

‎sbncode/CAFMaker/FillTrigger.cxx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
#include<iostream>
22
#include "sbncode/CAFMaker/FillTrigger.h"
33

44
namespace caf
@@ -12,7 +12,10 @@ namespace caf
1212
triggerInfo.beam_gate_time_abs = addltrig_info.beamGateTimestamp;
1313
triggerInfo.beam_gate_det_time = trig.BeamGateTime() + time_offset;
1414
triggerInfo.global_trigger_det_time = trig.TriggerTime() + time_offset;
15+
std::cout << "Gen triggerInfo.global_trigger_det_time: " << triggerInfo.global_trigger_det_time << std::endl;
16+
std::cout << "Gen triggerInfo.beam_gate_det_time: " << triggerInfo.beam_gate_det_time << std::endl;
1517
double diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time;
18+
std::cout << "diff_ts: " << diff_ts << std::endl;
1619
triggerInfo.trigger_within_gate = diff_ts;
1720

1821
triggerInfo.prev_global_trigger_time = addltrig_info.previousTriggerTimestamp;
@@ -39,8 +42,10 @@ namespace caf
3942

4043
triggerInfo.global_trigger_time = timingInfo.hltEtrig;
4144
triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate;
42-
45+
std::cout << "triggerInfo.global_trigger_det_time: " << triggerInfo.global_trigger_det_time << std::endl;
46+
std::cout << "triggerInfo.beam_gate_det_time: " << triggerInfo.beam_gate_det_time << std::endl;
4347
double diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time;
48+
std::cout << "diff_ts: " << diff_ts << std::endl;
4449
triggerInfo.trigger_within_gate = diff_ts;
4550
}
4651

0 commit comments

Comments
 (0)