Revert "Merge branch 'develop' into feature/lynnt_ccnuefilter"

This reverts commit d93ec8e, reversing
changes made to d46ac48.

Author: lynnt20

.github/pull_request_template.md

@@ -1,20 +1,13 @@
 ## Description 
 Please provide a detailed description of the changes this pull request introduces. 
 
-$${\color{red}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}$$
-
-$${\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.
-
-$${\color{red}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}$$
-
 ## Checklist
 - [ ] Added at least 1 label from [available labels](https://github.com/SBNSoftware/sbndcode/issues/labels?sort=name-asc).
 - [ ] Assigned at least 1 reviewer under `Reviewers`,
 - [ ] Assigned all contributers including yourself under `Assignees`
 - [ ] Linked any relevant issues under `Developement`
 - [ ] 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.
 - [ ] Does this affect the standard workflow? 
-- [ ] Is this PR a patch for the ongoing production? If so, separate PR must also be made for production/v10_06_00 branch! 
 
 ### Relevant PR links (optional)
 Does this PR require merging another PR in a different repository (such as sbnanobj/sbnobj etc.)?

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 

README.md

@@ -125,11 +125,8 @@ physics:
 # change tools in sbn to have 2D TPC sim/sp input
 physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:gauss"
 physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:gauss"
+
 physics.producers.cnnid.WireLabel: "sptpc2d:gauss"
-# uncomment below lines to use DNN ROI SP for Razzle/Dazzle/CNNID
-#physics.producers.pandoraShowerRazzle.SimChannelLabel: "sptpc2d:dnnsp"
-#physics.producers.pandoraTrackDazzle.SimChannelLabel: "sptpc2d:dnnsp"
-#physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
 
 ### Calorimetry for data
 physics.producers.cnnid.PointIdAlg.CalorimetryAlg: @local::sbnd_calorimetryalgdata

sbndcode/JobConfigurations/base/cafmakerjob_sbnd_data_base.fcl

@@ -127,8 +127,6 @@ physics:
 physics.producers.pandoraShowerRazzle.SimChannelLabel: "simtpc2d:simpleSC"
 physics.producers.pandoraTrackDazzle.SimChannelLabel: "simtpc2d:simpleSC"
 physics.producers.cnnid.WireLabel: "simtpc2d:gauss"
-# uncomment below line for to use DNN ROI SP for CNNID scores
-#physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
 
 physics.producers.vertexCharge.CaloAlg: @local::sbnd_calorimetryalgmc
 physics.producers.vertexStub.CaloAlg: @local::sbnd_calorimetryalgmc

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl

@@ -11,7 +11,6 @@ physics.producers.cafmaker.TrackChi2PidLabel:  "pandoraSCEPidData"
 physics.producers.cafmaker.CRTSpacePointMatchLabel: "crtspacepointmatchingSCE"
 physics.producers.cafmaker.SBNDCRTTrackMatchLabel: "crttrackmatchingSCE"
 physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
-physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
 physics.producers.cafmaker.CVNLabel: "cvnSCE"
 
 physics.producers.cnnid.ClusterModuleLabel:        "pandoraSCE"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_data_sce.fcl

@@ -13,7 +13,6 @@ physics.producers.cafmaker.SBNDCRTTrackMatchLabel: "crttrackmatchingSCE"
 physics.producers.cafmaker.CRTHitMatchLabel: "pandoraSCETrackCRTHit"
 physics.producers.cafmaker.CRTTrackMatchLabel: "pandoraSCETrackCRTTrack"
 physics.producers.cafmaker.OpT0Label: "opt0finderSCE"
-physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatchingSCE"
 physics.producers.cafmaker.CVNLabel: "cvnSCE"
 
 physics.producers.cnnid.ClusterModuleLabel:        "pandoraSCE"

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce.fcl

@@ -35,12 +35,3 @@ physics.ana: [superadata]
 outputs.out1.SelectEvents: [ "reco1" ]
 
 physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:gauss"
-
-# uncomment below 4 lines to run DNN ROI finding SP
-#physics.producers.sptpc2d.wcls_main.outputers: ["wclsFrameSaver:spsaver" , "wclsFrameSaver:dnnsaver"]
-#physics.producers.sptpc2d.wcls_main.structs.use_dnnroi: true
-#physics.producers.sptpc2d.wcls_main.structs.nchunks: 2 # should match training config
-#physics.producers.sptpc2d.wcls_main.structs.tick_per_slice: 4 # should match training config
-
-# uncomment below line to run DNN ROI finding SP for reco
-#physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:dnnsp"

sbndcode/JobConfigurations/standard/reco/reco1_data.fcl

@@ -92,9 +92,3 @@ outputs:
                     ]
   }
 }
-
-# uncomment below 4 lines to run DNN ROI finding SP
-# 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
-# physics.producers.simtpc2d.wcls_main.structs.use_dnnroi: true
-# physics.producers.simtpc2d.wcls_main.structs.nchunks: 2 # should match training config
-# physics.producers.simtpc2d.wcls_main.structs.tick_per_slice: 4 # should match training config

sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl

@@ -35,6 +35,3 @@ physics.end_paths:      [ @sequence::physics.end_paths, ana ]
 #outputs table overrides
 outputs.out1.dataTier:       "reconstructed"
 outputs.out1.outputCommands:  [@sequence::outputs.out1.outputCommands, @sequence::sbnd_reco1_drops]
-
-# uncomment below line to run DNN ROI finding SP for reco -- must have run DNN ROI finding in detsim stage
-#physics.producers.gaushit.CalDataModuleLabel: "simtpc2d:dnnsp"