Skip to content

Commit 30cffe1

Browse files
author
nathanielerowe
committed
git flow release finish May9
Merge branch 'release/v10_06_00'
2 parents 7e25d60 + d94d81c commit 30cffe1

8 files changed

Lines changed: 125 additions & 13 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.05.00)
18+
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00)
1919
find_package(cetmodules REQUIRED)
2020
project(sbndcode LANGUAGES CXX)
2121

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

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#include "transfer_flashmatch_producer.fcl"
2+
#include "cafmakerjob_sbnd_data_base.fcl"
3+
#
4+
# change all the labels we need to
5+
physics.producers.cafmaker.PandoraTagSuffixes: []
6+
physics.producers.cafmaker.PFParticleLabel: "pandoraSCE"
7+
physics.producers.cafmaker.RecoShowerLabel: "pandoraSCEShowerSBN"
8+
physics.producers.cafmaker.RecoTrackLabel: "pandoraSCETrack"
9+
physics.producers.cafmaker.TrackCaloLabel: "pandoraSCECaloData"
10+
physics.producers.cafmaker.TrackChi2PidLabel: "pandoraSCEPidData"
11+
physics.producers.cafmaker.CRTSpacePointMatchLabel: "crtspacepointmatchingSCE"
12+
physics.producers.cafmaker.SBNDCRTTrackMatchLabel: "crttrackmatchingSCE"
13+
physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
14+
physics.producers.cafmaker.CVNLabel: "cvnSCE"
15+
16+
physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE"
17+
physics.producers.cnnid.PFParticleModuleLabel: "pandoraSCE"
18+
19+
physics.producers.pandoraTrackMCS.TrackLabel: "pandoraSCETrack"
20+
physics.producers.pandoraTrackRange.TrackLabel: "pandoraSCETrack"
21+
22+
physics.producers.cafmaker.FlashMatchOpDetSuffixes: ["", "op", "ara", "opara"]
23+
physics.producers.cafmaker.FlashMatchSCECryoSuffixes: ["SCE"]
24+
25+
physics.producers.pandoraShowerSelectionVars.PandoraLabel: "pandoraSCE"
26+
physics.producers.pandoraShowerSelectionVars.ShowerLabel: "pandoraSCEShowerSBN"
27+
physics.producers.pandoraShowerCosmicDist.PandoraLabel: "pandoraSCE"
28+
physics.producers.pandoraShowerCosmicDist.ShowerLabel: "pandoraSCEShowerSBN"
29+
physics.producers.pandoraShowerRazzle.PFPLabel: "pandoraSCE"
30+
physics.producers.pandoraShowerRazzle.ShowerLabel: "pandoraSCEShowerSBN"
31+
32+
physics.producers.pandoraRazzled: @local::razzled_sbnd_sce
33+
34+
physics.producers.pandoraTrackClosestApproach.TrackLabel: "pandoraSCETrack"
35+
physics.producers.pandoraTrackStoppingChi2.TrackLabel: "pandoraSCETrack"
36+
physics.producers.pandoraTrackStoppingChi2.CaloLabel: "pandoraSCECaloData"
37+
38+
# Just over-write the stub reco labels -- no need to change to "SCE"
39+
physics.producers.vertexCharge: @local::vertex_charge_sbnd_sce
40+
physics.producers.vertexStub: @local::vertex_stub_sbnd_sce
41+
# set the CaloAlg again
42+
physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgmc
43+
physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc
44+
45+
physics.producers.pandoraTrackDazzle.PFPLabel: "pandoraSCE"
46+
physics.producers.pandoraTrackDazzle.TrackLabel: "pandoraSCETrack"
47+
physics.producers.pandoraTrackDazzle.CaloLabel: "pandoraSCECaloData"
48+
physics.producers.pandoraTrackDazzle.Chi2Label: "pandoraSCEPidData"
49+
50+
physics.producers.fmatchSCE: @local::transfer_flashmatch_sce_sbnd
51+
physics.producers.fmatchopSCE: @local::transfer_flashmatch_sce_sbnd
52+
physics.producers.fmatcharaSCE: @local::transfer_flashmatch_sce_sbnd
53+
physics.producers.fmatchoparaSCE: @local::transfer_flashmatch_sce_sbnd
54+
55+
physics.producers.crumbs.PFParticleModuleLabel: "pandoraSCE"
56+
physics.producers.crumbs.TrackModuleLabel: "pandoraSCETrack"
57+
physics.producers.crumbs.SliceModuleLabel: "pandoraSCE"
58+
physics.producers.crumbs.FlashMatchModuleLabel: "fmatchSCE"
59+
physics.producers.crumbs.CalorimetryModuleLabel: "pandoraSCECaloData"
60+
physics.producers.crumbs.CRTSPMatchModuleLabel: "crtspacepointmatchingSCE"
61+
physics.producers.crumbs.CRTTrackMatchModuleLabel: "crttrackmatchingSCE"
62+
physics.producers.crumbs.OpT0ModuleLabel: "opt0finderSCE"
63+
64+
physics.producers.crumbs.Chi2FitParams.TrackLabel: "pandoraSCETrack"
65+
physics.producers.crumbs.Chi2FitParams.CaloLabel: "pandoraSCECaloData"
66+
67+
physics.runprod: [ pandoraTrackMCS, pandoraTrackRange,
68+
vertexCharge, vertexStub,
69+
pandoraTrackClosestApproach, pandoraTrackStoppingChi2,
70+
pandoraShowerSelectionVars,pandoraShowerCosmicDist, cnnid,
71+
cafmaker ]
72+
73+

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "cafmakerjob_sbnd_data_sce.fcl"
2+
3+
physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbinfo"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "cafmakerjob_sbnd_data_sce.fcl"
2+
3+
physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbzerobiasinfo"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "cafmakerjob_sbnd_data_sce.fcl"
2+
3+
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "sbndbnbextinfo"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ sbnd_reco2_producers:{
4040
pandoraCaloData: @local::sbnd_gnewcalodata
4141
pandoraPidData: @local::sbnd_chi2pid
4242

43+
pandoraSCECaloData: @local::sbnd_gnewcalodata
44+
pandoraSCEPidData: @local::sbnd_chi2pid
45+
4346
### SCE-aware pandora:
4447
pandoraSCE: @local::scecorrection
4548
pandoraSCETrack: @local::sbnd_pandoraTrackCreation
@@ -133,10 +136,21 @@ sbnd_reco2_producers.pandoraCaloData.TrackIsFieldDistortionCorrected: false
133136
sbnd_reco2_producers.pandoraPidData.TrackModuleLabel: "pandoraTrack"
134137
sbnd_reco2_producers.pandoraPidData.CalorimetryModuleLabel: "pandoraCaloData"
135138

139+
sbnd_reco2_producers.pandoraSCECaloData.TrackModuleLabel: "pandoraSCETrack"
140+
sbnd_reco2_producers.pandoraSCECaloData.FieldDistortion: true
141+
sbnd_reco2_producers.pandoraSCECaloData.FieldDistortionEfield: true
142+
sbnd_reco2_producers.pandoraSCECaloData.TrackIsFieldDistortionCorrected: true
143+
sbnd_reco2_producers.pandoraSCEPidData.TrackModuleLabel: "pandoraSCETrack"
144+
sbnd_reco2_producers.pandoraSCEPidData.CalorimetryModuleLabel: "pandoraSCECaloData"
145+
136146
sbnd_reco2_producers.cvn.SliceLabel: "pandora"
137147
sbnd_reco2_producers.cvn.PFParticleModuleLabel: "pandora"
138148
sbnd_reco2_producers.cvn.T0Label: "pandora"
139149

150+
sbnd_reco2_producers.cvnSCE.SliceLabel: "pandoraSCE"
151+
sbnd_reco2_producers.cvnSCE.PFParticleModuleLabel: "pandoraSCE"
152+
sbnd_reco2_producers.cvnSCE.T0Label: "pandoraSCE"
153+
140154
physics.analyzers.caloskim.SimChannelproducer: "simtpc2d:simpleSC"
141155

142156
sbnd_reco2_producers.opt0finderSCE.SliceProducer: "pandoraSCE"

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,39 @@ services:
1515
physics.producers:
1616
{
1717
@table::physics.producers
18-
crtveto: @local::crtvetoproducer_data_sbnd
19-
crtspacepointmatching: @local::crtspacepointmatchproducer_data_sbnd
20-
crttrackmatching: @local::crttrackmatchproducer_data_sbnd
21-
opt0finder: @local::sbnd_opt0_finder_data
18+
crtveto: @local::crtvetoproducer_data_sbnd
19+
crtspacepointmatching: @local::crtspacepointmatchproducer_data_sbnd
20+
crttrackmatching: @local::crttrackmatchproducer_data_sbnd
21+
crtspacepointmatchingSCE: @local::crtspacepointmatchproducer_data_sbnd
22+
crttrackmatchingSCE: @local::crttrackmatchproducer_data_sbnd
23+
24+
opt0finder: @local::sbnd_opt0_finder_data
25+
opt0finderSCE: @local::sbnd_opt0_finder_data
2226
tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer
2327
}
2428

25-
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, caloskimCalorimetry,
26-
crtveto, cvn, crtspacepointmatching, crttrackmatching, opt0finder, tpcpmtbarycentermatching]
29+
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData,
30+
cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,
31+
pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData,
32+
cvnSCE, opt0finderSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
33+
caloskimCalorimetry]
2734

28-
#The next 3 lines need to be commented out once data use pandoraSCE by default.
29-
physics.producers.cvn.SliceLabel: "pandora"
30-
physics.producers.cvn.PFParticleModuleLabel: "pandora"
31-
physics.producers.cvn.T0Label: "pandora"
3235
physics.analyzers.caloskim.G4producer: ""
3336
physics.analyzers.caloskim.SimChannelproducer: ""
3437
physics.analyzers.crtana: @local::crtana_data_sbnd
3538

39+
physics.producers.crtspacepointmatchingSCE.TPCTrackModuleLabel: "pandoraSCETrack"
40+
physics.producers.crtspacepointmatchingSCE.PFPModuleLabel: "pandoraSCE"
41+
physics.producers.crtspacepointmatchingSCE.MatchingAlg.TPCTrackLabel: "pandoraSCETrack"
42+
43+
physics.producers.crttrackmatchingSCE.TPCTrackModuleLabel: "pandoraSCETrack"
44+
physics.producers.crttrackmatchingSCE.PFPModuleLabel: "pandoraSCE"
45+
physics.producers.crttrackmatchingSCE.MatchingAlg.TPCTrackLabel: "pandoraSCETrack"
46+
47+
physics.producers.opt0finderSCE.SliceProducer: "pandoraSCE"
48+
physics.producers.opt0finderSCE.TrackProducer: "pandoraSCETrack"
49+
physics.producers.opt0finderSCE.ShowerProducer: "pandoraSCEShowerSBN"
50+
physics.producers.opt0finderSCE.CaloProducer: "pandoraSCECaloData"
51+
3652
physics.caloskimana: [ caloskim, crtana ]
3753
physics.end_paths: [stream1, caloskimana ]

‎ups/product_deps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ wpdir product_dir wire-cell-cfg
253253
#
254254
####################################
255255
product version qual flags <table_format=2>
256-
sbncode v10_05_00 -
256+
sbncode v10_06_00_01 -
257257
cetmodules v3_24_01 - only_for_build
258258
sbnd_data v01_30_00 -
259-
sbndutil v10_05_00 - optional
259+
sbndutil v10_06_00 - optional
260260
fhiclpy v4_03_05 -
261261
end_product_list
262262
####################################

0 commit comments

Comments
 (0)