Skip to content

Commit d0735d5

Browse files
lynnt20lynnt20
committed
Reapply "Merge branch 'develop' into feature/lynnt_ccnuefilter"
This reverts commit d5e3270.
1 parent 2d47f24 commit d0735d5

24 files changed

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

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# sbndcode
2+
3+
## Getting Started
4+
[SBN Young Guide](https://sbnsoftware.github.io/SBNYoung/SBNYoungIndex.html)

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

‎sbndcode/JobConfigurations/standard/standard_reco1_sbnd.fcl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ physics.end_paths: [ @sequence::physics.end_paths, ana ]
3535
#outputs table overrides
3636
outputs.out1.dataTier: "reconstructed"
3737
outputs.out1.outputCommands: [@sequence::outputs.out1.outputCommands, @sequence::sbnd_reco1_drops]
38+
39+
# uncomment below line to run DNN ROI finding SP for reco -- must have run DNN ROI finding in detsim stage
40+
#physics.producers.gaushit.CalDataModuleLabel: "simtpc2d:dnnsp"

0 commit comments

Comments
 (0)