Skip to content

Commit a208af3

Browse files
nathanielerowenathanielerowe
authored
Merge branch 'develop' into trj_digital_noise_event_filter_oct9_2025
2 parents 0f90a9c + 42821aa commit a208af3

8 files changed

Lines changed: 57 additions & 4 deletions

‎sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,19 @@ sbnd_reco2_producers:{
3434
pandoraShowerSBN: @local::sbnd_sbn_pandoraModularShowerCreation
3535
pandoraCalo: @local::sbnd_gnewcalomc
3636
pandoraPid: @local::sbnd_chi2pid
37-
37+
pandoraLikePid: @local::sbnd_likepid
3838

3939
pandoraSCECalo: @local::sbnd_gnewcalomc
4040
pandoraSCEPid: @local::sbnd_chi2pid
41+
pandoraSCELikePid: @local::sbnd_likepid
4142

4243
pandoraCaloData: @local::sbnd_gnewcalodata
4344
pandoraPidData: @local::sbnd_chi2pid
45+
pandoraLikePidData: @local::sbnd_likepid
4446

4547
pandoraSCECaloData: @local::sbnd_gnewcalodata
4648
pandoraSCEPidData: @local::sbnd_chi2pid
49+
pandoraSCELikePidData: @local::sbnd_likepid
4750

4851
### SCE-aware pandora:
4952
pandoraSCE: @local::scecorrection
@@ -97,6 +100,7 @@ sbnd_reco2_producer_sequence: [
97100
, pandoraShowerSBN
98101
, pandoraCalo
99102
, pandoraPid
103+
, pandoraLikePid
100104
, crtveto
101105
, crtspacepointmatching
102106
, crttrackmatching
@@ -113,6 +117,7 @@ sbnd_reco2_producer_sequence: [
113117
, pandoraSCEShowerSBN
114118
, pandoraSCECalo
115119
, pandoraSCEPid
120+
, pandoraSCELikePid
116121
, crtspacepointmatchingSCE
117122
, crttrackmatchingSCE
118123
, fmatchSCE
@@ -133,27 +138,35 @@ sbnd_reco2_producers.pandoraCalo.FieldDistortionEfield: false
133138
sbnd_reco2_producers.pandoraCalo.TrackIsFieldDistortionCorrected: false
134139
sbnd_reco2_producers.pandoraPid.TrackModuleLabel: "pandoraTrack"
135140
sbnd_reco2_producers.pandoraPid.CalorimetryModuleLabel: "pandoraCalo"
141+
sbnd_reco2_producers.pandoraLikePid.TrackModuleLabel: "pandoraTrack"
142+
sbnd_reco2_producers.pandoraLikePid.CalorimetryModuleLabel: "pandoraCalo"
136143

137144
sbnd_reco2_producers.pandoraSCECalo.TrackModuleLabel: "pandoraSCETrack"
138145
sbnd_reco2_producers.pandoraSCECalo.FieldDistortion: true
139146
sbnd_reco2_producers.pandoraSCECalo.FieldDistortionEfield: true
140147
sbnd_reco2_producers.pandoraSCECalo.TrackIsFieldDistortionCorrected:true
141148
sbnd_reco2_producers.pandoraSCEPid.TrackModuleLabel: "pandoraSCETrack"
142149
sbnd_reco2_producers.pandoraSCEPid.CalorimetryModuleLabel: "pandoraSCECalo"
150+
sbnd_reco2_producers.pandoraSCELikePid.TrackModuleLabel: "pandoraSCETrack"
151+
sbnd_reco2_producers.pandoraSCELikePid.CalorimetryModuleLabel: "pandoraSCECalo"
143152

144153
sbnd_reco2_producers.pandoraCaloData.TrackModuleLabel: "pandoraTrack"
145154
sbnd_reco2_producers.pandoraCaloData.FieldDistortion: false
146155
sbnd_reco2_producers.pandoraCaloData.FieldDistortionEfield: false
147156
sbnd_reco2_producers.pandoraCaloData.TrackIsFieldDistortionCorrected: false
148157
sbnd_reco2_producers.pandoraPidData.TrackModuleLabel: "pandoraTrack"
149158
sbnd_reco2_producers.pandoraPidData.CalorimetryModuleLabel: "pandoraCaloData"
159+
sbnd_reco2_producers.pandoraLikePidData.TrackModuleLabel: "pandoraTrack"
160+
sbnd_reco2_producers.pandoraLikePidData.CalorimetryModuleLabel: "pandoraCaloData"
150161

151162
sbnd_reco2_producers.pandoraSCECaloData.TrackModuleLabel: "pandoraSCETrack"
152163
sbnd_reco2_producers.pandoraSCECaloData.FieldDistortion: true
153164
sbnd_reco2_producers.pandoraSCECaloData.FieldDistortionEfield: true
154165
sbnd_reco2_producers.pandoraSCECaloData.TrackIsFieldDistortionCorrected: true
155166
sbnd_reco2_producers.pandoraSCEPidData.TrackModuleLabel: "pandoraSCETrack"
156167
sbnd_reco2_producers.pandoraSCEPidData.CalorimetryModuleLabel: "pandoraSCECaloData"
168+
sbnd_reco2_producers.pandoraSCELikePidData.TrackModuleLabel: "pandoraSCETrack"
169+
sbnd_reco2_producers.pandoraSCELikePidData.CalorimetryModuleLabel: "pandoraSCECaloData"
157170

158171
sbnd_reco2_producers.cvn.SliceLabel: "pandora"
159172
sbnd_reco2_producers.cvn.PFParticleModuleLabel: "pandora"

‎sbndcode/JobConfigurations/standard/reco/reco2_data.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ physics.producers:
4141
frameshift: @local::frameshift_data
4242
}
4343

44-
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData,
44+
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData,
4545
cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,
46-
pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData,
46+
pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData, pandoraSCELikePidData,
4747
cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
4848
caloskimCalorimetry, blipreco, lightpropagationcorrectionSCE, frameshift]
4949

‎sbndcode/LArSoftConfigurations/particleid_sbnd.fcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@ sbnd_chi2pid:
99
Chi2PIDAlg: @local::standard_chi2pidalg
1010
}
1111

12+
sbnd_likepid:
13+
{
14+
module_type: "LikelihoodParticleID"
15+
TrackModuleLabel: "spacepts"
16+
CalorimetryModuleLabel: "calo"
17+
LikelihoodPIDAlg: @local::standard_likelihoodpidalg
18+
}
19+
1220
END_PROLOG

‎sbndcode/WireCell/wcsimsp_sbnd.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ sbnd_wcls_simsp.wcls_main.structs: {
7373
## Transverse diffusion constant [cm2/s]
7474
DT: 8.8
7575
## Electron lifetime [ms]
76-
lifetime: 100.0
76+
lifetime: 35.0
7777
## Electron drift speed, assumes 0.5 kV/cm and 88.4 K. Units: mm/us
7878
driftSpeed: 1.563
7979
## simulated front porch size [us]

‎test/ci/sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
#include "standard_detsim_sbnd.fcl"
22

33
services.NuRandomService.policy: "perEvent"
4+
5+
#Adding these drops because the WireCell Toolkit simulation
6+
# is not deterministic, but they would like to keep these
7+
# in main production to further develop.
8+
outputs.out1.outputCommands: [ "keep *_*_*_*"
9+
,"drop *_simtpc2d_badmasks_*"
10+
,"drop *_simtpc2d_badchannels_*"
11+
]

‎test/ci/sbnd_ci_nucosmics_detsim_seq_test_sbndcode.fcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
11
#include "sbnd_ci_nucosmics_detsim_quick_test_sbndcode.fcl"
2+
3+
#Adding these drops because the WireCell Toolkit simulation
4+
# is not deterministic, but they would like to keep these
5+
# in main production to further develop.
6+
outputs.out1.outputCommands: [ "keep *_*_*_*"
7+
,"drop *_simtpc2d_badmasks_*"
8+
,"drop *_simtpc2d_badchannels_*"
9+
]

‎test/ci/sbnd_ci_single_detsim_quick_test_sbndcode.fcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,11 @@
22

33
services.NuRandomService.policy: "perEvent"
44

5+
6+
#Adding these drops because the WireCell Toolkit simulation
7+
# is not deterministic, but they would like to keep these
8+
# in main production to further develop.
9+
outputs.out1.outputCommands: [ "keep *_*_*_*"
10+
,"drop *_simtpc2d_badmasks_*"
11+
,"drop *_simtpc2d_badchannels_*"
12+
]

‎test/ci/sbnd_ci_single_detsim_seq_test_sbndcode.fcl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
11
#include "sbnd_ci_single_detsim_quick_test_sbndcode.fcl"
2+
3+
#Adding these drops because the WireCell Toolkit simulation
4+
# is not deterministic, but they would like to keep these
5+
# in main production to further develop.
6+
outputs.out1.outputCommands: [ "keep *_*_*_*"
7+
,"drop *_simtpc2d_badmasks_*"
8+
,"drop *_simtpc2d_badchannels_*"
9+
]

0 commit comments

Comments
 (0)