Merge branch 'develop' into feature/mdeltutt_geom_fix

Author: nathanielerowe

sbndcode/JobConfigurations/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_subdirectory(base)
 add_subdirectory(standard)
+add_subdirectory(dnnroi)
 

sbndcode/JobConfigurations/base/reco_drops.fcl

@@ -0,0 +1 @@
+install_fhicl()

sbndcode/JobConfigurations/dnnroi/CMakeLists.txt

@@ -0,0 +1,12 @@
+# File: reco1_data_bothrois.fcl
+# Authors: Mun Jung Jung (munjung@uchicago.edu)
+
+# runs Reco1 on data
+# for SP, use both traditional and DNN-based ROI finding, creating three Wire products: simtpc2d:gauss, simtpc2d:wiener (from traditional), simtpc2d:dnnsp (from DNN)
+# for downstream reco1, run gaushitfinder on sptpc2d:gauss, from traditional ROI finding
+#                       to generate matching files with downstream reco1 run on sptpc2d:dnnsp, gaushits should be scrubbed and run again
+#
+#include "reco1_data.fcl"
+
+physics.producers.sptpc2d: @local::sbnd_wcls_sp_data_bothrois
+

sbndcode/JobConfigurations/dnnroi/reco1_data_bothrois.fcl

@@ -0,0 +1,15 @@
+# File: reco1_nosp_data.fcl
+# Authors: Mun Jung Jung (munjung@uchicago.edu)
+
+# runs everything downstream of sptpc2d in the reco1 chain for data
+# runs gaushitfinder on sptpc2d:gauss 
+
+#include "reco1_data.fcl"
+
+physics.reco1: [gaushit, numberofhitsfilter, cluster3d, crtstrips, 
+    crtclustering, crtspacepoints, crttracks, opdecopmt, ophitpmt, opflashtpc0, opflashtpc1]
+physics.ana: [superadata]
+
+outputs.out1.SelectEvents: [ "reco1" ]
+
+physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:gauss"

sbndcode/JobConfigurations/dnnroi/reco1_nosp_data.fcl

@@ -0,0 +1,15 @@
+# File: reco1_nosp_data_dnnroi.fcl
+# Authors: Mun Jung Jung (munjung@uchicago.edu)
+
+# runs everything downstream of sptpc2d in the reco1 chain for data
+# runs gaushitfinder on sptpc2d:dnnsp 
+
+#include "reco1_data.fcl"
+
+physics.reco1: [gaushit, numberofhitsfilter, cluster3d, crtstrips, 
+    crtclustering, crtspacepoints, crttracks, opdecopmt, ophitpmt, opflashtpc0, opflashtpc1]
+physics.ana: [superadata]
+
+outputs.out1.SelectEvents: [ "reco1" ]
+
+physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:dnnsp"

sbndcode/JobConfigurations/dnnroi/reco1_nosp_data_dnnroi.fcl

@@ -0,0 +1,18 @@
+# File: reco1_postscrub_data_dnnroi.fcl
+# Authors: Linyan Wan (lwan@fnal.gov) and Mun Jung Jung (munjung@uchicago.edu)
+# 
+# to be used for the 2025 DNN ROI validation production
+# MUST be run after running "scrub_gaushit_data.fcl" on Reco1 files
+# 
+# runs gaushit, numberofhitsfilter, cluster3d, superadata on sptpc2d:dnnsp Wire products.
+
+#include "reco1_data.fcl"
+
+process_name: Reco1onDNN
+
+physics.reco1: [gaushit, numberofhitsfilter, cluster3d]
+physics.ana: [superadata]
+
+outputs.out1.SelectEvents: [ "reco1" ]
+
+physics.producers.gaushit.CalDataModuleLabel: "sptpc2d:dnnsp"

sbndcode/JobConfigurations/dnnroi/reco1_postscrub_data_dnnroi.fcl

@@ -0,0 +1,34 @@
+# File: scrub_gaushit_data.fcl
+# Authors: Linyan Wan (lwan@fnal.gov) and Mun Jung Jung (munjung@uchicago.edu)
+# 
+# to be used for the 2025 DNN ROI validation production
+#
+# removes gaushit products made in Reco 1 for data
+# allows gaushitfinder to be run again on different choice of Wire products
+
+#include "rootoutput_sbnd.fcl"
+#include "sam_sbnd.fcl"
+
+process_name: Scrub
+
+source:
+{
+  module_type:   RootInput
+  inputCommands: [ "keep *_*_*_*",
+                   "drop *_gaushit_*_*"]
+}
+
+outputs:
+{
+  out1:
+  {
+    @table::sbnd_rootoutput
+    dataTier: "reconstructed"
+  }
+}
+
+physics:
+{
+  stream1:   [ out1 ]
+  end_paths: [ stream1 ]
+}

sbndcode/JobConfigurations/dnnroi/scrub_gaushit_data.fcl

@@ -0,0 +1,43 @@
+# File: sp_data_bothrois.fcl
+# Authors: Mun Jung Jung (munjung@uchicago.edu)
+
+# runs WC 2D signal processing on data using both traditional and DNN-based ROI finding
+# create three Wire products: sptpc2d:gauss, sptpc2d:wiener (from traditional), sptc2d:dnnsp (from DNN)
+
+#include "services_sbnd.fcl"
+#include "messages_sbnd.fcl"
+#include "rootoutput_sbnd.fcl"
+#include "wcsp_data_sbnd.fcl"
+
+process_name: WCLS
+
+services:
+{
+    @table::services
+    @table::sbnd_data_services
+}
+
+source: {
+   module_type: RootInput
+}
+
+outputs:{
+  out1:
+  {
+   @table::sbnd_rootoutput # inherit shared settings
+   dataTier: "reconstructed"
+  }
+
+}
+
+physics : {
+    producers: {
+        sptpc2d:   @local::sbnd_wcls_sp_data_bothrois
+    }
+
+   sp : [ sptpc2d ]
+   trigger_paths : [ sp ]
+   
+   o1 : [ out1 ]
+   end_paths: [ o1 ]
+}

sbndcode/JobConfigurations/dnnroi/sp_data_bothrois.fcl

@@ -0,0 +1,43 @@
+# File: sp_data_dnnroi.fcl
+# Authors: Mun Jung Jung (munjung@uchicago.edu)
+
+# runs WC 2D signal processing using only DNN-based ROI finding
+# create one Wire product: sptc2d:dnnsp
+
+#include "services_sbnd.fcl"
+#include "messages_sbnd.fcl"
+#include "rootoutput_sbnd.fcl"
+#include "wcsp_data_sbnd.fcl"
+
+process_name: WCLS
+
+services:
+{
+    @table::services
+    @table::sbnd_data_services
+}
+
+source: {
+   module_type: RootInput
+}
+
+outputs:{
+  out1:
+  {
+   @table::sbnd_rootoutput # inherit shared settings
+   dataTier: "reconstructed"
+  }
+
+}
+
+physics : {
+    producers: {
+        sptpc2d:   @local::sbnd_wcls_sp_data_dnnroi
+    }
+
+   sp : [ sptpc2d ]
+   trigger_paths : [ sp ]
+   
+   o1 : [ out1 ]
+   end_paths: [ o1 ]
+}