Merge pull request #414 from SBNSoftware/feature/fnicolas_fix_unit_tests

Update unit tests to use WireCell workflow
SBNSoftware · Feb 19, 2024 · 137756d · 137756d
2 parents d3b957c + 9a7bc28
commit 137756d
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 11 deletions.
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl
@@ -8,7 +8,7 @@ physics.simulate: [ rns
                   , pdfastsim
                   , pdfastsimout
                   , simdrift
-                  , mcreco
+                  #, mcreco ## mcreco now run after WireCell sim
                   , genericcrt
                   ]
 

diff --git a/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl
@@ -102,7 +102,7 @@ physics:
             , pdfastsim
             , pdfastsimout
             , simdrift
-            , mcreco
+            #, mcreco ## mcreco now run after WireCell sim
             , genericcrt
           ]
 

diff --git a/sbndcode/WireCell/wirecell_pgrapher_detsim_sbnd.fcl b/sbndcode/WireCell/wirecell_pgrapher_detsim_sbnd.fcl
@@ -33,13 +33,18 @@
 ##include "opdetdigitizer_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 
+#
+# MC reco
+#
+#include "mcreco_sbnd.fcl"
 
 process_name: WCLS
 
 services:
 {
   TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
   #@table::sbnd_detsim_services
+  @table::sbnd_g4_services
   FileCatalogMetadata: @local::sbnd_file_catalog_mc
   #AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
   #AuxDetGeometry: { @table::sbnd_geo_source }
@@ -100,14 +105,18 @@ physics:
           }
        }
     }
+
+    # Truth-level reconstruction
+    mcreco: @local::sbnd_mcreco
+
     #crt:       @local::sbnd_crtsim
     #opdaq:     @local::sbnd_opdetdigitizer
   }
 
   #define the producer and filter modules for this path, order matters,
   #simulate:  [ rns, daq, crt, opdaq] #default 
   #simulate:  [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
-  simulate:  [ simtpc2d] #only wirecell drift simulation (simtpc2d)
+  simulate:  [ simtpc2d, mcreco] #only wirecell drift simulation (simtpc2d)
 
   #define the output stream, there could be more than one if using filters
   stream1:   [ out1 ]

diff --git a/sbndcode/WireCell/wirecell_sim_rawdigits_sp.fcl b/sbndcode/WireCell/wirecell_sim_rawdigits_sp.fcl
@@ -30,13 +30,19 @@
 #include "detsimmodules_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 
+#
+# MC reco
+#
+#include "mcreco_sbnd.fcl"
+
 
 process_name: WCLS
 
 services:
 {
   TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
   #@table::sbnd_detsim_services
+  @table::sbnd_g4_services
   FileCatalogMetadata: @local::sbnd_file_catalog_mc
   #AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
   #AuxDetGeometry: { @table::sbnd_geo_source }
@@ -133,6 +139,8 @@ physics:
        }
     }
 
+    # Truth-level reconstruction
+    mcreco: @local::sbnd_mcreco
 
     #crt:       @local::sbnd_crtsim
     #opdaq:     @local::sbnd_opdetdigitizer
@@ -141,7 +149,7 @@ physics:
   #define the producer and filter modules for this path, order matters,
   #simulate:  [ rns, daq, crt, opdaq] #default 
   #simulate:  [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
-  simulate:  [ simtpc2d] #added wctsp Ewerton 2023-05-16
+  simulate:  [ simtpc2d, mcreco] #added wctsp Ewerton 2023-05-16
 
   trigger_paths : [ simulate ]
 

diff --git a/sbndcode/WireCell/wirecell_sim_sp_sbnd.fcl b/sbndcode/WireCell/wirecell_sim_sp_sbnd.fcl
@@ -30,13 +30,19 @@
 #include "detsimmodules_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 
+#
+# MC reco
+#
+#include "mcreco_sbnd.fcl"
+
 
 process_name: WCLS
 
 services:
 {
   TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
   #@table::sbnd_detsim_services
+  @table::sbnd_g4_services
   FileCatalogMetadata: @local::sbnd_file_catalog_mc
   #AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
   #AuxDetGeometry: { @table::sbnd_geo_source }
@@ -131,17 +137,20 @@ physics:
             driftSpeed: 1.563
           }
        }
-    }
 
+    }
 
+    # Truth-level reconstruction
+    mcreco: @local::sbnd_mcreco
+
     #crt:       @local::sbnd_crtsim
     #opdaq:     @local::sbnd_opdetdigitizer
   }
 
   #define the producer and filter modules for this path, order matters,
   #simulate:  [ rns, daq, crt, opdaq] #default 
   #simulate:  [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
-  simulate:  [ simtpc2d] #added wctsp Ewerton 2023-05-16
+  simulate:  [ simtpc2d, mcreco] #added wctsp Ewerton 2023-05-16
 
   trigger_paths : [ simulate ]
 

diff --git a/sbndcode/WireCell/wirecell_tbb_deposet_detsim_sbnd.fcl b/sbndcode/WireCell/wirecell_tbb_deposet_detsim_sbnd.fcl
@@ -33,13 +33,19 @@
 ##include "opdetdigitizer_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 
+#
+# MC reco
+#
+#include "mcreco_sbnd.fcl"
+
 
 process_name: WCLS
 
 services:
 {
   TFileService: { fileName: @local::sbnd_tfileoutput.fileName }
   #@table::sbnd_detsim_services
+  @table::sbnd_g4_services
   FileCatalogMetadata: @local::sbnd_file_catalog_mc
   #AuxDetExptGeoHelperInterface: { service_provider: "sbndcode/CRT/CRTGeometryHelper" }
   #AuxDetGeometry: { @table::sbnd_geo_source }
@@ -99,14 +105,18 @@ physics:
           }
        }
     }
+
+    # Truth-level reconstruction
+    mcreco: @local::sbnd_mcreco
+
     #crt:       @local::sbnd_crtsim
     #opdaq:     @local::sbnd_opdetdigitizer
   }
 
   #define the producer and filter modules for this path, order matters,
   #simulate:  [ rns, daq, crt, opdaq] #default 
   #simulate:  [ rns, daq, simtpc2d, crt, opdaq] #default (daq) plus wirecell drift simulation (simtpc2d)
-  simulate:  [ simtpc2d] #only wirecell drift simulation (simtpc2d)
+  simulate:  [ simtpc2d, mcreco] #only wirecell drift simulation (simtpc2d)
 
   #define the output stream, there could be more than one if using filters
   stream1:   [ out1 ]

diff --git a/test/JobConfigurations/fast_simulation_reconstruction_test_electrons.sh b/test/JobConfigurations/fast_simulation_reconstruction_test_electrons.sh
@@ -9,12 +9,18 @@
 declare -ar TestNames=(
     'prodsingle_electron_bnblike_newflux'
     'g4_sce'
-    'detsim_sce'
-    'reco1_sce'
+    'wirecell_sim_sp_sbnd'
+    'detsim_sce_lite_wc'
+    'reco1_sce_lite_wc2d'
     'reco2_sce'
 )
+
 #############################################################################
 
+# Set WireCell env vars
+export WIRECELL_PATH=${SBNDCODE_DIR}/sbndcode/WireCell/cfg/:${SBND_DATA_DIR}/WireCell
+
+
 function ExecBase() {
 	local LogFile="$1"
 	shift

diff --git a/test/JobConfigurations/fast_simulation_reconstruction_test_muons.sh b/test/JobConfigurations/fast_simulation_reconstruction_test_muons.sh
@@ -9,12 +9,19 @@
 declare -ar TestNames=(
     'prodsingle_mu_bnblike_newflux'
     'g4_sce'
-    'detsim_sce'
-    'reco1_sce'
+    'wirecell_sim_sp_sbnd'
+    'detsim_sce_lite_wc'
+    'reco1_sce_lite_wc2d'
     'reco2_sce'
 )
+
 #############################################################################
 
+
+# Set WireCell env vars
+export WIRECELL_PATH=${SBNDCODE_DIR}/sbndcode/WireCell/cfg/:${SBND_DATA_DIR}/WireCell
+
+
 function ExecBase() {
 	local LogFile="$1"
 	shift