Skip to content

Commit

Permalink
Merge branch 'release/v10_01_02d00'
Browse files Browse the repository at this point in the history
  • Loading branch information
aolivier23 committed Nov 22, 2024
2 parents f1462ac + b0282d4 commit c4b014e
Show file tree
Hide file tree
Showing 27 changed files with 256 additions and 472 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.01d00)
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.01.02d00)

include(CetCMakeEnv)
cet_cmake_env()
Expand Down
15 changes: 15 additions & 0 deletions fcl/dunefd/g4/solar_alphafilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# solar_alphafilter_g4_dune10kt_1x2x6.fcl
# Author: Sergio Manthey Corchado (2024) (based on supernova_neutronfilter_g4_dune10kt_1x2x6.fcl by Dom Brailsford)
# Purpose: Run the supernova g4 HD 1x2x6 jobset and reject any events that do not have an alpha in the TPC above a certain energy threshold
#
# V1.0
#

#include "supernova_alphafilter_g4_dune10kt_1x2x6.fcl"


# Define the alpha energy filter
physics.filters.alphafilter.ParticleMinMomentum: [ 0.273 ] #Require a minimum momentum of alpha particle mass 3.72737941 + KE 0.010 GeV

# Rename the output file
output.out1.fileName: "%ifb_g4_alphafilter.root"
15 changes: 15 additions & 0 deletions fcl/dunefd/g4/solar_electronfilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# solar_electronfilter_g4_dune10kt_1x2x6.fcl
# Author: Sergio Manthey Corchado (2024) (based on supernova_electronfilter_g4_dune10kt_1x2x6.fcl)
# Purpose: Run the supernova g4 HD 1x2x6 jobset and reject any events that do not have a electron in the TPC above a certain energy threshold
#
# V1.0
#

#include "supernova_electronfilter_g4_dune10kt_1x2x6.fcl"


# Define the alpha energy filter
physics.filters.electronfilter.ParticleMinMomentum: [ 0.003522 ] #Require a minimum momentum of neutron particle mass 0.5 + KE 4.0 MeV

# Rename the output file
output.out1.fileName: "%ifb_g4_electronfilter.root"
15 changes: 15 additions & 0 deletions fcl/dunefd/g4/solar_gammafilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# solar_gammafilter_g4_dune10kt_1x2x6.fcl
# Author: Sergio Manthey Corchado (2024) (based on supernova_gammafilter_g4_dune10kt_1x2x6.fcl)
# Purpose: Run the supernova g4 HD 1x2x6 jobset and reject any events that do not have a gamma in the TPC above a certain energy threshold
#
# V1.0
#

#include "supernova_gammafilter_g4_dune10kt_1x2x6.fcl"


# Define the alpha energy filter
physics.filters.gammafilter.ParticleMinMomentum: [ 0.0056 ] #Require a minimum momentum of neutron particle mass 0 + KE 0.0056 GeV

# Rename the output file
output.out1.fileName: "%ifb_g4_gammafilter.root"
15 changes: 15 additions & 0 deletions fcl/dunefd/g4/solar_neutronfilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# solar_neutronfilter_g4_dune10kt_1x2x6.fcl
# Author: Sergio Manthey Corchado (2024) (based on supernova_neutronfilter_g4_dune10kt_1x2x6.fcl by Dom Brailsford)
# Purpose: Run the supernova g4 HD 1x2x6 jobset and reject any events that do not have a neutron in the TPC above a certain energy threshold
#
# V1.0
#

#include "supernova_neutronfilter_g4_dune10kt_1x2x6.fcl"


# Define the alpha energy filter
physics.filters.neutronfilter.ParticleMinMomentum: [ 0.0077 ] #Require a minimum momentum of neutron particle mass 939.5654 + KE 0.0316 MeV

# Rename the output file
output.out1.fileName: "%ifb_g4_neutronfilter.root"
4 changes: 2 additions & 2 deletions fcl/dunefd/g4/supernova_alphafilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#Define the alpha filter
physics.filters.alphafilter: @local::dunefd_alphafilter
# physics.filters.alphafilter.ParticleMinMomentum: [ 3.72737941 ] #Require a minimum momentum of alpha particle mass
physics.filters.alphafilter.ParticleMinMomentum: [ 3.73237941 ] #Require a minimum momentum of alpha particle mass + 0.005 GeV
# Move energy filter to solar_alphafilter_g4_dune10kt_1x2x6.fcl
# physics.filters.alphafilter.ParticleMinMomentum: [ 0.273 ] #Require a minimum momentum of alpha particle mass 3.72737941 + KE 0.010 GeV

#Run alpha filter at the end
physics.simulate: [ @sequence::physics.simulate, alphafilter ]
Expand Down
19 changes: 19 additions & 0 deletions fcl/dunefd/g4/supernova_electronfilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# supernova_electron_g4_dune10kt_1x2x6.fcl
# Author: Sergio Manthey Corchado (2024)
# Purpose: Run the supernova g4 HD 1x2x6 jobset and reject any events that do not have a electron stopping in the TPC
#
# V1.0
#

#include "larg4particlefilter_dune.fcl"
#include "supernova_g4_dune10kt_1x2x6.fcl"


#Define the electron filter
physics.filters.electronfilter: @local::dunefd_electronfilter

#Run electron filter at the end
physics.simulate: [ @sequence::physics.simulate, electronfilter ]

#Tell ART to actually filter using the ART filter
outputs.out1.SelectEvents: [ simulate ]
19 changes: 19 additions & 0 deletions fcl/dunefd/g4/supernova_gammafilter_g4_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# supernova_gamma_g4_dune10kt_1x2x6.fcl
# Author: Sergio Manthey Corchado (2024)
# Purpose: Run the supernova g4 HD 1x2x6 jobset and reject any events that do not have a gamma stopping in the TPC
#
# V1.0
#

#include "larg4particlefilter_dune.fcl"
#include "supernova_g4_dune10kt_1x2x6.fcl"


#Define the gamma filter
physics.filters.gammafilter: @local::dunefd_gammafilter

#Run gamma filter at the end
physics.simulate: [ @sequence::physics.simulate, gammafilter ]

#Tell ART to actually filter using the ART filter
outputs.out1.SelectEvents: [ simulate ]
1 change: 0 additions & 1 deletion fcl/dunefd/gen/solar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
add_subdirectory(legacy)
# Install fcl files in /job subdirectory.
install_fhicl()

Expand Down
8 changes: 0 additions & 8 deletions fcl/dunefd/gen/solar/legacy/CMakeLists.txt

This file was deleted.

32 changes: 32 additions & 0 deletions fcl/dunefd/gen/solar/prodelectron_solar_flat_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "prodsingle_common_dunefd.fcl"

process_name: SinglesGen

outputs.out1.fileName: "prodelectron_solar_flat_dune10kt_1x2x6_gen.root"

services:
{
@table::services
@table::dunefd_1x2x6_simulation_services
}

source.firstRun: 20000011

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.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.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. ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#include "workflow_radiological_decay0_dune10kt.fcl"
#include "prodelectron_solar_flat_dune10kt_1x2x6.fcl"

physics:
{
@table::physics
producers:
{
@table::dunefd_horizdrift_1x2x6_producers
generator: @local::standard_singlep
rns: { module_type: "RandomNumberSaver" }
}
simulate: [ rns, generator, @sequence::dunefd_hd_backgrounds_1x2x6_lowBgAPA ]
}

outputs.out1.fileName: "prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA_gen.root"

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.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.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. ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#include "workflow_radiological_decay0_dune10kt.fcl"
#include "prodelectron_solar_flat_dune10kt_1x2x6.fcl"

physics:
{
@table::physics
producers:
{
@table::dunefd_horizdrift_1x2x6_producers
generator: @local::standard_singlep
rns: { module_type: "RandomNumberSaver" }
}
simulate: [ rns, generator, @sequence::dunefd_hd_backgrounds_1x2x6 ]
}

outputs.out1.fileName: "prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA_gen.root"

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.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.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. ]
8 changes: 8 additions & 0 deletions fcl/dunefd/gen/solar/prodgamma_solar_flat_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "prodelectron_solar_flat_dune10kt_1x2x6.fcl"

outputs.out1.fileName: "prodgamma_solar_flat_dune10kt_1x2x6_gen.root"

physics.producers.generator.PDG: [ 22 ] # gamma
physics.producers.generator.PDist: 0 # Flat momentum dist. (1-20 MeV)
physics.producers.generator.P0: [ 10.5e-3 ]
physics.producers.generator.SigmaP: [ 09.5e-3 ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA.fcl"

outputs.out1.fileName: "prodgamma_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA_gen.root"

physics.producers.generator.PDG: [ 22 ] # gamma
physics.producers.generator.PDist: 0 # Flat momentum dist. (1-20 MeV)
physics.producers.generator.P0: [ 10.5e-3 ]
physics.producers.generator.SigmaP: [ 09.5e-3 ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "prodelectron_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA.fcl"

outputs.out1.fileName: "prodgamma_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA_gen.root"

physics.producers.generator.PDG: [ 22 ] # gamma
physics.producers.generator.PDist: 0 # Flat momentum dist. (1-20 MeV)
physics.producers.generator.P0: [ 10.5e-3 ]
physics.producers.generator.SigmaP: [ 09.5e-3 ]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "prodmarley_nue_es_flat_dune10kt_1x2x6.fcl"

physics.producers.marley.marley_parameters.source.Emax: 30.
outputs.out1.fileName: "prodmarley_solar_ec_flat_dune10kt_1x2x6_gen.root"
outputs.out1.fileName: "prodmarley_solar_es_flat_dune10kt_1x2x6_gen.root"
67 changes: 0 additions & 67 deletions fcl/dunefd/gen/solar/prodmarley_solar_flat_dune10kt.fcl

This file was deleted.

9 changes: 0 additions & 9 deletions fcl/dunefd/gen/solar/prodmarley_solar_flat_dune10kt_1x2x6.fcl

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c4b014e

Please sign in to comment.