diff --git a/sbndcode/JobConfigurations/base/g4_drops.fcl b/sbndcode/JobConfigurations/base/g4_drops.fcl index 8c60a254a..a89f89c0b 100644 --- a/sbndcode/JobConfigurations/base/g4_drops.fcl +++ b/sbndcode/JobConfigurations/base/g4_drops.fcl @@ -19,8 +19,7 @@ BEGIN_PROLOG -g4_drops: [ "drop sim::SimEnergyDeposits_*_*_*", - "drop sim::OpDetBacktrackerRecords_*_*_*" ] +g4_drops: [ "drop sim::OpDetBacktrackerRecords_*_*_*" ] END_PROLOG diff --git a/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt b/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt index e9291e54c..2b65d9346 100644 --- a/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt +++ b/sbndcode/JobConfigurations/standard/detsim/CMakeLists.txt @@ -3,5 +3,6 @@ install_fhicl() FILE(GLOB fcl_files *.fcl) install_source(EXTRAS ${fcl_files} ) +add_subdirectory(diffusion_variations) add_subdirectory(legacy) diff --git a/sbndcode/JobConfigurations/standard/detsim/detsim_sce_lite_wc.fcl b/sbndcode/JobConfigurations/standard/detsim/detsim_sce_lite_wc.fcl new file mode 100644 index 000000000..55e3de03d --- /dev/null +++ b/sbndcode/JobConfigurations/standard/detsim/detsim_sce_lite_wc.fcl @@ -0,0 +1,8 @@ +# File: detsim_sce_lite_wc.fcl +# Purpose: Simulates readout response to induced and collected charge +# ****DROPS 1D TPC SIM, includes optical+crt simulation ONLY **** +# + +#include "detsim_sce_lite.fcl" + +physics.simulate: [rns, crtsim, crt, opdaq] # removes the "daq" producer \ No newline at end of file diff --git a/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/CMakeLists.txt b/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/CMakeLists.txt new file mode 100644 index 000000000..13355789a --- /dev/null +++ b/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/CMakeLists.txt @@ -0,0 +1 @@ +install_fhicl() diff --git a/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff-10.fcl b/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff-10.fcl new file mode 100644 index 000000000..290d18645 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff-10.fcl @@ -0,0 +1,4 @@ +#include "wirecell_sim_sp_sbnd.fcl" + +physics.producers.simtpc2d.wcls_main.structs.DL: 3.6 +physics.producers.simtpc2d.wcls_main.structs.DT: 8.8 diff --git a/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff10.fcl b/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff10.fcl new file mode 100644 index 000000000..86ce4b1f5 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/detsim/diffusion_variations/wirecell_sim_sp_sbnd_diff10.fcl @@ -0,0 +1,4 @@ +#include "wirecell_sim_sp_sbnd.fcl" + +physics.producers.simtpc2d.wcls_main.structs.DL: 4.4 +physics.producers.simtpc2d.wcls_main.structs.DT: 8.8 diff --git a/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt b/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt index e9291e54c..d9fe090a0 100644 --- a/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt +++ b/sbndcode/JobConfigurations/standard/g4/CMakeLists.txt @@ -3,5 +3,5 @@ install_fhicl() FILE(GLOB fcl_files *.fcl) install_source(EXTRAS ${fcl_files} ) +add_subdirectory(recomb_variations) add_subdirectory(legacy) - diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/CMakeLists.txt b/sbndcode/JobConfigurations/standard/g4/recomb_variations/CMakeLists.txt new file mode 100644 index 000000000..13355789a --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/CMakeLists.txt @@ -0,0 +1 @@ +install_fhicl() diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-1-1.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-1-1.fcl new file mode 100644 index 000000000..6606a3968 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-1-1.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.91 +services.LArG4Parameters.ModBoxB: 0.21 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-10.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-10.fcl new file mode 100644 index 000000000..60d18d777 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-10.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.91 +services.LArG4Parameters.ModBoxB: 0.212 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-11.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-11.fcl new file mode 100644 index 000000000..996deb0e6 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-11.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.91 +services.LArG4Parameters.ModBoxB: 0.214 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-3-3.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-3-3.fcl new file mode 100644 index 000000000..60588823b --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-3-3.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.87 +services.LArG4Parameters.ModBoxB: 0.205 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-30.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-30.fcl new file mode 100644 index 000000000..5299b0eeb --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-30.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.87 +services.LArG4Parameters.ModBoxB: 0.212 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-33.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-33.fcl new file mode 100644 index 000000000..e660b595d --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb-33.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.86 +services.LArG4Parameters.ModBoxB: 0.218 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-1.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-1.fcl new file mode 100644 index 000000000..7cdef230c --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-1.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.93 +services.LArG4Parameters.ModBoxB: 0.21 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-3.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-3.fcl new file mode 100644 index 000000000..cfaf1ae4e --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb0-3.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.93 +services.LArG4Parameters.ModBoxB: 0.206 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb01.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb01.fcl new file mode 100644 index 000000000..1a0ce39fc --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb01.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.93 +services.LArG4Parameters.ModBoxB: 0.214 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb03.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb03.fcl new file mode 100644 index 000000000..a1178ecb8 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb03.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.93 +services.LArG4Parameters.ModBoxB: 0.218 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb1-1.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb1-1.fcl new file mode 100644 index 000000000..be05d5eb7 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb1-1.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.95 +services.LArG4Parameters.ModBoxB: 0.21 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb10.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb10.fcl new file mode 100644 index 000000000..4c15dfaf3 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb10.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.95 +services.LArG4Parameters.ModBoxB: 0.212 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb11.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb11.fcl new file mode 100644 index 000000000..4d476de7c --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb11.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.95 +services.LArG4Parameters.ModBoxB: 0.214 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb3-3.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb3-3.fcl new file mode 100644 index 000000000..3c95c4234 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb3-3.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.999 +services.LArG4Parameters.ModBoxB: 0.206 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb30.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb30.fcl new file mode 100644 index 000000000..0706af01c --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb30.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.999 +services.LArG4Parameters.ModBoxB: 0.212 diff --git a/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb33.fcl b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb33.fcl new file mode 100644 index 000000000..38c3f6321 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/g4/recomb_variations/g4_sce_dirt_filter_lite_wc_recomb33.fcl @@ -0,0 +1,4 @@ +#include "g4_sce_dirt_filter_lite_wc.fcl" + +services.LArG4Parameters.ModBoxA: 0.999 +services.LArG4Parameters.ModBoxB: 0.222 diff --git a/sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc1d.fcl b/sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc1d.fcl new file mode 100644 index 000000000..2cd875814 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc1d.fcl @@ -0,0 +1,15 @@ +#------------------------------------------------------------------- +# +# Name: reco1_sce_lite_wc1d.fcl +# +# Purpose: Lite version of reco1_sce.fcl, +# *** takes wirecell 2DSIM as input, performs 1D deconvolution *** +# +# +#------------------------------------------------------------------- + +#include "reco1_sce_lite.fcl" + +physics.producers.caldata.DigitModuleLabel: "simtpc2d:daq" +physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq" +physics.producers.gaushit.CalDataModuleLabel: "caldata:daq" diff --git a/sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc2d.fcl b/sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc2d.fcl new file mode 100644 index 000000000..2de0bce6a --- /dev/null +++ b/sbndcode/JobConfigurations/standard/reco/reco1_sce_lite_wc2d.fcl @@ -0,0 +1,33 @@ +#------------------------------------------------------------------- +# +# Name: reco1_sce_lite_wc2d.fcl +# +# Purpose: Lite version of reco1_sce.fcl, +# *** takes wirecell 2DSIM as input, 2d sim + 2D deconvolution *** +# *** DOES NOT RUN fasthit MODULE *** +# +# +#------------------------------------------------------------------- + +#include "reco1_sce_lite.fcl" + +physics.reco1: [ rns + , opdecopmt + , opdecoxarapuca + , ophitpmt + , ophitxarapuca + , opflashtpc0 + , opflashtpc1 + , opflashtpc0xarapuca + , opflashtpc1xarapuca + # , caldata + , gaushit + # , fasthit + # , linecluster + , gaushitTruthMatch + # , rffhit + # , corner + # , fuzzycluster + ] + +physics.producers.gaushit.CalDataModuleLabel: "simtpc2d:gauss" diff --git a/sbndcode/JobConfigurations/standard/scrubs/CMakeLists.txt b/sbndcode/JobConfigurations/standard/scrubs/CMakeLists.txt new file mode 100644 index 000000000..13355789a --- /dev/null +++ b/sbndcode/JobConfigurations/standard/scrubs/CMakeLists.txt @@ -0,0 +1 @@ +install_fhicl() diff --git a/sbndcode/JobConfigurations/standard/scrubs/scrub_g4_wcls_detsim_reco1.fcl b/sbndcode/JobConfigurations/standard/scrubs/scrub_g4_wcls_detsim_reco1.fcl new file mode 100644 index 000000000..c15550ef2 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/scrubs/scrub_g4_wcls_detsim_reco1.fcl @@ -0,0 +1,32 @@ +# This fcl purely removes products made in the G4, WCLS, DetSim & Reco1 processes. +# This allows for keeping the identical simulated event on the file and running +# a variation of the downstream detector simulation / reconstruction. +# +# Author Henry Lay (h.lay@lancaster.ac.uk) + +#include "rootoutput_sbnd.fcl" + +source: +{ + module_type: RootInput + inputCommands: [ "keep *_*_*_*", + "drop *_*_*_G4", + "drop *_*_*_WCLS", + "drop *_*_*_DetSim", + "drop *_*_*_Reco1" ] +} + +outputs: +{ + out1: + { + @table::sbnd_rootoutput + dataTier: "simulated" + } +} + +physics: +{ + stream1: [ out1 ] + end_paths: [ stream1 ] +} diff --git a/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl index db3d7ea98..013e62fbd 100644 --- a/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl +++ b/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl @@ -123,14 +123,7 @@ outputs: { @table::sbnd_rootoutput dataTier: "simulated" - outputCommands: [ "keep *_*_*_*" - # Drop the SimEnergyDeposits made by LArG4 - , "drop sim::SimEnergyDeposits_largeant_*_*" - # Drop the IonAndScint w/ SCE offsets applied - , "drop *_ionandscint__*" - # Drop LArG4 AuxDetHits, now replaced by AuxDetSimChannels - , "drop sim::AuxDetHits_*_*_*" - ] + outputCommands: [ "keep *_*_*_*" ] } } diff --git a/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-nf-sp.jsonnet b/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-nf-sp.jsonnet index 2fda90185..86dffab76 100644 --- a/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-nf-sp.jsonnet +++ b/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-nf-sp.jsonnet @@ -105,7 +105,7 @@ local wcls_output = { frame_tags: ['gauss', 'wiener'], // this may be needed to convert the decon charge [units:e-] to be consistent with the LArSoft default ?unit? e.g. decon charge * 0.005 --> "charge value" to GaussHitFinder - frame_scale: [1.0, 1.0], + frame_scale: [0.02, 0.02], nticks: params.daq.nticks, chanmaskmaps: [], //nticks: , diff --git a/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-simchannel-nf-sp.jsonnet b/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-simchannel-nf-sp.jsonnet index 77045b49a..1b2bd5c94 100644 --- a/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-simchannel-nf-sp.jsonnet +++ b/sbndcode/WireCell/cfg/pgrapher/experiment/sbnd/wcls-sim-drift-simchannel-nf-sp.jsonnet @@ -246,7 +246,7 @@ local wcls_output_sp = { frame_tags: ['gauss', 'wiener'], // this may be needed to convert the decon charge [units:e-] to be consistent with the LArSoft default ?unit? e.g. decon charge * 0.005 --> "charge value" to GaussHitFinder - frame_scale: [1.0, 1.0], + frame_scale: [0.02, 0.02], nticks: params.daq.nticks, chanmaskmaps: [], //nticks: -1,