From 3a130a44fdd24d7d61cd8e9bdd1cc35529e79c51 Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Mon, 11 Aug 2025 08:59:03 -0500 Subject: [PATCH 1/7] Keep sim::SimPhotonsLites for PDS detvar --- sbndcode/JobConfigurations/base/detsim_drops.fcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbndcode/JobConfigurations/base/detsim_drops.fcl b/sbndcode/JobConfigurations/base/detsim_drops.fcl index 5a144d8bc..07e81a0ec 100644 --- a/sbndcode/JobConfigurations/base/detsim_drops.fcl +++ b/sbndcode/JobConfigurations/base/detsim_drops.fcl @@ -5,10 +5,12 @@ # Purpose: Sequence of RootOutput drop commands to drop data products after detsim. # # Created: 28-Mar-2022 H. Greenlee +# Modified: 11-Aug-2025 L. Wan # # Notes. # # 1. Keeping SimChannels by choice, for now. +# 2. Keeping SimPhotonsLites for PDS detvar # # #============================================================================= @@ -18,7 +20,6 @@ BEGIN_PROLOG detsim_drops: [ @sequence::g4_drops - , "drop sim::SimPhotonsLites_*_*_*" , "drop sim::SimPhotons_*_*_*" , "drop sim::SimEnergyDeposits_ionandscintout__*" , "drop sim::SimEnergyDeposits_ionandscint_*_*" From 88a9f1aa4ef66851e4acdee25e793dce260bf4d3 Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Wed, 13 Aug 2025 09:56:32 -0500 Subject: [PATCH 2/7] Save SimEnergyDeposits_ionandscint_priorSCE_G4 for future detvar --- sbndcode/JobConfigurations/base/detsim_drops.fcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbndcode/JobConfigurations/base/detsim_drops.fcl b/sbndcode/JobConfigurations/base/detsim_drops.fcl index 07e81a0ec..f8047d6d2 100644 --- a/sbndcode/JobConfigurations/base/detsim_drops.fcl +++ b/sbndcode/JobConfigurations/base/detsim_drops.fcl @@ -23,7 +23,8 @@ detsim_drops: [ @sequence::g4_drops , "drop sim::SimPhotons_*_*_*" , "drop sim::SimEnergyDeposits_ionandscintout__*" , "drop sim::SimEnergyDeposits_ionandscint_*_*" - , "drop sim::SimEnergyDeposits_largeant_*_*"] + , "drop sim::SimEnergyDeposits_largeant_*_*" + , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] END_PROLOG From e6567ec5f308f7c3daec0823747bdcc0414d04d9 Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Thu, 14 Aug 2025 09:09:18 -0500 Subject: [PATCH 3/7] Keep sim::SimEnergyDeposits_ionandscint_PriorSCE_G4 and drop sim::SimEnergyDeposits_ionandscint__G4 --- sbndcode/JobConfigurations/base/detsim_drops.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbndcode/JobConfigurations/base/detsim_drops.fcl b/sbndcode/JobConfigurations/base/detsim_drops.fcl index f8047d6d2..e0c1d07df 100644 --- a/sbndcode/JobConfigurations/base/detsim_drops.fcl +++ b/sbndcode/JobConfigurations/base/detsim_drops.fcl @@ -22,7 +22,7 @@ BEGIN_PROLOG detsim_drops: [ @sequence::g4_drops , "drop sim::SimPhotons_*_*_*" , "drop sim::SimEnergyDeposits_ionandscintout__*" - , "drop sim::SimEnergyDeposits_ionandscint_*_*" + , "drop sim::SimEnergyDeposits_ionandscint__G4" , "drop sim::SimEnergyDeposits_largeant_*_*" , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] From e860059ef49e59b7b56ca9202e0a8093da43bcd6 Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Thu, 14 Aug 2025 09:13:46 -0500 Subject: [PATCH 4/7] Add new drop file to keep SimEnergyDepo for detvars --- .../detsim_drops_keepSimEnergyDeposits.fcl | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl diff --git a/sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl b/sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl new file mode 100644 index 000000000..d91e657d8 --- /dev/null +++ b/sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl @@ -0,0 +1,31 @@ +#============================================================================= +# +# Name: detsim_drops.fcl +# +# Purpose: Sequence of RootOutput drop commands to drop data products after detsim. +# +# Created: 28-Mar-2022 H. Greenlee +# Modified: 11-Aug-2025 L. Wan +# +# Notes. +# +# 1. Keeping SimChannels by choice, for now. +# 2. Keeping SimPhotonsLites for PDS detvar +# 3. Keeping SimEnergyDeposits_ionandscint_priorSCE for other detvars +# +# +#============================================================================= + +#include "g4_drops.fcl" + +BEGIN_PROLOG + +detsim_drops: [ @sequence::g4_drops + , "drop sim::SimPhotons_*_*_*" + , "drop sim::SimEnergyDeposits_ionandscintout__*" + , "drop sim::SimEnergyDeposits_ionandscint_*_*" + , "drop sim::SimEnergyDeposits_largeant_*_*" + , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] + +END_PROLOG + From c0d2c1ce9bafbe8820091e32682fa5540adba19b Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Thu, 14 Aug 2025 09:14:10 -0500 Subject: [PATCH 5/7] Revert the default to drop all SimEnergyDeposits --- sbndcode/JobConfigurations/base/detsim_drops.fcl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sbndcode/JobConfigurations/base/detsim_drops.fcl b/sbndcode/JobConfigurations/base/detsim_drops.fcl index e0c1d07df..07e81a0ec 100644 --- a/sbndcode/JobConfigurations/base/detsim_drops.fcl +++ b/sbndcode/JobConfigurations/base/detsim_drops.fcl @@ -22,9 +22,8 @@ BEGIN_PROLOG detsim_drops: [ @sequence::g4_drops , "drop sim::SimPhotons_*_*_*" , "drop sim::SimEnergyDeposits_ionandscintout__*" - , "drop sim::SimEnergyDeposits_ionandscint__G4" - , "drop sim::SimEnergyDeposits_largeant_*_*" - , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] + , "drop sim::SimEnergyDeposits_ionandscint_*_*" + , "drop sim::SimEnergyDeposits_largeant_*_*"] END_PROLOG From 42cf362554610d420c9ac679cfb0f5aa7821d830 Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Thu, 11 Sep 2025 10:24:53 -0500 Subject: [PATCH 6/7] Make default to keep SimEnergyDeposits for wiremod --- .../JobConfigurations/base/detsim_drops.fcl | 4 ++- .../detsim_drops_keepSimEnergyDeposits.fcl | 31 ------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl diff --git a/sbndcode/JobConfigurations/base/detsim_drops.fcl b/sbndcode/JobConfigurations/base/detsim_drops.fcl index 07e81a0ec..d91e657d8 100644 --- a/sbndcode/JobConfigurations/base/detsim_drops.fcl +++ b/sbndcode/JobConfigurations/base/detsim_drops.fcl @@ -11,6 +11,7 @@ # # 1. Keeping SimChannels by choice, for now. # 2. Keeping SimPhotonsLites for PDS detvar +# 3. Keeping SimEnergyDeposits_ionandscint_priorSCE for other detvars # # #============================================================================= @@ -23,7 +24,8 @@ detsim_drops: [ @sequence::g4_drops , "drop sim::SimPhotons_*_*_*" , "drop sim::SimEnergyDeposits_ionandscintout__*" , "drop sim::SimEnergyDeposits_ionandscint_*_*" - , "drop sim::SimEnergyDeposits_largeant_*_*"] + , "drop sim::SimEnergyDeposits_largeant_*_*" + , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] END_PROLOG diff --git a/sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl b/sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl deleted file mode 100644 index d91e657d8..000000000 --- a/sbndcode/JobConfigurations/base/detsim_drops_keepSimEnergyDeposits.fcl +++ /dev/null @@ -1,31 +0,0 @@ -#============================================================================= -# -# Name: detsim_drops.fcl -# -# Purpose: Sequence of RootOutput drop commands to drop data products after detsim. -# -# Created: 28-Mar-2022 H. Greenlee -# Modified: 11-Aug-2025 L. Wan -# -# Notes. -# -# 1. Keeping SimChannels by choice, for now. -# 2. Keeping SimPhotonsLites for PDS detvar -# 3. Keeping SimEnergyDeposits_ionandscint_priorSCE for other detvars -# -# -#============================================================================= - -#include "g4_drops.fcl" - -BEGIN_PROLOG - -detsim_drops: [ @sequence::g4_drops - , "drop sim::SimPhotons_*_*_*" - , "drop sim::SimEnergyDeposits_ionandscintout__*" - , "drop sim::SimEnergyDeposits_ionandscint_*_*" - , "drop sim::SimEnergyDeposits_largeant_*_*" - , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] - -END_PROLOG - From 4534429b8ee54fcc17cdb8bf5d7f96353bf01a58 Mon Sep 17 00:00:00 2001 From: linyan-w <53352772+linyan-w@users.noreply.github.com> Date: Mon, 15 Sep 2025 11:55:56 -0500 Subject: [PATCH 7/7] Keep SimEnergyDeposits to accomodate potential G4 process name changes --- sbndcode/JobConfigurations/base/detsim_drops.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbndcode/JobConfigurations/base/detsim_drops.fcl b/sbndcode/JobConfigurations/base/detsim_drops.fcl index d91e657d8..4fb8efaed 100644 --- a/sbndcode/JobConfigurations/base/detsim_drops.fcl +++ b/sbndcode/JobConfigurations/base/detsim_drops.fcl @@ -25,7 +25,7 @@ detsim_drops: [ @sequence::g4_drops , "drop sim::SimEnergyDeposits_ionandscintout__*" , "drop sim::SimEnergyDeposits_ionandscint_*_*" , "drop sim::SimEnergyDeposits_largeant_*_*" - , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_G4"] + , "keep sim::SimEnergyDeposits_ionandscint_priorSCE_*"] END_PROLOG