Skip to content

Commit 5c1d374

Browse files
author
Brinden Carlson
committed
Merge branch 'release/v09_91_02_02'
2 parents c174568 + 6f33d20 commit 5c1d374

17 files changed

Lines changed: 385 additions & 494 deletions

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

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

2222
# for CI:
23-
# project(sbndcode VERSION 09.91.02.01)
23+
# project(sbndcode VERSION 09.91.02.02)
2424

2525
message(STATUS "\n")
2626
message(STATUS "================================= ${PROJECT_NAME} =================================")

‎sbndcode/Commissioning/HitDumper_module.cc‎

Lines changed: 264 additions & 463 deletions
Large diffs are not rendered by default.

‎sbndcode/Commissioning/fcls/hitdumpermodule.fcl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ hitdumper:
77
MaxHits: 100000
88
MaxOpHits: 100000
99
MaxSamples: 5001
10-
MaxCRTHits: 5000
11-
MaxCRTTracks: 10
10+
MaxCRTStripHits: 5000
11+
MaxCRTSpacePoints: 500
12+
MaxCRTTracks: 100
1213

1314
DigitModuleLabel: "daq"
1415
HitsModuleLabel: "fasthit"
1516
OpHitsModuleLabel: ["ophitpmt", "ophitxarapuca"]
16-
CRTHitModuleLabel: "crthit"
17-
CRTStripModuleLabel: "crt"
18-
CRTTrackModuleLabel: "crttrack"
17+
CRTStripHitModuleLabel: "crtstrips"
18+
CRTSpacePointModuleLabel: "crtspacepoints"
19+
CRTTrackModuleLabel: "crttracks"
1920
pmtTriggerModuleLabel: "pmttriggerproducer"
2021
pmtSoftTriggerModuleLabel:"pmtSoftwareTrigger"
2122
crtSoftTriggerModuleLabel:"MetricProducer"
@@ -25,12 +26,11 @@ hitdumper:
2526
MCTrackModuleLabel: "mcreco"
2627
MCShowerModuleLabel: "mcreco"
2728

28-
keepCRThits: true
29-
keepCRTstrips: false
30-
makeCRTtracks: false
31-
readCRTtracks: true
29+
KeepCRTStripHits: true
30+
KeepCRTSpacePoints: false
31+
KeepCRTTracks: false
3232
readOpHits: true
33-
readpmtTrigger: true
33+
readpmtTrigger: true
3434
readpmtSoftTrigger: true
3535
readcrtSoftTrigger: false
3636
readMuonTracks: false

‎sbndcode/Commissioning/fcls/reco1_comm_muontrack_crtreco.fcl‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#include "muontrackmodule.fcl"
2+
#include "reco1_comm.fcl"
3+
4+
physics.producers.fasthit: @local::standard_fasthitfinder
5+
physics.producers.MuonTrackProducer: @local::MuonTrackProducer
6+
7+
physics.producers.crtclustering: @local::crtclusterproducer_sbnd
8+
physics.producers.crtspacepoints: @local::crtspacepointproducer_sbnd
9+
physics.producers.crttracks: @local::crttrackproducer_sbnd
10+
11+
physics.reco1comm: [ rns
12+
, opdecopmt
13+
, opdecoxarapuca
14+
, ophitpmt
15+
, ophitxarapuca
16+
, crtstrips
17+
, crtclustering
18+
, crtspacepoints
19+
, crttracks
20+
, fasthit
21+
, MuonTrackProducer
22+
]
23+
24+
physics.trigger_paths: [ reco1comm ]
25+
26+
physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
27+
physics.producers.fasthit.MinSigInd: 15.0
28+
physics.producers.fasthit.MinSigCol: 15.0
29+
physics.producers.fasthit.SkipInd: false
30+
# parameter below enlarges the window of the hit symmetrically by adding
31+
# this many widths to each side. Original window is above threshold.
32+
# Both thresh and larger window in this file are appropriate only when
33+
# noise is turned off.
34+
physics.producers.fasthit.IncludeMoreTail: 3.0
35+
physics.producers.fasthit.ColMinWidth: 100.0
36+
physics.producers.fasthit.UncompressWithPed: false
37+
38+
# override hitdumper defaults
39+
physics.analyzers.hitdumper.readMuonHits: true
40+
physics.analyzers.hitdumper.readMuonTracks: true
41+
physics.analyzers.hitdumper.KeepCRTStripHits: true
42+
physics.analyzers.hitdumper.KeepCRTTracks: true
43+
physics.analyzers.hitdumper.KeepCRTSpacePoints: true
44+
physics.analyzers.hitdumper.readpmtTrigger: false
45+
physics.analyzers.hitdumper.readpmtSoftTrigger: false

‎sbndcode/Commissioning/fcls/run_muontrack.fcl‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,12 @@ physics:
9191
}
9292

9393
# override hitdumper defaults
94-
physics.analyzers.hitdumper.keepCRThits: false
95-
physics.analyzers.hitdumper.makeCRTtracks: false
96-
physics.analyzers.hitdumper.readCRTtracks: false
97-
physics.analyzers.hitdumper.readOpHits: false
98-
physics.analyzers.hitdumper.readTruth: false
99-
physics.analyzers.hitdumper.savePOTinfo: false
100-
physics.analyzers.hitdumper.readMuonHits: true
101-
physics.analyzers.hitdumper.SelectEvents: [reco]
94+
physics.analyzers.hitdumper.KeepCRTStripHits: false
95+
physics.analyzers.hitdumper.readOpHits: false
96+
physics.analyzers.hitdumper.readTruth: false
97+
physics.analyzers.hitdumper.savePOTinfo: false
98+
physics.analyzers.hitdumper.readMuonHits: true
99+
physics.analyzers.hitdumper.SelectEvents: [reco]
102100

103101
# set thresholds
104102
physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
@@ -111,4 +109,4 @@ physics.producers.fasthit.SkipInd: false
111109
# noise is turned off.
112110
physics.producers.fasthit.IncludeMoreTail: 3.0
113111
physics.producers.fasthit.ColMinWidth: 100.0
114-
physics.producers.fasthit.UncompressWithPed: false
112+
physics.producers.fasthit.UncompressWithPed: false

‎sbndcode/Commissioning/fcls/run_muontrack_crtreco.fcl‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#include "crtrecoproducers_sbnd.fcl"
2+
#include "run_muontrack.fcl"
3+
4+
physics.producers.crtclustering: @local::crtclusterproducer_sbnd
5+
physics.producers.crtspacepoints: @local::crtspacepointproducer_sbnd
6+
physics.producers.crttracks: @local::crttrackproducer_sbnd
7+
8+
physics.reco: [ fasthit, MuonTrackProducer, MuonTrackFilter, crtclustering, crtspacepoints, crttracks ]
9+
physics.ana: [ hitdumper ]
10+
11+
# override hitdumper defaults
12+
physics.analyzers.hitdumper.readMuonHits: true
13+
physics.analyzers.hitdumper.readMuonTracks: true
14+
physics.analyzers.hitdumper.KeepCRTStripHits: true
15+
physics.analyzers.hitdumper.KeepCRTTracks: true
16+
physics.analyzers.hitdumper.KeepCRTSpacePoints: true
17+
physics.analyzers.hitdumper.readpmtTrigger: false
18+
physics.analyzers.hitdumper.readpmtSoftTrigger: false
19+
physics.analyzers.hitdumper.readOpHits: true
20+
physics.analyzers.hitdumper.readTruth: true
21+
physics.analyzers.hitdumper.savePOTinfo: true

‎sbndcode/Decoders/TPC/SBNDTPCDecoder_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void daq::SBNDTPCDecoder::produce(art::Event & event)
138138
// by downstream processes if need be, but we are
139139
// done with them here
140140

141-
daq_handle.removeProduct();
141+
if ( daq_handle.isValid() ) daq_handle.removeProduct();
142142
}
143143

144144

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ physics.producers.cafmaker.CreateBlindedCAF: false
141141
# Save GENIE event record for MC
142142
# Turn this to false for data CAFMaker
143143
# More details can be found in here: https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=36869
144-
#physics.producers.cafmaker.SaveGENIEEventRecord: true #comment to get CI to run on v09_90_00. This should be uncommented in v09_91_01 and later.
144+
physics.producers.cafmaker.SaveGENIEEventRecord: true
145145

146146
# Include Simple/OpFlashes for PMT/XARAPUCA
147147
physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]

‎sbndcode/LArSoftConfigurations/messages_sbnd.fcl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ message_errorfile_sbnd: {
8484
append: false
8585
threshold: "ERROR"
8686
categories: {
87+
#Turn down verbosity of modules with many messages
88+
SimDriftElectrons: {
89+
limit: 0
90+
}
91+
#ParticleListActionService can be removed once this PR 53 in larg4 is merged
92+
ParticleListActionService: {
93+
limit: 0
94+
}
8795
default: {}
8896
}
8997
} # message_errorfile_sbnd
@@ -97,6 +105,14 @@ message_stdout_warning_sbnd: {
97105
threshold: "WARNING"
98106
categories:{
99107
default: {}
108+
#Turn down verbosity of modules with many messages
109+
SimDriftElectrons: {
110+
limit: 0
111+
}
112+
#ParticleListActionService can be removed once this PR 53 in larg4 is merged
113+
ParticleListActionService: {
114+
limit: 0
115+
}
100116
GeometryBadInputPoint: { limit: 5 timespan: 1000}
101117
}
102118
} # message_stdout_warning_sbnd

‎sbndcode/Utilities/detectorproperties_sbnd.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ BEGIN_PROLOG
55
sbnd_detproperties: @local::standard_detproperties
66
sbnd_detproperties.Temperature: 88.4 # measured in ArgoNeut (MicroBooNE measured 89K, arXiv:1910.01430)
77
sbnd_detproperties.Efield: [0.5,0.666,0.8] #reasonable values
8-
sbnd_detproperties.Electronlifetime: 10.0e3 # microseconds
8+
sbnd_detproperties.Electronlifetime: 100.0e3 # microseconds
99
sbnd_detproperties.ElectronsToADC: 6.29778e-3
1010
sbnd_detproperties.TimeOffsetU: 0.
1111
sbnd_detproperties.TimeOffsetV: 0.

0 commit comments

Comments
 (0)