Merge branch 'release/v10_01_04d00'

DUNE · Dec 13, 2024 · ae3c06e · ae3c06e
2 parents 4c6c8b8 + ddaea92
commit ae3c06e
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required (VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules REQUIRED)
 project(dunesw LANGUAGES CXX)
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.01.03d01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.01.04d00)
 
 include(CetCMakeEnv)
 cet_cmake_env()

diff --git a/fcl/dunefd/detsim/gain140_detsim_dune10kt_1x2x6.fcl b/fcl/dunefd/detsim/gain140_detsim_dune10kt_1x2x6.fcl
@@ -0,0 +1,7 @@
+#include "standard_detsim_dune10kt_1x2x6.fcl"
+
+outputs.out1.fileName: "%ifb_detsim_gain140.root"
+
+physics.tpcrawdecoder.wcls_main.configs: [
+"pgrapher/experiment/dune10kt-1x2x6/wcls-sim-drift-simchannel-nf-sp_gain140.jsonnet"
+]
diff --git a/fcl/dunefd/detsim/gain78_detsim_dune10kt_1x2x6.fcl b/fcl/dunefd/detsim/gain78_detsim_dune10kt_1x2x6.fcl
@@ -0,0 +1,7 @@
+#include "standard_detsim_dune10kt_1x2x6.fcl"
+
+outputs.out1.fileName: "%ifb_detsim_gain78.root"
+
+physics.tpcrawdecoder.wcls_main.configs: [
+"pgrapher/experiment/dune10kt-1x2x6/wcls-sim-drift-simchannel-nf-sp_gain78.jsonnet"
+]
diff --git a/fcl/dunefd/gen/solar/prodalpha_solar_flat_dune10kt_1x2x6.fcl b/fcl/dunefd/gen/solar/prodalpha_solar_flat_dune10kt_1x2x6.fcl
@@ -0,0 +1,8 @@
+#include "prodelectron_solar_flat_dune10kt_1x2x6.fcl"
+
+outputs.out1.fileName: "prodalpha_solar_flat_dune10kt_1x2x6_gen.root"
+
+physics.producers.generator.PDG:    [ 1000020040 ] # alpha
+physics.producers.generator.PDist:    0            # Flat K.E. dist. (1-20 MeV)
+physics.producers.generator.P0:     [ 236.24e-3 ]
+physics.producers.generator.SigmaP: [ 149.89e-3 ]
diff --git a/fcl/dunefd/gen/solar/prodalpha_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA.fcl b/fcl/dunefd/gen/solar/prodalpha_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA.fcl
@@ -0,0 +1,8 @@
+#include "prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA.fcl"
+
+outputs.out1.fileName:    "prodalpha_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA_gen.root"
+
+physics.producers.generator.PDG:    [ 1000020040 ] # alpha
+physics.producers.generator.PDist:    0            # Flat K.E. dist. (1-20 MeV)
+physics.producers.generator.P0:     [ 236.24e-3 ]
+physics.producers.generator.SigmaP: [ 149.89e-3 ]
diff --git a/fcl/dunefd/gen/solar/prodalpha_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA.fcl b/fcl/dunefd/gen/solar/prodalpha_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA.fcl
@@ -0,0 +1,8 @@
+#include "prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA.fcl"
+
+outputs.out1.fileName:    "prodalpha_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA_gen.root"
+
+physics.producers.generator.PDG:    [ 1000020040 ] # alpha
+physics.producers.generator.PDist:    0            # Flat K.E. dist. (1-20 MeV)
+physics.producers.generator.P0:     [ 236.24e-3 ]
+physics.producers.generator.SigmaP: [ 149.89e-3 ]
diff --git a/fcl/dunefd/gen/solar/prodelectron_solar_flat_dune10kt_1x2x6.fcl b/fcl/dunefd/gen/solar/prodelectron_solar_flat_dune10kt_1x2x6.fcl
@@ -10,18 +10,27 @@ services:
     @table::dunefd_1x2x6_simulation_services
 }
 
-source.firstRun: 20000011
+services.NuRandomService.policy: "random"
+
+producers:
+{
+    generator: @local::standard_singlep
+}
+
+#define the producer and filter modules for this path, order matters, 
+#filters reject all following items.  see lines starting physics.producers below
+simulate: [ generator ]
 
 physics.producers.generator.PDG:    [ 11 ]       # electron
 physics.producers.generator.PosDist: 0             # Flat position dist.
 physics.producers.generator.X0: [ 0 ]
 physics.producers.generator.Y0: [ 0.0 ]
 physics.producers.generator.Z0: [ 695 ]
-physics.producers.generator.T0: [ 500.0 ]
+physics.producers.generator.T0: [ 0 ]
 physics.producers.generator.SigmaX: [ 360 ]      # x = (-3.6, 3.6)
 physics.producers.generator.SigmaY: [ 600 ]      # y = (-6, 6)
 physics.producers.generator.SigmaZ: [ 695 ]      # z = (0, 13.9)
-physics.producers.generator.SigmaT: [ 500.0 ]        # In time
+physics.producers.generator.SigmaT: [ 0 ]        # In time
 physics.producers.generator.PDist:    0          # Flat K.E. dist. (1-20 MeV)
 physics.producers.generator.P0:     [ 10.43e-3 ]
 physics.producers.generator.SigmaP: [ 09.57e-3 ]

diff --git a/...unefd/gen/solar/prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA.fcl b/...unefd/gen/solar/prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA.fcl
@@ -20,16 +20,18 @@ physics.producers.generator.PosDist: 0             # Flat position dist.
 physics.producers.generator.X0: [ 0 ]
 physics.producers.generator.Y0: [ 0.0 ]
 physics.producers.generator.Z0: [ 695 ]
-physics.producers.generator.T0: [ 500.0 ]
+physics.producers.generator.T0: [ 0 ]
 physics.producers.generator.SigmaX: [ 360 ]      # x = (-3.6, 3.6)
 physics.producers.generator.SigmaY: [ 600 ]      # y = (-6, 6)
 physics.producers.generator.SigmaZ: [ 695 ]      # z = (0, 13.9)
-physics.producers.generator.SigmaT: [ 500.0 ]        # In time
+physics.producers.generator.SigmaT: [ 0 ]        # In time
 physics.producers.generator.PDist:    0          # Flat K.E. dist. (1-20 MeV)
 physics.producers.generator.P0:     [ 10.43e-3 ]
 physics.producers.generator.SigmaP: [ 09.57e-3 ]
 physics.producers.generator.AngleDist: 0           # Flat angle dist.
 physics.producers.generator.Theta0XZ: [ 0. ]       # y-azimuth
 physics.producers.generator.Theta0YZ: [ 0. ]       # y-latitude
 physics.producers.generator.SigmaThetaXZ: [ 180. ] # Quasi-isotropic
-physics.producers.generator.SigmaThetaYZ: [ 90. ]
+physics.producers.generator.SigmaThetaYZ: [ 90. ]
+
+services.NuRandomService.policy: "random"
diff --git a/...unefd/gen/solar/prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA.fcl b/...unefd/gen/solar/prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA.fcl
@@ -20,11 +20,11 @@ physics.producers.generator.PosDist: 0             # Flat position dist.
 physics.producers.generator.X0: [ 0 ]
 physics.producers.generator.Y0: [ 0.0 ]
 physics.producers.generator.Z0: [ 695 ]
-physics.producers.generator.T0: [ 500.0 ]
+physics.producers.generator.T0: [ 0 ]
 physics.producers.generator.SigmaX: [ 360 ]      # x = (-3.6, 3.6)
 physics.producers.generator.SigmaY: [ 600 ]      # y = (-6, 6)
 physics.producers.generator.SigmaZ: [ 695 ]      # z = (0, 13.9)
-physics.producers.generator.SigmaT: [ 500.0 ]        # In time
+physics.producers.generator.SigmaT: [ 0 ]        # In time
 physics.producers.generator.PDist:    0          # Flat K.E. dist. (1-20 MeV)
 physics.producers.generator.P0:     [ 10.43e-3 ]
 physics.producers.generator.SigmaP: [ 09.57e-3 ]
@@ -33,3 +33,5 @@ physics.producers.generator.Theta0XZ: [ 0. ]       # y-azimuth
 physics.producers.generator.Theta0YZ: [ 0. ]       # y-latitude
 physics.producers.generator.SigmaThetaXZ: [ 180. ] # Quasi-isotropic
 physics.producers.generator.SigmaThetaYZ: [ 90. ]
+
+services.NuRandomService.policy: "random"
diff --git a/fcl/dunefd/gen/solar/prodmarley_thld_es_flat_dune10kt_1x2x6.fcl b/fcl/dunefd/gen/solar/prodmarley_thld_es_flat_dune10kt_1x2x6.fcl
@@ -0,0 +1,5 @@
+#include "prodmarley_nue_es_flat_dune10kt_1x2x6.fcl"
+
+physics.producers.marley.marley_parameters.source.Emax: 5.
+physics.producers.marley.marley_parameters.source.E_bin_lefts: [0.0]
+outputs.out1.fileName:    "prodmarley_solar_es_flat_dune10kt_1x2x6_gen.root"
diff --git a/ups/product_deps b/ups/product_deps
@@ -266,10 +266,10 @@ table_fragment_end
 
 product          version
 cetmodules	 v3_24_01	-	only_for_build
-duneexamples     v10_01_03d01
-dunedataprep     v10_01_03d01
-duneana          v10_01_03d01
-protoduneana     v10_01_03d01
+duneexamples     v10_01_04d00
+dunedataprep     v10_01_04d00
+duneana          v10_01_04d00
+protoduneana     v10_01_04d00
 end_product_list