Skip to content

Commit f2be19e

Browse files
nathanielerowenathanielerowe
authored
Merge branch 'develop' into bugfix/acastill_lightproptime
2 parents efc3bba + 327befc commit f2be19e

45 files changed

Lines changed: 597 additions & 56 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

18-
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.11.01.01)
18+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.12.02)
1919
find_package(cetmodules REQUIRED)
2020
project(sbndcode LANGUAGES CXX)
2121

‎sbndcode/BlipRecoSBND/blipreco_configs.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ BEGIN_PROLOG
55
# Main BlipAlg settings
66
sbnd_blipalg:
77
{
8-
HitProducer: "gaushit" #// input recob::Hits to use for blip reconstruction
9-
TrkProducer: "pandoraTrack" #// input recob::Tracks to use for blip reconstruction
8+
HitProducer: "specialblipgaushit" #// input recob::Hits to use for blip reconstruction
9+
TrkProducer: "blipPandoraTrackCopy" #// input recob::Tracks to use for blip reconstruction
1010
GeantProducer: "largeant" #// input sim::MCParticles (getting true particle info)
1111
SimEDepProducer: "ionandscint" #// input sim::SimEnergyDeposits (getting energy/electrons deposited)
1212
SimChanProducer: "simdrift" #// label for sim::SimChannels (getting drifted charge; optional)

‎sbndcode/CRT/CRTAna/CRTAnalysis_module.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,9 +1748,9 @@ void sbnd::crt::CRTAnalysis::AnalyseTPCMatching(const art::Event &e, const art::
17481748
_tpc_tr_ts1[nActualTracks] = crttrack->Ts1();
17491749
_tpc_tr_score[nActualTracks] = trackMatch.TriggerConfidence();
17501750

1751-
const std::set<CRTTagger> taggers = crttrack->Taggers();
1752-
const geo::Point_t start = crttrack->Start();
1753-
const geo::Point_t end = crttrack->End();
1751+
const std::vector<CRTTagger> taggers = crttrack->Taggers();
1752+
const geo::Point_t start = crttrack->Start();
1753+
const geo::Point_t end = crttrack->End();
17541754

17551755
_tpc_tr_taggers[nActualTracks] = std::vector<int>();
17561756

‎sbndcode/CRT/CRTEventDisplay/CRTEventDisplayAlg.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ namespace sbnd::crt {
597597
if(trackTime < fMinTime || trackTime > fMaxTime)
598598
continue;
599599

600-
std::set<CRTTagger> taggers = track->Taggers();
600+
std::vector<CRTTagger> taggers = track->Taggers();
601601

602602
bool none = fChoseTaggers;
603603
for(auto const& tagger : taggers)

‎sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
238238

239239
const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE() + tertiarySpacePoint->PE();
240240

241-
const std::set<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger(), tertiaryCluster->Tagger()};
241+
const std::vector<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger(), tertiaryCluster->Tagger()};
242242

243243
geo::Point_t fitStart, fitMid, fitEnd;
244244
double gof;
@@ -264,7 +264,7 @@ std::vector<std::pair<sbnd::crt::CRTTrack, std::set<unsigned>>> sbnd::crt::CRTTr
264264

265265
const double pe = primarySpacePoint->PE() + secondarySpacePoint->PE();
266266

267-
const std::set<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger()};
267+
const std::vector<CRTTagger> used_taggers = {primaryCluster->Tagger(), secondaryCluster->Tagger()};
268268

269269
const CRTTrack track(start, end, t0, et0, t1, et1, pe, tof, used_taggers);
270270
const std::set<unsigned> used_spacepoints = {i, ii};

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
1414
physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
1515
physics.producers.cafmaker.CVNLabel: "cvnSCE"
1616
physics.producers.cafmaker.CorrectedOpFlashLabel: "lightpropagationcorrectionSCE"
17+
physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
1718

1819
physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE"
1920
physics.producers.cnnid.PFParticleModuleLabel: "pandoraSCE"

‎sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ physics.producers.cafmaker.CVNLabel: "cvnSCE"
1818

1919
physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE"
2020
physics.producers.cnnid.PFParticleModuleLabel: "pandoraSCE"
21+
physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
2122

2223
physics.producers.pandoraTrackMCS.TrackLabel: "pandoraSCETrack"
2324
physics.producers.pandoraTrackRange.TrackLabel: "pandoraSCETrack"

‎sbndcode/JobConfigurations/standard/gen/MeVPrtl/prodMeVPrtl_hnl_nuee_m_125_Um4_1p00e7_TPC_sbnd.fcl‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include "prodMeVPrtl_hnl_sbnd.fcl"
2+
3+
###----------Set mass of HNL [GeV]----------###
4+
hnlM: 0.125
5+
physics.producers.generator.Flux.M: @local::hnlM
6+
physics.producers.generator.RayTrace.ReferencePrtlMass: @local::hnlM
7+
physics.producers.generator.Decay.ReferenceHNLMass: @local::hnlM
8+
9+
###----------Set mixing angle of HNL ----------###
10+
Ume4: 0
11+
Umu4: 1.00e-7
12+
Umt4: 0
13+
physics.producers.generator.Flux.MagUe4: @local::Ume4
14+
physics.producers.generator.Flux.MagUm4: @local::Umu4
15+
physics.producers.generator.Decay.ReferenceUE4: @local::Ume4
16+
physics.producers.generator.Decay.ReferenceUM4: @local::Umu4
17+
physics.producers.generator.Decay.ReferenceUT4: @local::Umt4
18+
physics.producers.generator.Decay.Decays: ["nu_e_e"]
19+
20+
###-----------Verbose--------------###
21+
#include "set_MeVPrtl_Verbose.fcl"
22+
23+
###----------Set geometry ----------###
24+
#include "set_MeVPrtl_GeoTPC.fcl"

‎sbndcode/JobConfigurations/standard/gen/MeVPrtl/prodMeVPrtl_hnl_nuee_m_140_Um4_1p00e7_TPC_sbnd.fcl‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include "prodMeVPrtl_hnl_sbnd.fcl"
2+
3+
###----------Set mass of HNL [GeV]----------###
4+
hnlM: 0.140
5+
physics.producers.generator.Flux.M: @local::hnlM
6+
physics.producers.generator.RayTrace.ReferencePrtlMass: @local::hnlM
7+
physics.producers.generator.Decay.ReferenceHNLMass: @local::hnlM
8+
9+
###----------Set mixing angle of HNL ----------###
10+
Ume4: 0
11+
Umu4: 1.00e-7
12+
Umt4: 0
13+
physics.producers.generator.Flux.MagUe4: @local::Ume4
14+
physics.producers.generator.Flux.MagUm4: @local::Umu4
15+
physics.producers.generator.Decay.ReferenceUE4: @local::Ume4
16+
physics.producers.generator.Decay.ReferenceUM4: @local::Umu4
17+
physics.producers.generator.Decay.ReferenceUT4: @local::Umt4
18+
physics.producers.generator.Decay.Decays: ["nu_e_e"]
19+
20+
###-----------Verbose--------------###
21+
#include "set_MeVPrtl_Verbose.fcl"
22+
23+
###----------Set geometry ----------###
24+
#include "set_MeVPrtl_GeoTPC.fcl"

‎sbndcode/JobConfigurations/standard/gen/MeVPrtl/prodMeVPrtl_hnl_nuee_m_35_Um4_1p00e7_TPC_sbnd.fcl‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include "prodMeVPrtl_hnl_sbnd.fcl"
2+
3+
###----------Set mass of HNL [GeV]----------###
4+
hnlM: 0.035
5+
physics.producers.generator.Flux.M: @local::hnlM
6+
physics.producers.generator.RayTrace.ReferencePrtlMass: @local::hnlM
7+
physics.producers.generator.Decay.ReferenceHNLMass: @local::hnlM
8+
9+
###----------Set mixing angle of HNL ----------###
10+
Ume4: 0
11+
Umu4: 1.00e-7
12+
Umt4: 0
13+
physics.producers.generator.Flux.MagUe4: @local::Ume4
14+
physics.producers.generator.Flux.MagUm4: @local::Umu4
15+
physics.producers.generator.Decay.ReferenceUE4: @local::Ume4
16+
physics.producers.generator.Decay.ReferenceUM4: @local::Umu4
17+
physics.producers.generator.Decay.ReferenceUT4: @local::Umt4
18+
physics.producers.generator.Decay.Decays: ["nu_e_e"]
19+
20+
###-----------Verbose--------------###
21+
#include "set_MeVPrtl_Verbose.fcl"
22+
23+
###----------Set geometry ----------###
24+
#include "set_MeVPrtl_GeoTPC.fcl"

0 commit comments

Comments
 (0)