Merge branch 'release/v10_04_06_01'

Author: Brinden Carlson

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.04.05)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.04.06.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 10.04.05)
+# project(sbndcode VERSION 10.04.06.01)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

sbndcode/JobConfigurations/README.md

@@ -1,34 +1,37 @@
 # SBND Core FHiCL Files
 
-4th October 2024 (Dom Brailsford)
+- 25th February 2025 (Marco Del Tutto)
+`standard_g4_[rockbox_,intime_]sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow. SCE services are enabled by default.
+`standard_detsim_sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow. SCE services are enabled by default.
+- 4th October 2024 (Dom Brailsford)
 `standard_reco2_sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow.  SCE services are enabled by default
-15th July 2024 (Dom Brailsford)
+- 15th July 2024 (Dom Brailsford)
 `standard_reco1_sbnd.fcl` has been promoted back to an up-to-date fcl so can be used as part of any standard workflow.  The below suggested workflows have been updated to include this information.
 
 
-The intended operation of the fcl workflows is that the `standard-*` fcls run the standard workflow. This isn't currently true and should be acknowledged here. The WireCell 2D TPC simulation/signal processing workflow has now been implemented into the `standard-*` fcls, and the 1D simulation is now deprecated. The main deviation of the *core* workflow (described below) from the `standard-*` fcls is the inclusion of the space charge simulation. The *core* workflow also includes the dropping of some heavy data products (hence the `lite` suffix).
+The intended operation of the fcl workflows is that the `standard-*` fcls run the standard workflow. The WireCell 2D TPC simulation/signal processing workflow has now been implemented into the `standard-*` fcls, and the 1D simulation is now deprecated. The *standard* workflow also includes the dropping of some heavy data products.
 
 At the time of writing, the core workflow (for BNB + Dirt + Cosmics) is the following:
 
-- `prodoverlay_corsika_cosmics_proton_genie_rockbox_sce.fcl`
-- `g4_sce_dirt_filter_lite.fcl` (does not include TPC electron drift simulation)
-- `detsim_sce_lite.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
+- `prodgenie_corsika_proton_rockbox_sbnd.fcl`
+- `standard_g4_rockbox_sbnd.fcl` (does not include TPC electron drift simulation)
+- `standard_detsim_sbnd.fcl` (includes TPC drift simulation, TPC electronics simulation, and signal processing)
 - `standard_reco1_sbnd.fcl`
 - `standard_reco2_sbnd.fcl`
 
 The intime workflow is as follows:
 
-- `prodcorsika_proton_intime_filter_sce.fcl`
-- `g4_sce_simphotontime_filter_lite.fcl`
-- `detsim_sce_lite.fcl`
+- `prodcorsika_proton_intime_sbnd.fcl`
+- `standard_g4_intime_sbnd.fcl`
+- `standard_detsim_sbnd.fcl`
 - `standard_reco1_sbnd.fcl`
 - `standard_reco2_sbnd.fcl`
 
 For single generator workflows (like intrinsic neutrino samples) the workflow is the following:
 
 - `<your-gen>.fcl`
-- `g4_sce_lite.fcl`
-- `detsim_sce_lite.fcl`
+- `standard_g4_sbnd.fcl`
+- `standard_detsim_sbnd.fcl`
 - `standard_reco1_sbnd.fcl`
 - `standard_reco2_sbnd.fcl`
 

sbndcode/JobConfigurations/base/prodgenie_sbnd_proj.fcl

@@ -1,5 +1,4 @@
 #include "simulationservices_sbnd.fcl"
-#include "largeantmodules_sbnd.fcl"
 #include "detsimmodules_sbnd.fcl"
 
 process_name: GenieGen

sbndcode/JobConfigurations/base/prodmarley_sbnd_1event.fcl

@@ -34,7 +34,7 @@
 #
 
 #include "singles_sbnd.fcl"
-#include "largeantmodules_sbnd.fcl"
+#include "larg4_sbnd.fcl"
 #include "detsimmodules_sbnd.fcl"
 
 
@@ -75,7 +75,8 @@ physics:
     rns:       { module_type: "RandomNumberSaver" }
     generator: @local::standard_marley # marley events
     # generator: @local::sbnd_singlep
-    largeant:  @local::sbnd_largeant
+    loader: { module_type: "PhysListLoader" }
+    largeant: @local::sbnd_larg4
     daq:       @local::sbnd_simwire
   }
 

sbndcode/JobConfigurations/base/prodsingle_fastoptical2.fcl

@@ -1,6 +1,6 @@
 #include "simulationservices_sbnd.fcl"
 #include "singles_sbnd.fcl"
-#include "largeantmodules_sbnd.fcl"
+#include "larg4_sbnd.fcl"
 #include "detsimmodules_sbnd.fcl"
 #include "opticaldetectormodules_sbnd.fcl"
 #include "photpropservices_sbnd.fcl"
@@ -61,8 +61,9 @@ physics:
 
  producers:
  {
-   generator: @local::sbnd_lightsource	  
-   largeant:  @local::sbnd_largeant	  
+   generator: @local::sbnd_lightsource
+   loader: { module_type: "PhysListLoader" }
+   largeant:  @local::sbnd_larg4
  }
 
  analyzers: