From 848d6d145a8d926438dada34e566f30f5fce532f Mon Sep 17 00:00:00 2001 From: Jacob Smith Date: Tue, 20 Jan 2026 16:32:55 -0500 Subject: [PATCH 1/3] Update project version string to 10.06.00.01-p03b --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4eb60f6ab5a28fd87ce588ebef6d101dcb4721a6 Mon Sep 17 00:00:00 2001 From: Jacob Smith Date: Wed, 28 Jan 2026 17:01:46 -0600 Subject: [PATCH 2/3] Revert "Merge pull request #882 from SBNSoftware/develop" This reverts commit 378b1bf4d2c779ae7f4d45a50150d9488c290ca1, reversing changes made to 848d6d145a8d926438dada34e566f30f5fce532f. --- .../larg4_icarus_intime_sce_2d_drift.fcl | 2 -- fcl/g4/larg4_icarus_intime.fcl | 1 - fcl/g4/larg4_icarus_intime_sce.fcl | 1 - fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl | 24 ------------------- fcl/reco/Stage0/data/stage0_run2_icarus.fcl | 1 + .../Stage0/data/stage0_run2_wc_icarus.fcl | 1 + .../mc/stage1_run2_icarus_MC_intime.fcl | 3 --- .../standard_mc_all_detsim_icarus.fcl | 2 +- ...imecosmic_detsim_quick_test_icaruscode.fcl | 2 +- ..._intimecosmic_g4_quick_test_icaruscode.fcl | 2 +- ...intimecosmic_gen_quick_test_icaruscode.fcl | 4 ++-- ...timecosmic_reco0_quick_test_icaruscode.fcl | 2 +- ...timecosmic_reco1_quick_test_icaruscode.fcl | 7 +----- ...nucosmics_detsim_quick_test_icaruscode.fcl | 2 +- ..._ci_nucosmics_g4_quick_test_icaruscode.fcl | 2 +- ...ci_nucosmics_gen_quick_test_icaruscode.fcl | 14 +++++------ ..._nucosmics_reco0_quick_test_icaruscode.fcl | 2 +- ..._nucosmics_reco1_quick_test_icaruscode.fcl | 2 +- ...ci_single_detsim_quick_test_icaruscode.fcl | 2 +- ...rus_ci_single_g4_quick_test_icaruscode.fcl | 2 +- ..._ci_single_reco0_quick_test_icaruscode.fcl | 2 +- ..._ci_single_reco1_quick_test_icaruscode.fcl | 2 +- 22 files changed, 23 insertions(+), 59 deletions(-) delete mode 100644 fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl delete mode 100644 fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl 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 36f81fcb5..b9216894b 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,5 +1,3 @@ #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 4b4ee922a..51b01edcb 100644 --- a/fcl/g4/larg4_icarus_intime.fcl +++ b/fcl/g4/larg4_icarus_intime.fcl @@ -67,7 +67,6 @@ 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 bbba6ab34..38acbd18e 100644 --- a/fcl/g4/larg4_icarus_intime_sce.fcl +++ b/fcl/g4/larg4_icarus_intime_sce.fcl @@ -1,4 +1,3 @@ #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 deleted file mode 100644 index 844c9871b..000000000 --- a/fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl +++ /dev/null @@ -1,24 +0,0 @@ -### -## 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 bf5b6dbea..310989d10 100644 --- a/fcl/reco/Stage0/data/stage0_run2_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_icarus.fcl @@ -26,6 +26,7 @@ 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 e52af57c9..b71ca6afb 100644 --- a/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl +++ b/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl @@ -27,6 +27,7 @@ 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 deleted file mode 100644 index 6c43f587f..000000000 --- a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl +++ /dev/null @@ -1,3 +0,0 @@ -#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 4b81669ba..13685eafc 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_yzsim.fcl" +#include "detsim_2d_icarus_refactored.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 b4e93e8a7..0b836e1fa 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 "standard_mc_all_detsim_icarus.fcl" +#include "detsim_2d_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 1b7edd561..e3695ae4b 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 "standard_mc_intime_g4_icarus.fcl" +#include "larg4_icarus_intime_sce.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 ae4a199e7..e273a0877 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_filter_bnb_sce.fcl" +#include "prodcorsika_proton_intime_icarus_bnb_sce_on.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 d1df0a8ff..feb8aca63 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 "standard_mc_all_stage0_icarus.fcl" +#include "stage0_run2_icarus_mc.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 8a4e96436..7f5fe82b0 100644 --- a/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl @@ -1,6 +1 @@ -#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 } +#include "stage1_run2_icarus_MC.fcl" 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 124dba6fb..e5693a86f 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 "standard_mc_all_detsim_icarus.fcl" +#include "detsim_2d_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 b8bb21ee5..fc07b6aee 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 "standard_mc_beamcosmics_g4_icarus.fcl" +#include "larg4_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 58d83d5dd..71c7daf32 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_bnb_genie_protononly_icarus.fcl" +#include "prodcorsika_genie_standard_icarus.fcl" # non-interactive output settings, but keep them verbose services.message: @local::icarus_message_services_prod_debug @@ -17,11 +17,9 @@ 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/v01_00/p_*.db" + "/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/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 d1df0a8ff..feb8aca63 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 "standard_mc_all_stage0_icarus.fcl" +#include "stage0_run2_icarus_mc.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 61514a21c..7f5fe82b0 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 "standard_mc_all_stage1_icarus.fcl" +#include "stage1_run2_icarus_MC.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 b4e93e8a7..0b836e1fa 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 "standard_mc_all_detsim_icarus.fcl" +#include "detsim_2d_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 b8bb21ee5..fc07b6aee 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 "standard_mc_beamcosmics_g4_icarus.fcl" +#include "larg4_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 d1df0a8ff..feb8aca63 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 "standard_mc_all_stage0_icarus.fcl" +#include "stage0_run2_icarus_mc.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 61514a21c..7f5fe82b0 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 "standard_mc_all_stage1_icarus.fcl" +#include "stage1_run2_icarus_MC.fcl" From 39e75f1b67776f948bc4f88b75716fe895d30fd4 Mon Sep 17 00:00:00 2001 From: Jacob Smith Date: Wed, 28 Jan 2026 17:01:57 -0600 Subject: [PATCH 3/3] Revert "Update project version string to 10.06.00.01-p03b" This reverts commit 848d6d145a8d926438dada34e566f30f5fce532f. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d1be67cd..11b47e546 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-p03b) +set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.01-p03) project(icaruscode LANGUAGES CXX) message(STATUS