Skip to content

Commit 2ae4206

Browse files
nathanielerowenathanielerowe
committed
Merge branch 'release/v10_14_02'
2 parents 56156b4 + 6ff86f1 commit 2ae4206

25 files changed

Lines changed: 185 additions & 94 deletions

‎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.14.00.01)
18+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.02)
1919
find_package(cetmodules REQUIRED)
2020
project(sbndcode LANGUAGES CXX)
2121

‎sbndcode/Calibration/configurations/calibration_database_PDS_TagSets_sbnd.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ BEGIN_PROLOG
1010

1111
# For SBND 2025 Fall production
1212
PDS_CalibrationTags_Nov2025: {
13-
PMTCalibrationDatabaseTag: "v2r1"
14-
DatabaseTimeStamp: 1763157679000000000
13+
PMTCalibrationDatabaseTag: "v3r1"
14+
DatabaseTimeStamp: 1765487620000000000
1515
}
1616

1717
END_PROLOG

‎sbndcode/Decoders/PMT/pmtdecoder.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pmtdecoder:
4848
hist_evt: 1 # the # of the event used to generate the histograms, 1st event by default
4949

5050
# trigger configurable
51-
mon_threshold: 15 # ADC channel value threshold to add 1 to the trigger response MON pulse
51+
mon_threshold: 50 # ADC channel value threshold to add 1 to the trigger response MON pulse
5252

5353
# for when the fragIDs are mapped to the old configuration or you need to hardcode fragids...
5454
## to use this, must set `fragid_offset` to 0!!!

‎sbndcode/JobConfigurations/standard/gen/MultiPart/run_mpvmpr_exotics_sbnd.fcl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Description: an override for the default SBND MPV/MPR generator that
2+
# adds kaons (charged and neutral), lambdas, and the neutral sigma
3+
# baryon to the MPV generator.
4+
# Author: mueller@fnal.gov
5+
6+
#include "run_mpvmpr_sbnd.fcl"
7+
8+
physics.producers.generator.ParticleParameter.PDGCode : [[-11,11,-13,13], [111] , [211,-211], [2212] , [22] , [310] , [321,-321] , [3212,3122] ]
9+
physics.producers.generator.ParticleParameter.MinMulti : [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ]
10+
physics.producers.generator.ParticleParameter.MaxMulti : [ 1 , 2 , 2 , 4 , 2 , 1 , 1 , 1 ]
11+
physics.producers.generator.ParticleParameter.ProbWeight : [ 3 , 1 , 1 , 3 , 1 , 1 , 1 , 1 ]
12+
physics.producers.generator.ParticleParameter.KERange : [ [0.0,3.0] , [0.0,1.0] , [0.0,1.0] , [0.0,1.0] , [0.0,1.0] , [0.0,1.5] , [0.0,1.5] , [0.0,0.7] ]
13+
14+
outputs.out1.fileName: "prodmpvmpr_exotics_sbnd_%p-%tc.root"

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,11 @@ sbnd_reco1_producers.gaushit.CalDataModuleLabel:
8383
sbnd_reco1_producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
8484
sbnd_reco1_producers.gaushitTruthMatch.HitParticleAssociations.HitModuleLabel: "gaushit"
8585
sbnd_reco1_producers.specialblipgaushit.CalDataModuleLabel: "simtpc2d:gauss"
86-
sbnd_reco1_producers.specialblipgaushit.MinHitHeightPlane0: 8
87-
sbnd_reco1_producers.specialblipgaushit.MinHitHeightPlane1: 15
88-
sbnd_reco1_producers.specialblipgaushit.MinHitHeightPlane2: 5
89-
sbnd_reco1_producers.blipgaushitTruthMatch.HitParticleAssociations.HitModuleLabel: "specialblipgaushit"
86+
sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane0.MinHitHeight: 8
87+
sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane1.MinHitHeight: 20
88+
sbnd_reco1_producers.specialblipgaushit.HitFinderToolVec.CandidateHitsPlane2.MinHitHeight: 5
89+
sbnd_reco1_producers.blipgaushitTruthMatch.HitParticleAssociations.HitModuleLabel: "specialblipgaushit"
90+
sbnd_reco1_producers.blipgaushitTruthMatch.HitParticleAssociations.HitModuleLabelVec: ["specialblipgaushit"]
9091
sbnd_reco1_filters: {
9192
#filter events based on the number of reconstructed hits (avoids overly messy data events)
9293
numberofhitsfilter: @local::sbnd_numberofhitsfilter

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ sbnd_reco2_producers:{
5353
### SCE-aware pandora:
5454
pandoraSCE: @local::scecorrection
5555
pandoraSCETrack: @local::sbnd_pandoraTrackCreation
56+
blipPandoraSCE: @local::scecorrection
57+
blipPandoraSCETrack:@local::sbnd_pandoraTrackCreation
5658
pandoraSCEShower: @local::sbnd_sce_incremental_pandoraModularShowerCreation
5759
pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreation
5860

@@ -77,8 +79,8 @@ sbnd_reco2_producers:{
7779
fmatchoparaSCE: @local::sbnd_simple_flashmatch_opara_sce
7880
opt0finder: @local::sbnd_opt0_finder_one_to_many
7981
opt0finderSCE: @local::sbnd_opt0_finder_one_to_many
80-
tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer
81-
tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCE
82+
tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducerMC
83+
tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCEMC
8284

8385
### Uncalibrated calorimetry producer for calibration caloskimmer
8486
caloskimCalorimetry: @local::caloskim_calorimetry
@@ -192,10 +194,15 @@ sbnd_reco2_producers.opt0finderSCE.CaloProducer: "pandoraSCECalo"
192194
sbnd_reco2_producers.pandoraSCE.T0Labels: []
193195
sbnd_reco2_producers.pandoraSCE.T0LabelsCorrectT0: []
194196
sbnd_reco2_producers.pandoraSCE.CorrectNoT0Tag: true
197+
sbnd_reco2_producers.blipPandoraSCE.T0Labels: []
198+
sbnd_reco2_producers.blipPandoraSCE.T0LabelsCorrectT0: []
199+
sbnd_reco2_producers.blipPandoraSCE.CorrectNoT0Tag: true
195200
# point track/shower creation to the SCE pandora
196201
sbnd_reco2_producers.pandoraSCETrack.PFParticleLabel: "pandoraSCE"
197202
sbnd_reco2_producers.pandoraSCEShower.PFParticleLabel: "pandoraSCE"
198203
sbnd_reco2_producers.pandoraSCEShowerSBN.PFParticleLabel: "pandoraSCE"
204+
sbnd_reco2_producers.blipPandoraSCETrack.PFParticleLabel: "blipPandoraSCE"
205+
199206

200207
sbnd_reco2_producers.crtspacepointmatchingSCE.TPCTrackModuleLabel: "pandoraSCETrack"
201208
sbnd_reco2_producers.crtspacepointmatchingSCE.PFPModuleLabel: "pandoraSCE"

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#Nominal configuration uses dnn (ind) + trad (col) for hit finding.
2+
#Blip requires trad (all) for hit finding.
3+
#This fcl configures everything to use the nominal config (dnn + trad)
4+
5+
#include "reco2_data.fcl"
6+
physics.producers.blipreco.BlipAlg.HitProducer: "gaushit"
7+
physics.analyzers.blipana.BlipAlg.HitProducer: "gaushit"
8+
physics.producers.blipreco.BlipAlg.TrkProducer: "pandoraSCETrack"
9+
physics.analyzers.blipana.BlipAlg.TrkProducer: "pandoraSCETrack"
10+
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, pandoraLikePidData, cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching, pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData, pandoraSCELikePidData, cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE, caloskimCalorimetry, blipreco, lightpropagationcorrectionSCE, frameshift]

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#Nominal configuration uses dnn (ind) + trad (col) for hit finding.
2+
#Blip requires trad (all) for hit finding.
3+
#This fcl configures everything to use the nominal config (dnn + trad)
4+
5+
#include "standard_reco2_sbnd.fcl"
6+
physics.producers.blipreco.BlipAlg.HitProducer: "gaushit"
7+
physics.analyzers.blipana.BlipAlg.HitProducer: "gaushit"
8+
physics.producers.blipreco.BlipAlg.TrkProducer: "pandoraSCETrack"
9+
physics.analyzers.blipana.BlipAlg.TrkProducer: "pandoraSCETrack"
10+
physics.reco2: [ rns
11+
, pandora
12+
, pandoraTrack
13+
, blipPandoraCopy
14+
, blipPandoraTrackCopy
15+
, pandoraShower
16+
, pandoraShowerSBN
17+
, pandoraCalo
18+
, pandoraPid
19+
, pandoraLikePid
20+
, crtveto
21+
, crtspacepointmatching
22+
, crttrackmatching
23+
, fmatch
24+
, fmatchop
25+
, caloskimCalorimetry
26+
, opt0finder
27+
, tpcpmtbarycentermatching
28+
, pandoraSCE
29+
, pandoraSCETrack
30+
, pandoraSCEShower
31+
, pandoraSCEShowerSBN
32+
, pandoraSCECalo
33+
, pandoraSCEPid
34+
, pandoraSCELikePid
35+
, crtspacepointmatchingSCE
36+
, crttrackmatchingSCE
37+
, fmatchSCE
38+
, fmatchopSCE
39+
, opt0finderSCE
40+
, tpcpmtbarycentermatchingSCE
41+
, cvn
42+
, cvnSCE
43+
, blipreco
44+
]
45+
physics.trigger_paths: [ reco2 ]

‎sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ physics:
6868
simtpc2d: @local::sbnd_wcls_simsp_bothrois
6969
crtsim: @local::sbnd_crtsim
7070
opdaq: @local::sbnd_opdetdigitizer
71-
pmtmetricmc: @local::sbnd_pmtmcmetricproducer
7271
pmtpulseoscillation: @local::sbnd_pmtpulseoscillation
72+
pmtmetricmc: @local::sbnd_pmtmcmetricproducer
7373
}
7474

7575
#define the producer and filter modules for this path, order matters,
76-
simulate: [rns, simtpc2d, crtsim, opdaq, pmtmetricmc, pmtpulseoscillation]
76+
simulate: [rns, simtpc2d, crtsim, opdaq, pmtpulseoscillation, pmtmetricmc]
7777

7878
#define the output stream, there could be more than one if using filters
7979
stream1: [ out1 ]

‎sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ sbnd_flux_g4bnb_1_0_0_fhc: {
236236
FluxType: "dk2nu"
237237
DetectorLocation: "SBND"
238238
FluxCopyMethod: "DIRECT"
239-
FluxSearchPaths: "/cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.0/fhc/a/"
239+
FluxSearchPaths: "/cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.1/fhc/a/"
240240
FluxFiles: [ "NuBeam_production_BooNE_50m_I174000A_*.dk2nu.root" ]
241241
}
242242

@@ -385,7 +385,7 @@ sbnd_genie_simple_rockbox: {
385385
# As we are changing the FV we need to recalculate the maximum path lengths
386386
# This file was generated by running with:
387387
# GeomScan: "flux: 10000 1.1 1"
388-
GeomScan: "file: GENIE/sbnd_rock_maxpathlength_fluxG4_gdmlv02_06.xml"
388+
GeomScan: "file: GENIE/sbnd_rock_maxpathlength_fluxG4v1.1.1_gdmlv02_06.xml"
389389
}
390390

391391
# Rotated bucket configuration

0 commit comments

Comments
 (0)