diff --git a/sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl index 40594383a..d49aa336c 100644 --- 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 index 013e62fbd..bbdc6fd3d 100644 --- 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 index d9a11557a..a01b2f8c0 100644 --- a/sbndcode/WireCell/wirecell_pgrapher_detsim_sbnd.fcl +++ b/sbndcode/WireCell/wirecell_pgrapher_detsim_sbnd.fcl @@ -33,6 +33,10 @@ ##include "opdetdigitizer_sbnd.fcl" #include "rootoutput_sbnd.fcl" +# +# MC reco +# +#include "mcreco_sbnd.fcl" process_name: WCLS @@ -40,6 +44,7 @@ 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,6 +105,10 @@ physics: } } } + + # Truth-level reconstruction + mcreco: @local::sbnd_mcreco + #crt: @local::sbnd_crtsim #opdaq: @local::sbnd_opdetdigitizer } @@ -107,7 +116,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] #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 index eb3576fc0..50a506ad1 100644 --- a/sbndcode/WireCell/wirecell_sim_rawdigits_sp.fcl +++ b/sbndcode/WireCell/wirecell_sim_rawdigits_sp.fcl @@ -30,6 +30,11 @@ #include "detsimmodules_sbnd.fcl" #include "rootoutput_sbnd.fcl" +# +# MC reco +# +#include "mcreco_sbnd.fcl" + process_name: WCLS @@ -37,6 +42,7 @@ 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 index 7ff74b571..6c38c0249 100644 --- a/sbndcode/WireCell/wirecell_sim_sp_sbnd.fcl +++ b/sbndcode/WireCell/wirecell_sim_sp_sbnd.fcl @@ -30,6 +30,11 @@ #include "detsimmodules_sbnd.fcl" #include "rootoutput_sbnd.fcl" +# +# MC reco +# +#include "mcreco_sbnd.fcl" + process_name: WCLS @@ -37,6 +42,7 @@ 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,9 +137,12 @@ physics: driftSpeed: 1.563 } } - } + } + # Truth-level reconstruction + mcreco: @local::sbnd_mcreco + #crt: @local::sbnd_crtsim #opdaq: @local::sbnd_opdetdigitizer } @@ -141,7 +150,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_tbb_deposet_detsim_sbnd.fcl b/sbndcode/WireCell/wirecell_tbb_deposet_detsim_sbnd.fcl index 09e9de5db..d77c38010 100644 --- a/sbndcode/WireCell/wirecell_tbb_deposet_detsim_sbnd.fcl +++ b/sbndcode/WireCell/wirecell_tbb_deposet_detsim_sbnd.fcl @@ -33,6 +33,11 @@ ##include "opdetdigitizer_sbnd.fcl" #include "rootoutput_sbnd.fcl" +# +# MC reco +# +#include "mcreco_sbnd.fcl" + process_name: WCLS @@ -40,6 +45,7 @@ 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,6 +105,10 @@ physics: } } } + + # Truth-level reconstruction + mcreco: @local::sbnd_mcreco + #crt: @local::sbnd_crtsim #opdaq: @local::sbnd_opdetdigitizer } @@ -106,7 +116,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] #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 index 2be5627e2..2f24c23da 100755 --- 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 index 60629a369..2681a990f 100755 --- 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