Skip to content

Commit aed9e26

Browse files
lynnt20lynnt20
committed
Merge branch 'bugfix/wirecellgrouped' of https://github.com/SBNSoftware/sbndcode into bugfix/wirecellgrouped
2 parents be362f4 + 40d6440 commit aed9e26

27 files changed

Lines changed: 1924 additions & 96 deletions

‎.github/pull_request_template.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
## Description
22
Please provide a detailed description of the changes this pull request introduces.
33

4+
$${\color{red}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}$$
5+
6+
$${\color{red}\bf{\textrm{IMPORTANT UPDATE June 22nd 2025:}}}$$ If you are making a PR which is intended as a patch for the CURRENT production (which started in Spring 2025), you must make two PRs: one for develop and one for the production/v10_06_00 branch.
7+
8+
$${\color{red}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}$$
9+
410
## Checklist
511
- [ ] Added at least 1 label from [available labels](https://github.com/SBNSoftware/sbndcode/issues/labels?sort=name-asc).
612
- [ ] Assigned at least 1 reviewer under `Reviewers`,
713
- [ ] Assigned all contributers including yourself under `Assignees`
814
- [ ] Linked any relevant issues under `Developement`
915
- [ ] Does this PR affect CAF data format? If so, please assign a CAF maintainer ([PetrilloAtWork](https://github.com/PetrilloAtWork) or [JosiePaton](https://github.com/JosiePaton)) as additional reviewer.
1016
- [ ] Does this affect the standard workflow?
17+
- [ ] Is this PR a patch for the ongoing production? If so, separate PR must also be made for production/v10_06_00 branch!
1118

1219
### Relevant PR links (optional)
1320
Does this PR require merging another PR in a different repository (such as sbnanobj/sbnobj etc.)?

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

‎sbndcode/JobConfigurations/base/cafmakerjob_sbnd_data_base.fcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,11 @@ physics:
125125
# change tools in sbn to have 2D TPC sim/sp input
126126
physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:gauss"
127127
physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:gauss"
128-
129128
physics.producers.cnnid.WireLabel: "sptpc2d:gauss"
129+
# uncomment below lines to use DNN ROI SP for Razzle/Dazzle/CNNID
130+
#physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:dnnsp"
131+
#physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:dnnsp"
132+
#physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
130133

131134
### Calorimetry for data
132135
physics.producers.cnnid.PointIdAlg.CalorimetryAlg: @local::sbnd_calorimetryalgdata

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ physics:
127127
physics.producers.pandoraShowerRazzle.SimChannelLabel: "simtpc2d:simpleSC"
128128
physics.producers.pandoraTrackDazzle.SimChannelLabel: "simtpc2d:simpleSC"
129129
physics.producers.cnnid.WireLabel: "simtpc2d:gauss"
130+
# uncomment below line for to use DNN ROI SP for CNNID scores
131+
#physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
130132

131133
physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgmc
132134
physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ physics.producers.cafmaker.TrackChi2PidLabel: "pandoraSCEPidData"
1111
physics.producers.cafmaker.CRTSpacePointMatchLabel: "crtspacepointmatchingSCE"
1212
physics.producers.cafmaker.SBNDCRTTrackMatchLabel: "crttrackmatchingSCE"
1313
physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
14+
physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
1415
physics.producers.cafmaker.CVNLabel: "cvnSCE"
1516

1617
physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ physics.producers.cafmaker.SBNDCRTTrackMatchLabel: "crttrackmatchingSCE"
1313
physics.producers.cafmaker.CRTHitMatchLabel: "pandoraSCETrackCRTHit"
1414
physics.producers.cafmaker.CRTTrackMatchLabel: "pandoraSCETrackCRTTrack"
1515
physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
16+
physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
1617
physics.producers.cafmaker.CVNLabel: "cvnSCE"
1718

1819
physics.producers.cnnid.ClusterModuleLabel: "pandoraSCE"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ sbnd_reco2_producers:{
3434
pandoraCalo: @local::sbnd_gnewcalomc
3535
pandoraPid: @local::sbnd_chi2pid
3636

37+
3738
pandoraSCECalo: @local::sbnd_gnewcalomc
3839
pandoraSCEPid: @local::sbnd_chi2pid
3940

@@ -49,6 +50,7 @@ sbnd_reco2_producers:{
4950
pandoraSCEShower: @local::sbnd_sce_incremental_pandoraModularShowerCreation
5051
pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreation
5152

53+
5254
### CRT Veto
5355
crtveto: @local::crtvetoproducer_sbnd
5456

@@ -70,6 +72,7 @@ sbnd_reco2_producers:{
7072
opt0finder: @local::sbnd_opt0_finder_one_to_many
7173
opt0finderSCE: @local::sbnd_opt0_finder_one_to_many
7274
tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer
75+
tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCE
7376

7477
### Uncalibrated calorimetry producer for calibration caloskimmer
7578
caloskimCalorimetry: @local::caloskim_calorimetry
@@ -110,6 +113,7 @@ sbnd_reco2_producer_sequence: [
110113
, fmatcharaSCE
111114
, fmatchoparaSCE
112115
, opt0finderSCE
116+
, tpcpmtbarycentermatchingSCE
113117
, cvn
114118
, cvnSCE
115119
]

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,12 @@ physics.ana: [superadata]
3535
outputs.out1.SelectEvents: [ "reco1" ]
3636

3737
physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:gauss"
38+
39+
# uncomment below 4 lines to run DNN ROI finding SP
40+
#physics.producers.sptpc2d.wcls_main.outputers: ["wclsFrameSaver:spsaver" , "wclsFrameSaver:dnnsaver"]
41+
#physics.producers.sptpc2d.wcls_main.structs.use_dnnroi: true
42+
#physics.producers.sptpc2d.wcls_main.structs.nchunks: 2 # should match training config
43+
#physics.producers.sptpc2d.wcls_main.structs.tick_per_slice: 4 # should match training config
44+
45+
# uncomment below line to run DNN ROI finding SP for reco
46+
#physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:dnnsp"

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,21 @@ physics.producers:
2424
opt0finder: @local::sbnd_opt0_finder_data
2525
opt0finderSCE: @local::sbnd_opt0_finder_data
2626
tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer
27+
tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCE
28+
29+
### shower reco for data
30+
pandoraShower: @local::sbnd_incremental_pandoraModularShowerCreationData
31+
pandoraShowerSBN: @local::sbnd_sbn_pandoraModularShowerCreationData
32+
### SCE-aware shower reco for data
33+
pandoraSCEShower: @local::sbnd_sce_incremental_pandoraModularShowerCreationData
34+
pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreationData
35+
2736
}
2837

2938
physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData,
30-
cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,
39+
cvn, opt0finder, crtveto, crtspacepointmatching, crttrackmatching, tpcpmtbarycentermatching,
3140
pandoraSCE, pandoraSCETrack, pandoraSCEShower, pandoraSCEShowerSBN, pandoraSCECaloData, pandoraSCEPidData,
32-
cvnSCE, opt0finderSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
41+
cvnSCE, opt0finderSCE, tpcpmtbarycentermatchingSCE, crtspacepointmatchingSCE, crttrackmatchingSCE,
3342
caloskimCalorimetry]
3443

3544
physics.analyzers.caloskim.G4producer: ""
@@ -48,6 +57,10 @@ physics.producers.opt0finderSCE.SliceProducer: "pandoraSCE"
4857
physics.producers.opt0finderSCE.TrackProducer: "pandoraSCETrack"
4958
physics.producers.opt0finderSCE.ShowerProducer: "pandoraSCEShowerSBN"
5059
physics.producers.opt0finderSCE.CaloProducer: "pandoraSCECaloData"
60+
physics.producers.pandoraSCEShower.PFParticleLabel: "pandoraSCE"
61+
physics.producers.pandoraSCEShowerSBN.PFParticleLabel: "pandoraSCE"
62+
63+
5164

5265
physics.caloskimana: [ caloskim, crtana ]
5366
physics.end_paths: [stream1, caloskimana ]

‎sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,9 @@ outputs:
9292
]
9393
}
9494
}
95+
96+
# uncomment below 4 lines to run DNN ROI finding SP
97+
# physics.producers.simtpc2d.wcls_main.outputers: ["wclsDepoFluxWriter:postdrift", "wclsFrameSaver:spsaver", "wclsFrameSaver:dnnsaver"] # "wclsFrameSaver:simdigits" <- by default, do not save RawDigits. Uncomment this line to save RawDigits and set
98+
# physics.producers.simtpc2d.wcls_main.structs.use_dnnroi: true
99+
# physics.producers.simtpc2d.wcls_main.structs.nchunks: 2 # should match training config
100+
# physics.producers.simtpc2d.wcls_main.structs.tick_per_slice: 4 # should match training config

0 commit comments

Comments
 (0)