Skip to content

Commit

Permalink
Merge branch 'release/v10_02_02d00'
Browse files Browse the repository at this point in the history
  • Loading branch information
aolivier23 committed Dec 20, 2024
2 parents ae3c06e + e53dc58 commit 364fad7
Show file tree
Hide file tree
Showing 16 changed files with 351 additions and 84 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.04d00)
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.02.02d00)

include(CetCMakeEnv)
cet_cmake_env()
Expand Down
6 changes: 3 additions & 3 deletions fcl/dunefd/gen/solar/prodalpha_solar_flat_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
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 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. for K.E. (4-14 MeV)
physics.producers.generator.P0: [ 247.8e-3 ]
physics.producers.generator.SigmaP: [ 75.2e-3 ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
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 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. for K.E. (4-14 MeV)
physics.producers.generator.P0: [ 247.8e-3 ]
physics.producers.generator.SigmaP: [ 75.2e-3 ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
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 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. for K.E. (4-14 MeV)
physics.producers.generator.P0: [ 247.8e-3 ]
physics.producers.generator.SigmaP: [ 75.2e-3 ]
36 changes: 18 additions & 18 deletions fcl/dunefd/gen/solar/prodelectron_solar_flat_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ producers:
#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: [ 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: [ 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.PDG: [ 11 ] # electron
physics.producers.generator.PosDist: 0 # Flat position dist.
physics.producers.generator.X0: [ 0 ]
physics.producers.generator.Y0: [ 0 ]
physics.producers.generator.Z0: [ 700 ]
physics.producers.generator.T0: [ 0 ]
physics.producers.generator.SigmaX: [ 375 ] # x = (-3.75, 3.75) m
physics.producers.generator.SigmaY: [ 630 ] # y = (-6.3, 6.3) m
physics.producers.generator.SigmaZ: [ 730 ] # z = (-0.3, 14.3) m
physics.producers.generator.SigmaT: [ 0 ] # In time
physics.producers.generator.PDist: 0 # Flat K.E. dist. (4-14 MeV)
physics.producers.generator.P0: [ 9.49e-3 ]
physics.producers.generator.SigmaP: [ 5.01e-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
Expand Up @@ -15,23 +15,23 @@ physics:

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: [ 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: [ 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.PDG: [ 11 ] # electron
physics.producers.generator.PosDist: 0 # Flat position dist.
physics.producers.generator.X0: [ 0 ]
physics.producers.generator.Y0: [ 0 ]
physics.producers.generator.Z0: [ 700 ]
physics.producers.generator.T0: [ 0 ]
physics.producers.generator.SigmaX: [ 375 ] # x = (-3.75, 3.75) m
physics.producers.generator.SigmaY: [ 630 ] # y = (-6.3, 6.3) m
physics.producers.generator.SigmaZ: [ 730 ] # z = (-0.3, 14.3) m
physics.producers.generator.SigmaT: [ 0 ] # In time
physics.producers.generator.PDist: 0 # Flat K.E. dist. (1-20 MeV)
physics.producers.generator.P0: [ 9.49e-3 ]
physics.producers.generator.SigmaP: [ 5.01e-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 ]

services.NuRandomService.policy: "random"
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ physics:

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: [ 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: [ 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.PDG: [ 11 ] # electron
physics.producers.generator.PosDist: 0 # Flat position dist.
physics.producers.generator.X0: [ 0 ]
physics.producers.generator.Y0: [ 0 ]
physics.producers.generator.Z0: [ 700 ]
physics.producers.generator.T0: [ 0 ]
physics.producers.generator.SigmaX: [ 375 ] # x = (-3.75, 3.75) m
physics.producers.generator.SigmaY: [ 630 ] # y = (-6.3, 6.3) m
physics.producers.generator.SigmaZ: [ 730 ] # z = (-0.3, 14.3) m
physics.producers.generator.SigmaT: [ 0 ] # In time
physics.producers.generator.PDist: 0 # Flat K.E. dist. (1-20 MeV)
physics.producers.generator.P0: [ 9.49e-3 ]
physics.producers.generator.SigmaP: [ 5.01e-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 ]

services.NuRandomService.policy: "random"
6 changes: 3 additions & 3 deletions fcl/dunefd/gen/solar/prodgamma_solar_flat_dune10kt_1x2x6.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
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 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. (4-14 MeV)
physics.producers.generator.P0: [ 9 ]
physics.producers.generator.SigmaP: [ 5 ]
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ outputs.out1.fileName: "prodgamma_solar_flat_radiological_decay0_dune10kt_1x2

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 ]
physics.producers.generator.P0: [ 9 ]
physics.producers.generator.SigmaP: [ 5 ]
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ outputs.out1.fileName: "prodgamma_solar_flat_radiological_decay0_dune10kt_1x2

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 ]
physics.producers.generator.P0: [ 9e-3 ]
physics.producers.generator.SigmaP: [ 5e-3 ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
outputs.out1.fileName: "prodneutron_solar_flat_dune10kt_1x2x6_gen.root"

physics.producers.generator.PDG: [ 2112 ] # neutron
physics.producers.generator.PDist: 0 # Flat momentum dist. (1-20 MeV)
physics.producers.generator.P0: [ 118.66e-3 ]
physics.producers.generator.SigmaP: [ 75.3e-3 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. for K.E. (4-14 MeV)
physics.producers.generator.P0: [ 124.4e-3 ]
physics.producers.generator.SigmaP: [ 37.7e-3 ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
outputs.out1.fileName: "prodneutron_solar_flat_radiological_decay0_dune10kt_1x2x6_centralAPA_gen.root"

physics.producers.generator.PDG: [ 2112 ] # neutron
physics.producers.generator.PDist: 0 # Flat momentum dist. (1-20 MeV)
physics.producers.generator.P0: [ 118.66e-3 ]
physics.producers.generator.SigmaP: [ 75.3e-3 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. for K.E. (4-14 MeV)
physics.producers.generator.P0: [ 124.4e-3 ]
physics.producers.generator.SigmaP: [ 37.7e-3 ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
outputs.out1.fileName: "prodneutron_solar_flat_radiological_decay0_dune10kt_1x2x6_lateralAPA_gen.root"

physics.producers.generator.PDG: [ 2112 ] # neutron
physics.producers.generator.PDist: 0 # Flat momentum dist. (1-20 MeV)
physics.producers.generator.P0: [ 118.66e-3 ]
physics.producers.generator.SigmaP: [ 75.3e-3 ]
physics.producers.generator.PDist: 0 # Flat momentum dist. for K.E. (4-14 MeV)
physics.producers.generator.P0: [ 124.4e-3 ]
physics.producers.generator.SigmaP: [ 37.7e-3 ]
108 changes: 108 additions & 0 deletions fcl/protodunehd/gen/prod_cosmics_radiologicals_protodunehd.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
#include "services_refactored_pdune.fcl"
#
#include "singles_dune.fcl"
#include "corsika_protodune.fcl"
#include "protodunehd_radiological_model_decay0.fcl"

process_name: SinglesGen

services:
{
# Load the service that manages root files for histograms.
TFileService: { fileName: "prod_cosmics_protodunehd_hist.root" }
TimeTracker: @local::dune_time_tracker
MemoryTracker: @local::dune_memory_tracker
RandomNumberGenerator: {} #ART native random number generator
FileCatalogMetadata: @local::art_file_catalog_mc
@table::protodunehd_refactored_simulation_services
}

#Start each new event with an empty event.
source:
{
module_type: EmptyEvent
timestampPlugin: { plugin_type: "GeneratedEventTimestamp" }
maxEvents: 10
firstRun: 1 # Run number to use for this file
firstEvent: 1 # number of first event in the file
}

# Define and configure some modules to do work on each event.
# First modules are defined; they are scheduled later.
# Modules are grouped by type.
physics:
{

producers:
{
cosmicgenerator: @local::protodune_corsika_cmc
ar39: @local::protodunehd_39Ar_in_LAr
kr85: @local::protodunehd_85Kr_in_LAr
ar42: @local::protodunehd_42Ar_in_LAr
k42fromar42: @local::protodunehd_42Kfrom42Ar_in_LAr

k40cpa: @local::protodunehd_40K_in_CPA
th232cpa: @local::protodunehd_232Th_chain_in_CPA
u238cpa: @local::protodunehd_238U_chain_in_CPA

k40beam: @local::protodunehd_40K_in_CPA
th232beam: @local::protodunehd_232Th_chain_in_CPA
u238beam: @local::protodunehd_238U_chain_in_CPA

co60apa: @local::protodunehd_60Co_in_APA
th232apa: @local::protodunehd_232Th_chain_in_APA
u238apa: @local::protodunehd_238U_chain_in_APA

k40apaboards: @local::protodunehd_40K_in_APAboards
th232apaboards: @local::protodunehd_232Th_chain_in_APAboards
u238apaboards: @local::protodunehd_238U_chain_in_APAboards

}


#define the producer and filter modules for this path, order matters,
simulate: [cosmicgenerator, ar39, ar42, kr85, k42fromar42,
k40beam, th232beam, u238beam,
k40cpa, th232cpa, u238cpa,
co60apa, th232apa, u238apa,
k40apaboards, th232apaboards, u238apaboards
]

#define the output stream, there could be more than one if using filters
stream1: [ out1 ]

#trigger_paths is a keyword and contains the paths that modify the art::event,
#ie filters and producers
trigger_paths: [simulate]

#end_paths is a keyword and contains the paths that do not modify the art::Event,
#ie analyzers and output streams. these all run simultaneously
end_paths: [stream1]
}

#block to define where the output goes. if you defined a filter in the physics
#block and put it in the trigger_paths then you need to put a SelectEvents: {SelectEvents: [XXX]}
#entry in the output stream you want those to go to, where XXX is the label of the filter module(s)
outputs:
{
out1:
{
module_type: RootOutput
fileName: "prod_cosmics_protodunehd.root" #default file name, can override from command line with -o or --output
dataTier: "generated"
compressionLevel: 1
}
}

physics.producers.k40beam.volume_gen: "volEWBeam"
physics.producers.k40beam.material: "FR4"
physics.producers.th232beam.volume_gen: "volEWBeam"
physics.producers.th232beam.material: "FR4"
physics.producers.u238beam.volume_gen: "volEWBeam"
physics.producers.u238beam.material: "FR4"

physics.producers.k40apaboards.volume_gen: ".*G10Board.*"
physics.producers.th232apaboards.volume_gen: ".*G10Board.*"
physics.producers.u238apaboards.volume_gen: ".*G10Board.*"


Loading

0 comments on commit 364fad7

Please sign in to comment.