Skip to content

Commit 384430a

Browse files
nathanielerowenathanielerowe
authored
Merge branch 'develop' into feature/TriggerWorkNikki-PR
2 parents bb7c359 + b081746 commit 384430a

8 files changed

Lines changed: 76 additions & 13 deletions

File tree

‎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/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: 7 additions & 0 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

@@ -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/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

‎test/GENIE/check_genie_geom_scan.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
pset_geom_scan = pset['physics']['producers']['generator']['GeomScan']
99

10-
geom_scan_flux_config = pset_geom_scan.split('flux')[1][:2]
10+
geom_scan_flux_config = pset_geom_scan.split('fluxG4v')[1][:5]
1111
geom_scan_gdml_version = pset_geom_scan.split('gdml')[1][:6]
1212

1313
print('Using GeomScan file:', pset_geom_scan)
@@ -22,18 +22,18 @@
2222
pset_flux = pset['physics']['producers']['generator']['FluxSearchPaths']
2323
print('Using:', pset_flux, pset_gdml)
2424

25-
#flux_config = pset_flux.split('config')[1][0]
25+
flux_config = pset_flux.split('G4BNB/v')[1][:5]
2626
gdml_version = pset_gdml.split('sbnd_')[1][:6]
2727

2828
print('\t -> gdml version:', gdml_version)
29-
#print('\t -> flux configuration:', flux_config)
29+
print('\t -> flux configuration:', flux_config)
3030

3131
#
3232
# Check that the two are the same, if not, need to regenerate the GeomScan file
3333
#
3434
message = 'Please regenerate the GeomScan file. Instructions are in fcl file make_genie_geomscan_file_sbnd.fcl.'
3535

36-
#assert geom_scan_flux_config == flux_config, f"Have you updated/changed the flux files? {message}"
36+
assert geom_scan_flux_config == flux_config, f"Have you updated/changed the flux files? {message}"
3737

3838
assert geom_scan_gdml_version == gdml_version, f"Have you updated/changed the GDML file? {message}"
3939

‎ups/product_deps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ wpdir product_dir wire-cell-cfg
253253
#
254254
####################################
255255
product version qual flags <table_format=2>
256-
sbncode v10_14_00 -
256+
sbncode v10_14_02 -
257257
cetmodules v3_24_01 - only_for_build
258258
sbnd_data v01_41_00 -
259259
sbndutil v10_06_01 - optional
@@ -326,7 +326,7 @@ end_qualifier_list
326326
####################################
327327
table_fragment_begin
328328
# currently, XML pandora files are installed in 'scripts':
329-
pathPrepend(GDK2NUFLUXXML, /cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.0/GNuMIFlux.xml)
329+
pathPrepend(GDK2NUFLUXXML, /cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/GNuMIFlux.xml)
330330
pathPrepend(FW_SEARCH_PATH, ${SBNDCODE_DIR}/scripts)
331331
pathPrepend(FW_SEARCH_PATH, ${SBND_DATA_DIR}/CalibrationDatabase)
332332
pathPrepend(FW_SEARCH_PATH, /cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash)

0 commit comments

Comments
 (0)