From 2c53ff092198be497321259461bf0935a84f54bb Mon Sep 17 00:00:00 2001 From: Jose Soto Date: Mon, 14 Oct 2024 02:36:22 +0200 Subject: [PATCH 1/6] Delete Rn from pdhd generators. Change name of prod_cosmics_1GeV to prod_cosmics, since there is no beam generator --- fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl | 1 - ...cosmics_1GeV_protodunehd.fcl => prod_cosmics_protodunehd.fcl} | 1 - 2 files changed, 2 deletions(-) rename fcl/protodunehd/gen/{prod_cosmics_1GeV_protodunehd.fcl => prod_cosmics_protodunehd.fcl} (98%) diff --git a/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl b/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl index 950634ae..2654cbdb 100644 --- a/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl +++ b/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl @@ -41,7 +41,6 @@ physics: ar39: @local::protodunesp_39ar ar42: @local::protodunesp_42ar kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn } diff --git a/fcl/protodunehd/gen/prod_cosmics_1GeV_protodunehd.fcl b/fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl similarity index 98% rename from fcl/protodunehd/gen/prod_cosmics_1GeV_protodunehd.fcl rename to fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl index feba5f09..7b283a0f 100644 --- a/fcl/protodunehd/gen/prod_cosmics_1GeV_protodunehd.fcl +++ b/fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl @@ -39,7 +39,6 @@ physics: ar39: @local::protodunesp_39ar ar42: @local::protodunesp_42ar kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn } From 208166c9bea24e5a1ecd8de43d2e12156591ea0e Mon Sep 17 00:00:00 2001 From: Jose Soto Date: Mon, 14 Oct 2024 02:40:42 +0200 Subject: [PATCH 2/6] Review of the pdhd light simulation workflow. Now only the semianalytical model will have a two separated ionandscint instances. New fhicl added for computable graph. --- .../g4/compgraph_g4_protodunehd.fcl | 71 +++++++++++++++++++ .../g4/compgraph_g4_protodunehd_stage2.fcl | 5 ++ .../semianalytical_g4_protodunehd_stage2.fcl | 6 ++ .../g4/standard_g4_protodunehd.fcl | 6 +- .../g4/standard_g4_protodunehd_stage2.fcl | 2 +- 5 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl create mode 100644 fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl create mode 100644 fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl diff --git a/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl b/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl new file mode 100644 index 00000000..4fa08b65 --- /dev/null +++ b/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl @@ -0,0 +1,71 @@ +#include "services_refactored_pdune.fcl" +#include "LArG4_dune.fcl" +#include "IonAndScint_dune.fcl" +#include "PDFastSim_dune.fcl" + +process_name: G4 + +services: +{ + TFileService: { fileName: "g4_protodunehd_hist.root" } + TimeTracker: {} + MemoryTracker: {} # default is one + RandomNumberGenerator: {} #ART native random number generator + message: @local::standard_info + + @table::protodunehd_refactored_simulation_services + + NuRandomService: @local::dune_prod_seedservice +} + + + +source: +{ + module_type: RootInput + maxEvents: 30000 + fileNames: ["gen_protodunehd.root"] +} + +physics: +{ + + producers: + { + + #retain largeant name for compatibility + largeant: @local::protodune_larg4 + IonAndScint: @local::protodunehd_ionandscint_correlated + PDFastSim: @local::protodune_hd_pdfastsim_ann_ar + rns: {module_type: "RandomNumberSaver"} + } + + analyzers: + { + + } + + simulate: [ rns, largeant, IonAndScint, PDFastSim, PDFastSimExternal ] + + stream1: [ out1 ] + + trigger_paths: [ simulate ] + end_paths: [ stream1 ] +} + +outputs: +{ + out1: + { + module_type: RootOutput + fileName: "%ifb_g4.root" + dataTier: "simulated" + #outputCommands: [ "keep *" ] + outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4"] + #fastCloning: false #will fail if the split level is not the same as for the gen stage, so turn it off + compressionLevel: 1 #zlib argument (0-9) + #basketSize: 8192 #[Byte] buffer size at 8k + #splitLevel: 0 #reduces number of buffers + #treeMaxVirtualSize: 1 #[Byte] limits number of buffers/branch to 1 (default is 10) + } +} diff --git a/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl new file mode 100644 index 00000000..282698d5 --- /dev/null +++ b/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl @@ -0,0 +1,5 @@ +#include "compgraph_g4_protodunehd_stage2.fcl" + +process_name: G4Stage2 + +simulate: [ rns, IonAndScint, PDFastSim ] diff --git a/fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl new file mode 100644 index 00000000..4e727f8e --- /dev/null +++ b/fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl @@ -0,0 +1,6 @@ +#include "semianalytical_g4_protodunehd.fcl" + +process_name: G4Stage2 + +physics.simulate: [ rns, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] + diff --git a/fcl/protodunehd/g4/standard_g4_protodunehd.fcl b/fcl/protodunehd/g4/standard_g4_protodunehd.fcl index d5874b86..5a6a8fc1 100644 --- a/fcl/protodunehd/g4/standard_g4_protodunehd.fcl +++ b/fcl/protodunehd/g4/standard_g4_protodunehd.fcl @@ -36,10 +36,8 @@ physics: #retain largeant name for compatibility largeant: @local::protodune_larg4 - IonAndScint: @local::protodunehd_ionandscint - IonAndScintExternal: @local::protodunehd_ionandscint_external + IonAndScint: @local::protodunehd_ionandscint_correlated PDFastSim: @local::protodune_hd_pdfastsim_pvs - PDFastSimExternal: @local::protodune_hd_pdfastsim_pvs_external rns: {module_type: "RandomNumberSaver"} } @@ -48,7 +46,7 @@ physics: } - simulate: [ rns, largeant, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] + simulate: [ rns, largeant, IonAndScint, PDFastSim ] stream1: [ out1 ] diff --git a/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl index 4b17f06e..2898464a 100644 --- a/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl +++ b/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl @@ -1,6 +1,6 @@ #include "standard_g4_protodunehd.fcl" process_name: G4Stage2 -physics.simulate: [ rns, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] +physics.simulate: [ rns, IonAndScint, PDFastSim ] services.TFileService.fileName: "g4_protodunehd_hist.root" outputs.out1.fileName: "%ifb_g4_stage2.root" From 2be823b1bf5d815a74e88b1be2a674bd769d4c17 Mon Sep 17 00:00:00 2001 From: Jose Soto Date: Thu, 24 Oct 2024 13:52:02 +0200 Subject: [PATCH 3/6] Rename semiana to standard, changed radiological generators to decay0, fixed some typos in the comp graph fhicl. --- .../detsim/standard_detsim_protodunehd.fcl | 3 +- .../g4/compgraph_g4_protodunehd.fcl | 4 +- .../g4/compgraph_g4_protodunehd_stage2.fcl | 2 +- ...d.fcl => photonlibrary_g4_protodunehd.fcl} | 11 ++- .../photonlibrary_g4_protodunehd_stage2.fcl | 6 ++ .../semianalytical_g4_protodunehd_stage2.fcl | 6 -- .../g4/standard_g4_protodunehd.fcl | 11 +-- .../g4/standard_g4_protodunehd_stage2.fcl | 6 +- .../prod_beam_cosmics_1GeV_protodunehd.fcl | 13 +-- .../gen/prod_cosmics_protodunehd.fcl | 13 +-- .../gen/prodsinglep_protodunehd.fcl | 88 +++++++++++++++++++ .../gen/gen_protodunevd_beam_p1GeV.fcl | 14 +-- .../gen/gen_protodunevd_cosmics_driftY.fcl | 11 +-- .../gen/gen_protodunevd_cosmics_radio.fcl | 11 +-- ...rotodunevd_cosmics_radio_electron_1GeV.fcl | 11 +-- ...en_protodunevd_cosmics_radio_kaon_1GeV.fcl | 11 +-- ...en_protodunevd_cosmics_radio_pion_1GeV.fcl | 11 +-- fcl/protodunevd/gen/gen_protodunevd_radio.fcl | 11 +-- 18 files changed, 170 insertions(+), 73 deletions(-) rename fcl/protodunehd/g4/{semianalytical_g4_protodunehd.fcl => photonlibrary_g4_protodunehd.fcl} (80%) create mode 100644 fcl/protodunehd/g4/photonlibrary_g4_protodunehd_stage2.fcl delete mode 100644 fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl create mode 100644 fcl/protodunehd/gen/prodsinglep_protodunehd.fcl diff --git a/fcl/protodunehd/detsim/standard_detsim_protodunehd.fcl b/fcl/protodunehd/detsim/standard_detsim_protodunehd.fcl index df43ee37..aef6121e 100644 --- a/fcl/protodunehd/detsim/standard_detsim_protodunehd.fcl +++ b/fcl/protodunehd/detsim/standard_detsim_protodunehd.fcl @@ -29,7 +29,7 @@ physics: producers: { tpcrawdecoder: @local::wirecell_protodunehdmc - opdigi: @local::protodune_opdigi_refactor + opdigi: @local::protodunehd_opdigi crt: @local::CRTSimRefac_standard rns: { module_type: "RandomNumberSaver" } } @@ -65,4 +65,3 @@ outputs: } services.WireReadout.WireReadoutClass: "DuneApaWireReadout" -physics.producers.opdigi.InputModules: ["PDFastSim", "PDFastSimExternal"] diff --git a/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl b/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl index 4fa08b65..3cb96e65 100644 --- a/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl +++ b/fcl/protodunehd/g4/compgraph_g4_protodunehd.fcl @@ -45,7 +45,7 @@ physics: } - simulate: [ rns, largeant, IonAndScint, PDFastSim, PDFastSimExternal ] + simulate: [ rns, largeant, IonAndScint, PDFastSim ] stream1: [ out1 ] @@ -61,7 +61,7 @@ outputs: fileName: "%ifb_g4.root" dataTier: "simulated" #outputCommands: [ "keep *" ] - outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4"] + outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4*"] #fastCloning: false #will fail if the split level is not the same as for the gen stage, so turn it off compressionLevel: 1 #zlib argument (0-9) #basketSize: 8192 #[Byte] buffer size at 8k diff --git a/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl index 282698d5..e57e7232 100644 --- a/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl +++ b/fcl/protodunehd/g4/compgraph_g4_protodunehd_stage2.fcl @@ -1,4 +1,4 @@ -#include "compgraph_g4_protodunehd_stage2.fcl" +#include "compgraph_g4_protodunehd.fcl" process_name: G4Stage2 diff --git a/fcl/protodunehd/g4/semianalytical_g4_protodunehd.fcl b/fcl/protodunehd/g4/photonlibrary_g4_protodunehd.fcl similarity index 80% rename from fcl/protodunehd/g4/semianalytical_g4_protodunehd.fcl rename to fcl/protodunehd/g4/photonlibrary_g4_protodunehd.fcl index 3663c781..f5411186 100644 --- a/fcl/protodunehd/g4/semianalytical_g4_protodunehd.fcl +++ b/fcl/protodunehd/g4/photonlibrary_g4_protodunehd.fcl @@ -14,6 +14,7 @@ services: message: @local::standard_info @table::protodunehd_refactored_simulation_services + PhotonVisibilityService: @local::protodune_hd_v6_photonvisibilityservice NuRandomService: @local::dune_prod_seedservice } @@ -35,10 +36,8 @@ physics: #retain largeant name for compatibility largeant: @local::protodune_larg4 - IonAndScint: @local::protodunehd_ionandscint - IonAndScintExternal: @local::protodunehd_ionandscint_external - PDFastSim: @local::protodune_hd_pdfastsim_par - PDFastSimExternal: @local::protodune_hd_pdfastsim_pvs_external + IonAndScint: @local::protodunehd_ionandscint_correlated + PDFastSim: @local::protodune_hd_pdfastsim_pvs rns: {module_type: "RandomNumberSaver"} } @@ -47,7 +46,7 @@ physics: } - simulate: [ rns, largeant, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] + simulate: [ rns, largeant, IonAndScint, PDFastSim ] stream1: [ out1 ] @@ -63,7 +62,7 @@ outputs: fileName: "%ifb_g4.root" dataTier: "simulated" #outputCommands: [ "keep *" ] - outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4"] + outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4*"] #fastCloning: false #will fail if the split level is not the same as for the gen stage, so turn it off compressionLevel: 1 #zlib argument (0-9) #basketSize: 8192 #[Byte] buffer size at 8k diff --git a/fcl/protodunehd/g4/photonlibrary_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/photonlibrary_g4_protodunehd_stage2.fcl new file mode 100644 index 00000000..348f4e0d --- /dev/null +++ b/fcl/protodunehd/g4/photonlibrary_g4_protodunehd_stage2.fcl @@ -0,0 +1,6 @@ +#include "photonlibrary_g4_protodunehd.fcl" + +process_name: G4Stage2 +physics.simulate: [ rns, IonAndScint, PDFastSim ] +services.TFileService.fileName: "g4_protodunehd_hist.root" +outputs.out1.fileName: "%ifb_g4_stage2.root" diff --git a/fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl deleted file mode 100644 index 4e727f8e..00000000 --- a/fcl/protodunehd/g4/semianalytical_g4_protodunehd_stage2.fcl +++ /dev/null @@ -1,6 +0,0 @@ -#include "semianalytical_g4_protodunehd.fcl" - -process_name: G4Stage2 - -physics.simulate: [ rns, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] - diff --git a/fcl/protodunehd/g4/standard_g4_protodunehd.fcl b/fcl/protodunehd/g4/standard_g4_protodunehd.fcl index 5a6a8fc1..1839512c 100644 --- a/fcl/protodunehd/g4/standard_g4_protodunehd.fcl +++ b/fcl/protodunehd/g4/standard_g4_protodunehd.fcl @@ -14,7 +14,6 @@ services: message: @local::standard_info @table::protodunehd_refactored_simulation_services - PhotonVisibilityService: @local::protodune_hd_v6_photonvisibilityservice NuRandomService: @local::dune_prod_seedservice } @@ -36,8 +35,10 @@ physics: #retain largeant name for compatibility largeant: @local::protodune_larg4 - IonAndScint: @local::protodunehd_ionandscint_correlated - PDFastSim: @local::protodune_hd_pdfastsim_pvs + IonAndScint: @local::protodunehd_ionandscint + IonAndScintExternal: @local::protodunehd_ionandscint_external + PDFastSim: @local::protodune_hd_pdfastsim_par + PDFastSimExternal: @local::protodune_hd_pdfastsim_pvs_external rns: {module_type: "RandomNumberSaver"} } @@ -46,7 +47,7 @@ physics: } - simulate: [ rns, largeant, IonAndScint, PDFastSim ] + simulate: [ rns, largeant, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] stream1: [ out1 ] @@ -62,7 +63,7 @@ outputs: fileName: "%ifb_g4.root" dataTier: "simulated" #outputCommands: [ "keep *" ] - outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4"] + outputCommands: [ "keep *", "drop sim::SimEnergyDeposits_largeant_*_G4*"] #fastCloning: false #will fail if the split level is not the same as for the gen stage, so turn it off compressionLevel: 1 #zlib argument (0-9) #basketSize: 8192 #[Byte] buffer size at 8k diff --git a/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl b/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl index 2898464a..f03ad8e9 100644 --- a/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl +++ b/fcl/protodunehd/g4/standard_g4_protodunehd_stage2.fcl @@ -1,6 +1,6 @@ #include "standard_g4_protodunehd.fcl" process_name: G4Stage2 -physics.simulate: [ rns, IonAndScint, PDFastSim ] -services.TFileService.fileName: "g4_protodunehd_hist.root" -outputs.out1.fileName: "%ifb_g4_stage2.root" + +physics.simulate: [ rns, IonAndScint, IonAndScintExternal, PDFastSim, PDFastSimExternal ] + diff --git a/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl b/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl index 2654cbdb..fba8a27b 100644 --- a/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl +++ b/fcl/protodunehd/gen/prod_beam_cosmics_1GeV_protodunehd.fcl @@ -3,7 +3,7 @@ #include "singles_dune.fcl" #include "corsika_protodune.fcl" #include "protodunebeam.fcl" -#include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" process_name: SinglesGen @@ -37,15 +37,16 @@ physics: producers: { generator: @local::protodunehd_triggeredbeam - cosmicgenerator: @local::protodune_corsika_cmc - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr + cosmicgenerator: @local::protodune_corsika_cmc + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, - simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, rn222 ] + simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] #define the output stream, there could be more than one if using filters stream1: [ out1 ] diff --git a/fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl b/fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl index 7b283a0f..02f8a85c 100644 --- a/fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl +++ b/fcl/protodunehd/gen/prod_cosmics_protodunehd.fcl @@ -2,7 +2,7 @@ # #include "singles_dune.fcl" #include "corsika_protodune.fcl" -#include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" process_name: SinglesGen @@ -35,15 +35,16 @@ physics: producers: { - cosmicgenerator: @local::protodune_corsika_cmc - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr + cosmicgenerator: @local::protodune_corsika_cmc + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, - simulate: [cosmicgenerator, ar39, ar42, kr85, rn222 ] + simulate: [cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] #define the output stream, there could be more than one if using filters stream1: [ out1 ] diff --git a/fcl/protodunehd/gen/prodsinglep_protodunehd.fcl b/fcl/protodunehd/gen/prodsinglep_protodunehd.fcl new file mode 100644 index 00000000..7085a38f --- /dev/null +++ b/fcl/protodunehd/gen/prodsinglep_protodunehd.fcl @@ -0,0 +1,88 @@ +#include "services_refactored_pdune.fcl" +# +#include "singles_dune.fcl" +#include "corsika_protodune.fcl" +#include "protodunebeam.fcl" +#include "dune_radiological_model.fcl" + +process_name: SinglesGen + +services: +{ + # Load the service that manages root files for histograms. + TFileService: { fileName: "prod_beam_p1GeV_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: + { + generator: @local::microboone_singlep + } + + + #define the producer and filter modules for this path, order matters, + simulate: [ generator ] + + #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_beam_p1GeV_cosmics_protodunehd.root" #default file name, can override from command line with -o or --output + dataTier: "generated" + compressionLevel: 1 + } +} + +physics.producers.generator.PDG: [ 11 ] +physics.producers.generator.PosDist: 0 +physics.producers.generator.P0: [ 0.05 ] +physics.producers.generator.SigmaP: [ 0.0 ] +physics.producers.generator.X0: [0.0] +physics.producers.generator.Y0: [0.0] +physics.producers.generator.Z0: [300.0] +physics.producers.generator.SigmaX: [ 600. ] +physics.producers.generator.SigmaY: [ 600. ] +physics.producers.generator.SigmaZ: [ 600. ] +physics.producers.generator.AngleDist: 0 +physics.producers.generator.Theta0XZ: [ 0. ] +physics.producers.generator.Theta0YZ: [ 0. ] +physics.producers.generator.SigmaThetaXZ: [ 180. ] +physics.producers.generator.SigmaThetaYZ: [ 90. ] +source.maxEvents: 10 + diff --git a/fcl/protodunevd/gen/gen_protodunevd_beam_p1GeV.fcl b/fcl/protodunevd/gen/gen_protodunevd_beam_p1GeV.fcl index 7d1d794a..7082754c 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_beam_p1GeV.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_beam_p1GeV.fcl @@ -4,6 +4,8 @@ #include "corsika_protodune.fcl" #include "protodunebeam.fcl" #include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" + process_name: SinglesGen @@ -37,16 +39,16 @@ physics: producers: { generator: @local::protodunedp_triggeredbeam - #cosmicgenerator: @local::protodune_corsika_cmc - #ar39: @local::protodunesp_39ar - #ar42: @local::protodunesp_42ar - #kr85: @local::protodunesp_85kr - #rn222: @local::protodunesp_222rn + #cosmicgenerator: @local::protodune_corsika_cmc + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, - #simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, rn222 ] + #simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] simulate: [ generator ] #define the output stream, there could be more than one if using filters diff --git a/fcl/protodunevd/gen/gen_protodunevd_cosmics_driftY.fcl b/fcl/protodunevd/gen/gen_protodunevd_cosmics_driftY.fcl index 2c0c59a5..30ea4dd5 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_cosmics_driftY.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_cosmics_driftY.fcl @@ -4,6 +4,7 @@ ##include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" #include "services_protodunevd.fcl" +#include "dune_radiological_model_decay0.fcl" process_name: SinglesGen @@ -38,15 +39,15 @@ physics: { cosmicgenerator: @local::protodune_corsika_cmc # cosmicgenerator: @local::standard_CORSIKAGendp_CMC - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, -#simulate: [ cosmicgenerator, ar39, ar42, kr85, rn222 ] +#simulate: [ cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] simulate: [ cosmicgenerator] #define the output stream, there could be more than one if using filters diff --git a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio.fcl b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio.fcl index eeb72ab8..a2878a22 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio.fcl @@ -3,6 +3,7 @@ #include "corsika_protodune.fcl" #include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" process_name: SinglesGen @@ -36,15 +37,15 @@ physics: producers: { cosmicgenerator: @local::standard_CORSIKAGendp_CMC - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, - simulate: [ cosmicgenerator, ar39, ar42, kr85, rn222 ] + simulate: [ cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] #define the output stream, there could be more than one if using filters stream1: [ out1 ] diff --git a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_electron_1GeV.fcl b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_electron_1GeV.fcl index d8573c4f..4a896229 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_electron_1GeV.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_electron_1GeV.fcl @@ -4,6 +4,7 @@ #include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" #include "gen_protodunevd_singlep.fcl" +#include "dune_radiological_model_decay0.fcl" process_name: SinglesGen @@ -38,15 +39,15 @@ physics: { generator: @local::pdvd_1GeV_electron cosmicgenerator: @local::standard_CORSIKAGendp_CMC - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer, and filter modules for this path, order matters, -simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, rn222 ] +simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] #define the output stream, there could be more than one if using filters stream1: [ out1 ] diff --git a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_kaon_1GeV.fcl b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_kaon_1GeV.fcl index f5fbfba2..da4458e7 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_kaon_1GeV.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_kaon_1GeV.fcl @@ -3,6 +3,7 @@ #include "corsika_protodune.fcl" #include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" #include "./gen_protodunevd_singlep.fcl" process_name: SinglesGen @@ -38,15 +39,15 @@ physics: { generator: @local::pdvd_1GeV_kaon cosmicgenerator: @local::standard_CORSIKAGendp_CMC - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, -simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, rn222 ] +simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] #define the output stream, there could be more than one if using filters stream1: [ out1 ] diff --git a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_pion_1GeV.fcl b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_pion_1GeV.fcl index 0ba8050e..f66d65e7 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_pion_1GeV.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_cosmics_radio_pion_1GeV.fcl @@ -3,6 +3,7 @@ #include "corsika_protodune.fcl" #include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" #include "./gen_protodunevd_singlep.fcl" process_name: SinglesGen @@ -39,15 +40,15 @@ physics: # cosmicgenerator: @local::protodune_corsika_cmc generator: @local::pdvd_1GeV_pion cosmicgenerator: @local::standard_CORSIKAGendp_CMC - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, -simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, rn222 ] +simulate: [ generator, cosmicgenerator, ar39, ar42, kr85, k42fromar42 ] #simulate: [ generator, cosmicgenerator] #define the output stream, there could be more than one if using filters diff --git a/fcl/protodunevd/gen/gen_protodunevd_radio.fcl b/fcl/protodunevd/gen/gen_protodunevd_radio.fcl index c7c8863f..abaf6f73 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_radio.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_radio.fcl @@ -3,6 +3,7 @@ #include "corsika_protodune.fcl" #include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" +#include "dune_radiological_model_decay0.fcl" process_name: SinglesGen @@ -35,15 +36,15 @@ physics: producers: { - ar39: @local::protodunesp_39ar - ar42: @local::protodunesp_42ar - kr85: @local::protodunesp_85kr - rn222: @local::protodunesp_222rn + ar39: @local::dune10kt_39Ar_in_LAr + kr85: @local::dune10kt_85Kr_in_LAr + ar42: @local::dune10kt_42Ar_in_LAr + k42fromar42: @local::dune10kt_42Kfrom42Ar_in_LAr } #define the producer and filter modules for this path, order matters, - simulate: [ ar39, ar42, kr85, rn222 ] + simulate: [ ar39, ar42, kr85, k42fromar42 ] #define the output stream, there could be more than one if using filters stream1: [ out1 ] From 60608a77e69229cffd4baf61ce115d43a27ac2c8 Mon Sep 17 00:00:00 2001 From: Wenqiang Gu Date: Mon, 28 Oct 2024 17:48:37 -0500 Subject: [PATCH 4/6] update services for v10 --- fcl/protodunehd/reco/standard_reco_protodunehd_MC.fcl | 8 +++++--- fcl/protodunehd/reco/standard_reco_protodunehd_keepup.fcl | 5 ++++- .../reco/standard_reco_protodunehd_sce_E500.fcl | 2 +- .../reco/standard_reco_stage1_protodunehd_MC.fcl | 2 +- .../standard_reco_stage2_calibration_protodunehd_MC.fcl | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fcl/protodunehd/reco/standard_reco_protodunehd_MC.fcl b/fcl/protodunehd/reco/standard_reco_protodunehd_MC.fcl index f5b9a7f8..a1178477 100644 --- a/fcl/protodunehd/reco/standard_reco_protodunehd_MC.fcl +++ b/fcl/protodunehd/reco/standard_reco_protodunehd_MC.fcl @@ -36,7 +36,7 @@ services: FileCatalogMetadata: @local::art_file_catalog_mc #@table::protodunehd_reco_services ChannelStatusService: @local::dunefd_channel_status - ExptGeoHelperInterface: @local::dune_geometry_helper + WireReadout: @local::dune_wire_readout GeometryConfigurationWriter: {} Geometry: @local::protodunehdv6_geo DetectorClocksService: @local::protodunehd_detectorclocks @@ -55,6 +55,8 @@ services: } +services.AuxDetGeometry.GDML: "protodunehd_v6_refactored.gdml" +services.AuxDetGeometry.Name: "protodunehdv6" #BackTracker Module labels services.BackTrackerService.BackTracker.G4ModuleLabel: "largeant" @@ -208,8 +210,8 @@ physics.producers.pandorapid.TrackModuleLabel: "pandoraTrack" ##Optical detector configuration physics.producers.opdec.InputModule: "opdigi" -physics.producers.opdec.InstanceName: "daq" -physics.producers.ophitspe.InputModuledigi: "opdigi:daq" ##TODO check this +physics.producers.opdec.InstanceName: "" +physics.producers.ophitspe.InputModuledigi: "opdigi" ##TODO check this physics.producers.opflash.InputModule: "ophitspe" physics.producers.opslicer.OpHitModuleLabel: "ophitspe" diff --git a/fcl/protodunehd/reco/standard_reco_protodunehd_keepup.fcl b/fcl/protodunehd/reco/standard_reco_protodunehd_keepup.fcl index 4cd46b6a..8d0adb92 100644 --- a/fcl/protodunehd/reco/standard_reco_protodunehd_keepup.fcl +++ b/fcl/protodunehd/reco/standard_reco_protodunehd_keepup.fcl @@ -41,7 +41,7 @@ services: message: @local::dune_message_services_prod FileCatalogMetadata: @local::art_file_catalog_data ChannelStatusService: @local::dunefd_channel_status - ExptGeoHelperInterface: @local::dune_geometry_helper + WireReadout: @local::dune_wire_readout GeometryConfigurationWriter: {} Geometry: @local::protodunehdv6_geo DetectorClocksService: @local::protodunehd_detectorclocks @@ -73,6 +73,9 @@ services: } } +services.AuxDetGeometry.GDML: "protodunehd_v6_refactored.gdml" +services.AuxDetGeometry.Name: "protodunehdv6" + physics: { diff --git a/fcl/protodunehd/reco/standard_reco_protodunehd_sce_E500.fcl b/fcl/protodunehd/reco/standard_reco_protodunehd_sce_E500.fcl index 5f18d6b9..cafdcf7e 100644 --- a/fcl/protodunehd/reco/standard_reco_protodunehd_sce_E500.fcl +++ b/fcl/protodunehd/reco/standard_reco_protodunehd_sce_E500.fcl @@ -1,4 +1,4 @@ -#include "standard_reco_protodunehd.fcl" +#include "standard_reco_protodunehd_keepup.fcl" physics.producers.pandoracalo: @local::pdune_sp_calomcsce #@local::pdhd_calomc diff --git a/fcl/protodunehd/reco/standard_reco_stage1_protodunehd_MC.fcl b/fcl/protodunehd/reco/standard_reco_stage1_protodunehd_MC.fcl index 7e8198aa..7ac54680 100644 --- a/fcl/protodunehd/reco/standard_reco_stage1_protodunehd_MC.fcl +++ b/fcl/protodunehd/reco/standard_reco_stage1_protodunehd_MC.fcl @@ -1,4 +1,4 @@ -#include "standard_reco_protodunehd.fcl" +#include "standard_reco_protodunehd_MC.fcl" #make sure only one WCTK is here -- not sure this part is necessary #or if only one can be in the produce list diff --git a/fcl/protodunehd/reco/standard_reco_stage2_calibration_protodunehd_MC.fcl b/fcl/protodunehd/reco/standard_reco_stage2_calibration_protodunehd_MC.fcl index 2989e1d5..68d68211 100644 --- a/fcl/protodunehd/reco/standard_reco_stage2_calibration_protodunehd_MC.fcl +++ b/fcl/protodunehd/reco/standard_reco_stage2_calibration_protodunehd_MC.fcl @@ -1,5 +1,5 @@ #include "dune_calibanatree.fcl" -#include "standard_reco_protodunehd.fcl" +#include "standard_reco_protodunehd_MC.fcl" #### NOTE -- analyzer modules are instantiated in the included fcl From 58792d133e17269452f5e712bf4bb447d7a36bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Soto?= <34571738+jroto@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:59:03 +0100 Subject: [PATCH 5/6] Update gen_protodunevd_radio.fcl --- fcl/protodunevd/gen/gen_protodunevd_radio.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcl/protodunevd/gen/gen_protodunevd_radio.fcl b/fcl/protodunevd/gen/gen_protodunevd_radio.fcl index abaf6f73..62392fd9 100644 --- a/fcl/protodunevd/gen/gen_protodunevd_radio.fcl +++ b/fcl/protodunevd/gen/gen_protodunevd_radio.fcl @@ -3,7 +3,7 @@ #include "corsika_protodune.fcl" #include "CORSIKAGendp.fcl" #include "dune_radiological_model.fcl" -#include "dune_radiological_model_decay0.fcl" +#include "dune_radiological_model_decay0_hd_common.fcl" process_name: SinglesGen From 71b974a465790265b6aca4c6abbbc84462a3b747 Mon Sep 17 00:00:00 2001 From: Andrew Olivier Date: Fri, 1 Nov 2024 15:20:19 -0500 Subject: [PATCH 6/6] Updating version to --- CMakeLists.txt | 2 +- ups/product_deps | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58ff6eb0..7d84fdd5 100644 --- 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.00.04d00) +set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.01.00d00) include(CetCMakeEnv) cet_cmake_env() diff --git a/ups/product_deps b/ups/product_deps index abda069d..7f865843 100644 --- 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_00_04d00 -dunedataprep v10_00_04d00 -duneana v10_00_04d00 -protoduneana v10_00_04d00 +duneexamples v10_01_00d00 +dunedataprep v10_01_00d00 +duneana v10_01_00d00 +protoduneana v10_01_00d00 end_product_list