From 0dbaa664aac14779d09b6f79ff22394bf8f2465b Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Mon, 27 Oct 2025 20:33:04 +0100 Subject: [PATCH 1/7] fix to stage1 1D deconvolution --- .../Stage1/data/stage1_run2_icarus_keepup.fcl | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl diff --git a/fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl b/fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl new file mode 100644 index 000000000..efa086fbc --- /dev/null +++ b/fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl @@ -0,0 +1,27 @@ +#include "stage1_run2_icarus.fcl" + + +icarus_filter1D_cluster3D_fix: [ + @sequence::icarus_EastHits_TPC, + combineHitsCryoE, + @sequence::icarus_WestHits_TPC, + combineHitsCryoW, + cluster3DCryoE, + cluster3DCryoW, + TPCHitFilterCryoE, + TPCHitFilterCryoW + ] + +physics.reco: [ @sequence::icarus_filter1D_cluster3D_fix, + @sequence::icarus_pandora_Gauss, + @sequence::icarus_reco_fm, + @sequence::icarus_tpcpmtbarycentermatch, + @sequence::icarus_crttrack, + @sequence::icarus_crtt0tagging, + caloskimCalorimetryCryoE, caloskimCalorimetryCryoW] + +physics.producers.combineHitsCryoE.HitProducerLabelVec: [ "gaushit1dTPCEW", "gaushit1dTPCEE" ] +physics.producers.combineHitsCryoW.HitProducerLabelVec: [ "gaushit1dTPCWW", "gaushit1dTPCWE" ] + +physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] \ No newline at end of file From 2cd79a68822e98ed9de4a0cdddd2817cec2a496a Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Tue, 28 Oct 2025 20:54:48 +0100 Subject: [PATCH 2/7] removal of keepup fcl, changed icarus_filter1D_cluster3D to original. --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 2 -- .../Stage1/data/stage1_run2_icarus_keepup.fcl | 27 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 9dfe86a1b..b2b97896a 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -212,8 +212,6 @@ icarus_WestHits2d_TPC: [ gaushit2dTPCWW, # Set up filtering of cluster3D hits by cryostat # Changed slightly to faciliate larcv processing icarus_filter1D_cluster3D: [ - @sequence::icarus_EastHits_TPC, - @sequence::icarus_WestHits_TPC, cluster3DCryoE, cluster3DCryoW, TPCHitFilterCryoE, diff --git a/fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl b/fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl deleted file mode 100644 index efa086fbc..000000000 --- a/fcl/reco/Stage1/data/stage1_run2_icarus_keepup.fcl +++ /dev/null @@ -1,27 +0,0 @@ -#include "stage1_run2_icarus.fcl" - - -icarus_filter1D_cluster3D_fix: [ - @sequence::icarus_EastHits_TPC, - combineHitsCryoE, - @sequence::icarus_WestHits_TPC, - combineHitsCryoW, - cluster3DCryoE, - cluster3DCryoW, - TPCHitFilterCryoE, - TPCHitFilterCryoW - ] - -physics.reco: [ @sequence::icarus_filter1D_cluster3D_fix, - @sequence::icarus_pandora_Gauss, - @sequence::icarus_reco_fm, - @sequence::icarus_tpcpmtbarycentermatch, - @sequence::icarus_crttrack, - @sequence::icarus_crtt0tagging, - caloskimCalorimetryCryoE, caloskimCalorimetryCryoW] - -physics.producers.combineHitsCryoE.HitProducerLabelVec: [ "gaushit1dTPCEW", "gaushit1dTPCEE" ] -physics.producers.combineHitsCryoW.HitProducerLabelVec: [ "gaushit1dTPCWW", "gaushit1dTPCWE" ] - -physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] -physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] \ No newline at end of file From df0acf2e7c87d5a96cf47616272d4d3089095663 Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Tue, 28 Oct 2025 21:10:10 +0100 Subject: [PATCH 3/7] stage1_run2_1d_icarus updated to work with Cluster3D --- fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl index 4a6e28986..f4172ced2 100644 --- a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl @@ -11,3 +11,6 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D, physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + +physics.producers.caloskimE.HITproducer: "cluster3DCryoE" +physics.producers.caloskimW.HITproducer: "cluster3DCryoW" From e4c394f7af9b7aa60367fd006d2967f78cd37436 Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Tue, 28 Oct 2025 21:14:13 +0100 Subject: [PATCH 4/7] stage1_run2_1d_icarus, fix typo --- fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl index f4172ced2..782f12692 100644 --- a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl @@ -12,5 +12,5 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D, physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] -physics.producers.caloskimE.HITproducer: "cluster3DCryoE" -physics.producers.caloskimW.HITproducer: "cluster3DCryoW" +physics.producers.caloskimCalorimetryCryoE.HITproducer: "cluster3DCryoE" +physics.producers.caloskimCalorimetryCryoW.HITproducer: "cluster3DCryoW" From 798c9ce5e4170199dbc47c16e8ef7a8970f011d6 Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Tue, 28 Oct 2025 15:24:36 -0500 Subject: [PATCH 5/7] tested and works. caloskimE/W are analyzers, not producers. --- fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl index 782f12692..ff1864803 100644 --- a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl @@ -12,5 +12,5 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D, physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] -physics.producers.caloskimCalorimetryCryoE.HITproducer: "cluster3DCryoE" -physics.producers.caloskimCalorimetryCryoW.HITproducer: "cluster3DCryoW" +physics.analyzers.caloskimE.HITproducer: "cluster3DCryoE" +physics.analyzers.caloskimW.HITproducer: "cluster3DCryoW" From 6753937bb7dd415feb01ac4ee4caf8ad8ac47085 Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Fri, 31 Oct 2025 13:51:20 -0500 Subject: [PATCH 6/7] This commit does the following things: a) it fixes an issue/typo where CRTT0Tagging for 2D was using Cluster3D instead of combineCluster3D. This was due to a typo HitLabel vs HitLabels. b) Now for 1d also the pandora hit producers are based on Cluster3D. --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 2 +- fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index b2b97896a..117092e82 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -382,7 +382,7 @@ icarus_stage1_producers.caloskimCalorimetryCryoW.TrackModuleLabel: #icarus_stage1_producers.pandoraGausCryoE.ConfigFile: "PandoraSettings_Master_ICARUS_RawICARUS.xml" # Also fix hit label for CRT-(pandora) TPC tagging -icarus_stage1_producers.CRTT0Tagging.HitLabels: ["combineHitsCryoE", "combineHitsCryoW"] +icarus_stage1_producers.CRTT0Tagging.HitLabel: ["combineHitsCryoE", "combineHitsCryoW"] # Override labels for ntupler icarus_stage1_analyzers.caloskimE.HITproducer: "combineHitsCryoE" diff --git a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl index ff1864803..1ce43a36c 100644 --- a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl @@ -12,5 +12,10 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D, physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "cluster3DCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "cluster3DCryoW" + +physics.producers.CRTT0Tagging.HitLabel: ["cluster3DCryoE", "cluster3DCryoW"] + physics.analyzers.caloskimE.HITproducer: "cluster3DCryoE" physics.analyzers.caloskimW.HITproducer: "cluster3DCryoW" From 2bcc1fba5c64905c6e7bd871135c97534393337d Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Tue, 25 Nov 2025 13:55:38 +0100 Subject: [PATCH 7/7] addressed requests from reviewers. sequences: icarus_East/WestHits_TPC re-included --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 117092e82..136612f74 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -212,6 +212,8 @@ icarus_WestHits2d_TPC: [ gaushit2dTPCWW, # Set up filtering of cluster3D hits by cryostat # Changed slightly to faciliate larcv processing icarus_filter1D_cluster3D: [ + @sequence::icarus_EastHits_TPC, + @sequence::icarus_WestHits_TPC, cluster3DCryoE, cluster3DCryoW, TPCHitFilterCryoE,