diff --git a/CMakeLists.txt b/CMakeLists.txt index 11b47e546..7d1be67cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR) find_package(cetmodules 3.24.01 REQUIRED) #project(icaruscode VERSION 10.06.00.01 LANGUAGES CXX) -set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.01-p03) +set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.01-p03b) project(icaruscode LANGUAGES CXX) message(STATUS diff --git a/fcl/g4/2d_drift_sim/larg4_icarus_intime_sce_2d_drift.fcl b/fcl/g4/2d_drift_sim/larg4_icarus_intime_sce_2d_drift.fcl index b9216894b..36f81fcb5 100644 --- a/fcl/g4/2d_drift_sim/larg4_icarus_intime_sce_2d_drift.fcl +++ b/fcl/g4/2d_drift_sim/larg4_icarus_intime_sce_2d_drift.fcl @@ -1,3 +1,5 @@ #include "larg4_icarus_intime.fcl" #include "enable_spacecharge_services_icarus_2D_DriftSimOnly.fcl" + +physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ] diff --git a/fcl/g4/larg4_icarus_intime.fcl b/fcl/g4/larg4_icarus_intime.fcl index 51b01edcb..4b4ee922a 100644 --- a/fcl/g4/larg4_icarus_intime.fcl +++ b/fcl/g4/larg4_icarus_intime.fcl @@ -67,6 +67,7 @@ physics.producers.pdfastsim.InputSourcesLabels: [ "pdfastsimintime", "pdfastsimo #Add a process that merges the dropped MCParticles physics.producers.largeantdropped: @local::icarus_merge_intime_dropped_mcparts +physics.producers.largeantdropped.SkipTrackIDOffsets: @erase physics.producers.largeantdropped.InputSourcesLabels: [ "larg4intime:droppedMCParticles", "larg4outtime:droppedMCParticles"] #Add a process for sedlite generation diff --git a/fcl/g4/larg4_icarus_intime_sce.fcl b/fcl/g4/larg4_icarus_intime_sce.fcl index 38acbd18e..bbba6ab34 100644 --- a/fcl/g4/larg4_icarus_intime_sce.fcl +++ b/fcl/g4/larg4_icarus_intime_sce.fcl @@ -1,3 +1,4 @@ #include "larg4_icarus_intime.fcl" #include "enable_spacecharge_icarus.fcl" +physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ] diff --git a/fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl b/fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl new file mode 100644 index 000000000..844c9871b --- /dev/null +++ b/fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl @@ -0,0 +1,24 @@ +### +## This fhicl file is used to drop daqPMT from the stage0 file +## + +process_name: daqPMTdrop + +outputs: { + out1: { + compressionLevel: 1 + dataTier: "reconstructed" + fileName: "%ifb_%p.root" + module_type: "RootOutput" + outputCommands: [ + "keep *_*_*_*", + "drop *_daqPMT_*_*" + ] + saveMemoryObjectThreshold: 0 + } +} + +physics: { + stream1: [ out1 ] + end_paths: [ stream1 ] +} diff --git a/fcl/reco/Stage0/data/stage0_run2_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_icarus.fcl index 310989d10..bf5b6dbea 100644 --- a/fcl/reco/Stage0/data/stage0_run2_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_icarus.fcl @@ -26,7 +26,6 @@ outputs.rootOutput.outputCommands: [ "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", - "drop *_daqPMT_*_*", "drop *_daqPMTonbeam_*_*", "drop *_daqCRT_*_*", "drop *_daqTPCROI_*_*", diff --git a/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl index b71ca6afb..e52af57c9 100644 --- a/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl @@ -27,7 +27,6 @@ outputs.rootOutput.outputCommands: [ "drop artdaq::Fragments_*_*_ICARUSReprocessRaw", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", - "drop *_daqPMT_*_*", "drop *_daqPMTonbeam_*_*", "drop *_daqCRT_*_*", "drop *_daqTPCROI_*_*", diff --git a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl new file mode 100644 index 000000000..6c43f587f --- /dev/null +++ b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl @@ -0,0 +1,3 @@ +#include "stage1_run2_icarus_MC.fcl" + +physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped" diff --git a/fcl/standard/standard_mc_all_detsim_icarus.fcl b/fcl/standard/standard_mc_all_detsim_icarus.fcl index 13685eafc..4b81669ba 100644 --- a/fcl/standard/standard_mc_all_detsim_icarus.fcl +++ b/fcl/standard/standard_mc_all_detsim_icarus.fcl @@ -1 +1 @@ -#include "detsim_2d_icarus_refactored.fcl" +#include "detsim_2d_icarus_refactored_yzsim.fcl" diff --git a/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl index 0b836e1fa..b4e93e8a7 100644 --- a/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "detsim_2d_icarus.fcl" +#include "standard_mc_all_detsim_icarus.fcl" diff --git a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl index e3695ae4b..1b7edd561 100644 --- a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "larg4_icarus_intime_sce.fcl" +#include "standard_mc_intime_g4_icarus.fcl" diff --git a/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl index e273a0877..ae4a199e7 100644 --- a/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl @@ -1,5 +1,5 @@ #include "messages_icarus.fcl" -#include "prodcorsika_proton_intime_icarus_bnb_sce_on.fcl" +#include "prodcorsika_proton_intime_filter_bnb_sce.fcl" # non-interactive output settings, but keep them verbose services.message: @local::icarus_message_services_prod_debug @@ -19,7 +19,7 @@ physics.producers.generator.FluxSearchPaths: "/cvmfs/sbn.osgstorage.org/pnfs/fna # Override CORSIKA flux file path to be able to access them without a proxy physics.producers.generator.ShowerInputFiles:[ - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/v01_00/p_*.db" + "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/v01_00/p_*.db" ] # "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/p_*.db", # "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/He_showers_*.db", diff --git a/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl index feb8aca63..d1df0a8ff 100644 --- a/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage0_run2_icarus_mc.fcl" +#include "standard_mc_all_stage0_icarus.fcl" diff --git a/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl index 7f5fe82b0..8a4e96436 100644 --- a/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl @@ -1 +1,6 @@ -#include "stage1_run2_icarus_MC.fcl" +#include "standard_mc_all_stage1_icarus.fcl" + +physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped" + +# silence SimDriftElectrons warnings, for 1 event these crerate a 900MB log file. +services.message.destinations.STDCOUT.categories.SimDriftElectrons: { limit: 0 } diff --git a/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl index e5693a86f..124dba6fb 100644 --- a/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl @@ -1,2 +1,2 @@ -#include "detsim_2d_icarus.fcl" +#include "standard_mc_all_detsim_icarus.fcl" diff --git a/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl index fc07b6aee..b8bb21ee5 100644 --- a/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "larg4_icarus.fcl" +#include "standard_mc_beamcosmics_g4_icarus.fcl" diff --git a/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl index 71c7daf32..58d83d5dd 100644 --- a/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl @@ -1,5 +1,5 @@ #include "messages_icarus.fcl" -#include "prodcorsika_genie_standard_icarus.fcl" +#include "prodcorsika_bnb_genie_protononly_icarus.fcl" # non-interactive output settings, but keep them verbose services.message: @local::icarus_message_services_prod_debug @@ -17,9 +17,11 @@ physics.producers.generator.FluxSearchPaths: "/cvmfs/sbn.osgstorage.org/pnfs/fna # Override CORSIKA flux file path to be able to access them without a proxy physics.producers.cosmgen.ShowerInputFiles:[ - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/p_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/He_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/N_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Mg_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Fe_showers_*.db" + "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/v01_00/p_*.db" ] +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/p_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/He_showers_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/N_showers_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Mg_showers_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Fe_showers_*.db" +#] diff --git a/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl index feb8aca63..d1df0a8ff 100644 --- a/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage0_run2_icarus_mc.fcl" +#include "standard_mc_all_stage0_icarus.fcl" diff --git a/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl index 7f5fe82b0..61514a21c 100644 --- a/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage1_run2_icarus_MC.fcl" +#include "standard_mc_all_stage1_icarus.fcl" diff --git a/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl index 0b836e1fa..b4e93e8a7 100644 --- a/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "detsim_2d_icarus.fcl" +#include "standard_mc_all_detsim_icarus.fcl" diff --git a/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl index fc07b6aee..b8bb21ee5 100644 --- a/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "larg4_icarus.fcl" +#include "standard_mc_beamcosmics_g4_icarus.fcl" diff --git a/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl index feb8aca63..d1df0a8ff 100644 --- a/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage0_run2_icarus_mc.fcl" +#include "standard_mc_all_stage0_icarus.fcl" diff --git a/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl index 7f5fe82b0..61514a21c 100644 --- a/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage1_run2_icarus_MC.fcl" +#include "standard_mc_all_stage1_icarus.fcl"