From a6fc90df1c2b7949d0528c4cd6056c70d8e6f56a Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Thu, 29 Oct 2026 09:03:59 -0500 Subject: [PATCH 1/5] Reintroduced old hit finder parameters for SPINE reconstruction --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 67 ++++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index 4097746cb..cdd53d9d7 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -373,14 +373,65 @@ icarus_stage1_producers.gaushit2dTPCEW.CalDataModuleLabel: icarus_stage1_producers.gaushit2dTPCEE.CalDataModuleLabel: "wire2channelroi2d:PHYSCRATEDATATPCEE" # Setup version of hit finder's with Pulse Trains ("PT"s) enabled -icarus_stage1_producers.gaushitPT2dTPCEE: @local::icarus_stage1_producers.gaushit2dTPCEE -icarus_stage1_producers.gaushitPT2dTPCEE.LongMaxHits: [10, 10, 10] -icarus_stage1_producers.gaushitPT2dTPCEW: @local::icarus_stage1_producers.gaushit2dTPCEW -icarus_stage1_producers.gaushitPT2dTPCEW.LongMaxHits: [10, 10, 10] -icarus_stage1_producers.gaushitPT2dTPCWE: @local::icarus_stage1_producers.gaushit2dTPCWE -icarus_stage1_producers.gaushitPT2dTPCWE.LongMaxHits: [10, 10, 10] -icarus_stage1_producers.gaushitPT2dTPCWW: @local::icarus_stage1_producers.gaushit2dTPCWW -icarus_stage1_producers.gaushitPT2dTPCWW.LongMaxHits: [10, 10, 10] + +# Using default values +spine_hit_candidate_tool_parameters: +{ + RoiThreshold: 5. + NextADCThreshold: 0. +} + +# Using default values +spine_gaushit_parameters: +{ + LongMaxHits: [10, 10, 10] + MaxMultiHit: 5 + Chi2NDF: 500. + LongPulseWidth: [10, 10, 10] + HitFinderToolVec: + { + CandidateHitsPlane0: + { + @table::spine_hit_candidate_tool_parameters + Plane: 0 + } + CandidateHitsPlane1: + { + @table::spine_hit_candidate_tool_parameters + Plane: 1 + } + CandidateHitsPlane2: + { + @table::spine_hit_candidate_tool_parameters + Plane: 2 + } + } +} + +icarus_stage1_producers.gaushitPT2dTPCEE: +{ + @table::icarus_stage1_producers.gaushit2dTPCEE + @table::spine_gaushit_parameters +} + +icarus_stage1_producers.gaushitPT2dTPCEW: +{ + @table::icarus_stage1_producers.gaushit2dTPCEW + @table::spine_gaushit_parameters +} + +icarus_stage1_producers.gaushitPT2dTPCWE: +{ + @table::icarus_stage1_producers.gaushit2dTPCWE + @table::spine_gaushit_parameters +} + +icarus_stage1_producers.gaushitPT2dTPCWW: +{ + @table::icarus_stage1_producers.gaushit2dTPCWW + @table::spine_gaushit_parameters +} + ## Overrides for filtering of cluster3D hits icarus_stage1_filters.TPCHitFilterCryoW.HitDataLabelVec: ["cluster3DCryoW"] From e076fa101de4a9112234259f7f5e8f9a77982314 Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Wed, 11 Nov 2026 04:32:26 -0600 Subject: [PATCH 2/5] Implementing SBN-DocDB-50214 --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 83 +++++++++++++++------ icaruscode/TPC/NuGraph/nugraph_icarus.fcl | 20 ++--- 2 files changed, 70 insertions(+), 33 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index cdd53d9d7..ec1ad4d16 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -41,9 +41,54 @@ icarus_stage1_producers: gaushit2dTPCEW: @local::gaus_hitfinder_icarus gaushit2dTPCEE: @local::gaus_hitfinder_icarus - ### Cluster3D - cluster3DCryoW: @local::icarus_cluster3d - cluster3DCryoE: @local::icarus_cluster3d + ### Cluster3D / SPINE version (using gaushitPT2dTPC* input tags for the hits) + cluster3DCryoW: + { + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } + + cluster3DCryoE: + { + @local::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } + + ### Cluster3D / Pandora + NG2 + Pandora version (using gaushit2dTPC* input tags for the hits) + pandoraCluster3DCryoW: + { + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } + pandoraCluster3DCryoE: + { + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] + Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 + Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. + Hit3DBuilderAlg.MaxHitChiSquare: 1000000. + Hit3DBuilderAlg.MaxMythicalChiSquare: 30. + Hit3DBuilderAlg.OutputHistograms: false + } ### Hit combiner combineHitsCryoE: @local::icarus_hitmerger_cryoE @@ -251,6 +296,8 @@ icarus_filter1D_cluster3D: [ @sequence::icarus_WestHits_TPC, cluster3DCryoE, cluster3DCryoW, + pandoraCluster3DCryoE, + pandoraCluster3DCryoW, TPCHitFilterCryoE, TPCHitFilterCryoW ] @@ -260,6 +307,8 @@ icarus_filter2D_cluster3D: [ @sequence::icarus_WestHits2d_TPC, cluster3DCryoE, cluster3DCryoW, + pandoraCluster3DCryoE, + pandoraCluster3DCryoW, TPCHitFilterCryoE, TPCHitFilterCryoW ] @@ -269,6 +318,10 @@ icarus_reco_cluster3DCryoW: [ cluster3DCryoW ] icarus_reco_cluster3DCryoE: [ cluster3DCryoE ] +icarus_reco_pandoraCluster3DCryoW: [ pandoraCluster3DCryoW ] + +icarus_reco_pandoraCluster3DCryoE: [ pandoraCluster3DCryoE ] + icarus_reco_pandoraGausCryoW: [ pandoraGausCryoW ] icarus_reco_pandoraGausCryoE: [ pandoraGausCryoE ] @@ -320,12 +373,14 @@ icarus_reco_Gauss1D_CryoE: [ icarus_reco_Gauss2D_CryoW: [ @sequence::icarus_WestHits2d_TPC, @sequence::icarus_reco_cluster3DCryoW, + @sequence::icarus_reco_pandoraCluster3DCryoW, @sequence::icarus_reco_pandoraGausCryoW ] icarus_reco_Gauss2D_CryoE: [ @sequence::icarus_EastHits2d_TPC, @sequence::icarus_reco_cluster3DCryoE, + @sequence::icarus_reco_pandoraCluster3DCryoE, @sequence::icarus_reco_pandoraGausCryoE ] @@ -440,27 +495,9 @@ icarus_stage1_filters.TPCHitFilterCryoW.MaximumHits: 60000 icarus_stage1_filters.TPCHitFilterCryoE.HitDataLabelVec: ["cluster3DCryoE"] icarus_stage1_filters.TPCHitFilterCryoE.MaximumHits: 60000 -## Definitions for running the 3D clustering by Cryostat -icarus_stage1_producers.cluster3DCryoW.MakeSpacePointsOnly: true -# use the "PT" (pulse train) hits as input to cluster3D -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.MaxHitChiSquare: 1000000. -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.MaxMythicalChiSquare: 30. -icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.OutputHistograms: false - -icarus_stage1_producers.cluster3DCryoE.MakeSpacePointsOnly: true -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.MaxHitChiSquare: 1000000. -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.MaxMythicalChiSquare: 30. -icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.OutputHistograms: false - ### Definitions for Pandora by cryostat -icarus_stage1_producers.pandoraGausCryoE.HitFinderModuleLabel: "cluster3DCryoE" -icarus_stage1_producers.pandoraGausCryoW.HitFinderModuleLabel: "cluster3DCryoW" +icarus_stage1_producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" +icarus_stage1_producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW" # icarus_stage1_producers.pandoraGausCryoW.HitCollectionTool.OverrhideHitLabels: ["gaushit2dTPCWW", "gaushit2dTPCWE"] # icarus_stage1_producers.pandoraGausCryoE.HitCollectionTool.OverrhideHitLabels: ["gaushit2dTPCEW", "gaushit2dTPCEE"] diff --git a/icaruscode/TPC/NuGraph/nugraph_icarus.fcl b/icaruscode/TPC/NuGraph/nugraph_icarus.fcl index eaca83ed2..7428473a2 100644 --- a/icaruscode/TPC/NuGraph/nugraph_icarus.fcl +++ b/icaruscode/TPC/NuGraph/nugraph_icarus.fcl @@ -6,26 +6,26 @@ nuslhitsCryoE: { module_type: "ICARUSNuSliceHitsProducer" BaryMatchLabel: "tpcpmtbarycentermatchCryoE" SliceLabel: "pandoraGausCryoE" - SpsLabel: "cluster3DCryoE" + SpsLabel: "pandoraCluster3DCryoE" } nuslhitsCryoW: { module_type: "ICARUSNuSliceHitsProducer" BaryMatchLabel: "tpcpmtbarycentermatchCryoW" SliceLabel: "pandoraGausCryoW" - SpsLabel: "cluster3DCryoW" + SpsLabel: "pandoraCluster3DCryoW" } NCCSlices: { module_type: "ICARUSNCCSlicesProducer" PandoraLabel: "pandoraGausCryoE" - ClusterLabel: "cluster3DCryoE" + ClusterLabel: "pandoraCluster3DCryoE" } NCCSlicesCryoE: @local::NCCSlices NCCSlicesCryoW: @local::NCCSlices NCCSlicesCryoW.PandoraLabel: "pandoraGausCryoW" -NCCSlicesCryoW.ClusterLabel: "cluster3DCryoW" +NCCSlicesCryoW.ClusterLabel: "pandoraCluster3DCryoW" NuGraphCryoE: @local::NuGraphLibTorch NuGraphCryoE.LoaderTool.tool_type: "ICARUSNuGraphLoader" @@ -56,18 +56,18 @@ NGMultiSliceCryoE.debug: false NGMultiSliceCryoE.LoaderTool.tool_type: "ICARUSNuGraphMultiLoader" NGMultiSliceCryoE.LoaderTool.PandoraLabel: "pandoraGausCryoE" NGMultiSliceCryoE.LoaderTool.SlicesLabel: "NCCSlicesCryoE" -NGMultiSliceCryoE.LoaderTool.ClusterLabel: "cluster3DCryoE" -NGMultiSliceCryoE.DecoderTools.FilterDecoderTool.hitInput: "cluster3DCryoE" -NGMultiSliceCryoE.DecoderTools.SemanticDecoderTool.hitInput: "cluster3DCryoE" +NGMultiSliceCryoE.LoaderTool.ClusterLabel: "pandoraCluster3DCryoE" +NGMultiSliceCryoE.DecoderTools.FilterDecoderTool.hitInput: "pandoraCluster3DCryoE" +NGMultiSliceCryoE.DecoderTools.SemanticDecoderTool.hitInput: "pandoraCluster3DCryoE" NGMultiSliceCryoW: @local::NGMultiSliceCryoE NGMultiSliceCryoW.SlicesLabel: "NCCSlicesCryoW" NGMultiSliceCryoW.HitLabel: "pandoraGausCryoW" NGMultiSliceCryoW.LoaderTool.PandoraLabel: "pandoraGausCryoW" NGMultiSliceCryoW.LoaderTool.SlicesLabel: "NCCSlicesCryoW" -NGMultiSliceCryoW.LoaderTool.ClusterLabel: "cluster3DCryoW" -NGMultiSliceCryoW.DecoderTools.FilterDecoderTool.hitInput: "cluster3DCryoW" -NGMultiSliceCryoW.DecoderTools.SemanticDecoderTool.hitInput: "cluster3DCryoW" +NGMultiSliceCryoW.LoaderTool.ClusterLabel: "pandoraCluster3DCryoW" +NGMultiSliceCryoW.DecoderTools.FilterDecoderTool.hitInput: "pandoraCluster3DCryoW" +NGMultiSliceCryoW.DecoderTools.SemanticDecoderTool.hitInput: "pandoraCluster3DCryoW" NGMultiSliceCryoW.LoaderTool.hitInput: "nuslhitsCryoW" NGMultiSliceCryoW.LoaderTool.spsInput: "nuslhitsCryoW" From a86edd0e9c49740bd43369104f6ba53b504b1954 Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Thu, 12 Nov 2026 03:48:06 -0600 Subject: [PATCH 3/5] Ooops typo --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 75 +++++++++++++-------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index ec1ad4d16..e22e5be71 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -45,49 +45,66 @@ icarus_stage1_producers: cluster3DCryoW: { @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } cluster3DCryoE: { - @local::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + @table::icarus_cluster3d + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } ### Cluster3D / Pandora + NG2 + Pandora version (using gaushit2dTPC* input tags for the hits) pandoraCluster3DCryoW: { @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } + pandoraCluster3DCryoE: { @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] - Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 - Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. - Hit3DBuilderAlg.MaxHitChiSquare: 1000000. - Hit3DBuilderAlg.MaxMythicalChiSquare: 30. - Hit3DBuilderAlg.OutputHistograms: false + MakeSpacePointsOnly: true + Hit3DBuilderAlg: + { + @table::icarus_cluster3d.Hit3DBuilderAlg + HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] + PulseHeightFraction: 0. #0.75 #0.25 + PHLowSelection: 0. #4.0 # 20. + MaxHitChiSquare: 1000000. + MaxMythicalChiSquare: 30. + OutputHistograms: false + } } ### Hit combiner From 545ec5e1406941fc1f478c51cc7bbd8952cdb041 Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Thu, 12 Nov 2026 07:16:49 -0600 Subject: [PATCH 4/5] Correct stage1 chains (DocDB 50214) --- fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl | 10 ++++++++-- .../Stage1/data/stage1_run2_1d_icarus_NuGraphReco.fcl | 5 +++++ fcl/reco/Stage1/data/stage1_run2_icarus.fcl | 4 ++++ .../Stage1/data/stage1_run2_icarus_NuGraphReco.fcl | 5 +++++ fcl/reco/Stage1/mc/stage1_run2_1d_icarus_MC.fcl | 9 +++++++++ .../Stage1/mc/stage1_run2_1d_icarus_NuGraphReco_MC.fcl | 4 ++++ fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl | 4 ++++ .../Stage1/mc/stage1_run2_icarus_NuGraphReco_MC.fcl | 5 +++++ 8 files changed, 44 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 1547f3e3e..3b338d99b 100644 --- a/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_1d_icarus.fcl @@ -13,8 +13,14 @@ 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" +# Also 1D hits for pandoraCluster3D* +physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + +# Pandora w/ 1D signal processing is using cluster3D* modules +# (using updatold, not updated, cluster3D instance) +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW" physics.producers.CRTT0Tagging.HitLabel: ["cluster3DCryoE", "cluster3DCryoW"] diff --git a/fcl/reco/Stage1/data/stage1_run2_1d_icarus_NuGraphReco.fcl b/fcl/reco/Stage1/data/stage1_run2_1d_icarus_NuGraphReco.fcl index 131d59722..26fdd9792 100644 --- a/fcl/reco/Stage1/data/stage1_run2_1d_icarus_NuGraphReco.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_1d_icarus_NuGraphReco.fcl @@ -11,3 +11,8 @@ physics.reco: [ @sequence::icarus_filter1D_cluster3D, physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + +physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + + diff --git a/fcl/reco/Stage1/data/stage1_run2_icarus.fcl b/fcl/reco/Stage1/data/stage1_run2_icarus.fcl index 80219d082..765798e09 100644 --- a/fcl/reco/Stage1/data/stage1_run2_icarus.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_icarus.fcl @@ -26,6 +26,10 @@ outputs.out1.outputCommands: [ physics.analyzers.caloskimE.SelectEvents: [reco] physics.analyzers.caloskimW.SelectEvents: [reco] +# Pandora only chain should be still using the combineHits* modules +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "combineHitsCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "combineHitsCryoW" + # Disabled Space-Charge service for calorimetry services.SpaceChargeService: { EnableCalEfieldSCE: false diff --git a/fcl/reco/Stage1/data/stage1_run2_icarus_NuGraphReco.fcl b/fcl/reco/Stage1/data/stage1_run2_icarus_NuGraphReco.fcl index 5cb274cca..e632b6e8a 100644 --- a/fcl/reco/Stage1/data/stage1_run2_icarus_NuGraphReco.fcl +++ b/fcl/reco/Stage1/data/stage1_run2_icarus_NuGraphReco.fcl @@ -23,6 +23,11 @@ outputs.out1.outputCommands: [ "drop *_caloskimCalorimetryCryoW_*_*" ] +# Pandora + NG2 + Pandora is required to have cluster3D* modules +# (using updated, pandora-specific, cluster3D instance) +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW" + # Redefine TPCPMTBarycenterMatch producers with the different Pandora label physics.producers.tpcpmtbarycentermatchCryoE.PandoraLabel: "pandoraGausNuGraphReco" physics.producers.tpcpmtbarycentermatchCryoW.PandoraLabel: "pandoraGausNuGraphReco" diff --git a/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_MC.fcl b/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_MC.fcl index 9c3d0daaa..a7117debf 100644 --- a/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_MC.fcl +++ b/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_MC.fcl @@ -16,3 +16,12 @@ physics.reco: [ physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + +# Also 1D hits for pandoraCluster3D* +physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + +# Pandora w/ 1D signal processing is using cluster3D* modules +# (using updatold, not updated, cluster3D instance) +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW" \ No newline at end of file diff --git a/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_NuGraphReco_MC.fcl b/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_NuGraphReco_MC.fcl index 121e7a2d9..820dd813e 100644 --- a/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_NuGraphReco_MC.fcl +++ b/fcl/reco/Stage1/mc/stage1_run2_1d_icarus_NuGraphReco_MC.fcl @@ -17,3 +17,7 @@ physics.reco: [ physics.producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] physics.producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] + +# Also 1D hits for pandoraCluster3D* +physics.producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCWW", "gaushit1dTPCWE"] +physics.producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit1dTPCEW", "gaushit1dTPCEE"] \ No newline at end of file diff --git a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl index 6eae5baee..f345173ef 100644 --- a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl +++ b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl @@ -74,6 +74,10 @@ outputs.out1.outputCommands: [ "drop *_caloskimCalorimetryCryoW_*_*" ] +# Pandora only chain should be still using the combineHits* modules +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "combineHitsCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "combineHitsCryoW" + # Redefine TPCPMTBarycenterMatch producers with MC parameters physics.producers.tpcpmtbarycentermatchCryoE: @local::mc_tpcpmtbarycentermatchproducer_east physics.producers.tpcpmtbarycentermatchCryoW: @local::mc_tpcpmtbarycentermatchproducer_west diff --git a/fcl/reco/Stage1/mc/stage1_run2_icarus_NuGraphReco_MC.fcl b/fcl/reco/Stage1/mc/stage1_run2_icarus_NuGraphReco_MC.fcl index 12fe2e834..df449b9ed 100644 --- a/fcl/reco/Stage1/mc/stage1_run2_icarus_NuGraphReco_MC.fcl +++ b/fcl/reco/Stage1/mc/stage1_run2_icarus_NuGraphReco_MC.fcl @@ -74,6 +74,11 @@ outputs.out1.outputCommands: [ "drop *_caloskimCalorimetryCryoW_*_*" ] +# Pandora + NG2 + Pandora is required to have cluster3D* modules +# (using updated, pandora-specific, cluster3D instance) +physics.producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" +physics.producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW" + # Redefine TPCPMTBarycenterMatch producers with MC parameters and with the different Pandora label # Also, relax a bit the allowed charge-to-light time overlap physics.producers.tpcpmtbarycentermatchCryoE: @local::mc_tpcpmtbarycentermatchproducer_east From 53494758e9982614f97d8fef6470eeac9fd09ac6 Mon Sep 17 00:00:00 2001 From: Mattia Sotgia Date: Thu, 12 Nov 2026 15:06:41 -0600 Subject: [PATCH 5/5] Cluster3D cleanup --- fcl/configurations/cluster_icarus.fcl | 7 +- fcl/reco/Definitions/stage1_icarus_defs.fcl | 73 ++++----------------- 2 files changed, 17 insertions(+), 63 deletions(-) diff --git a/fcl/configurations/cluster_icarus.fcl b/fcl/configurations/cluster_icarus.fcl index d04e0283c..799b985db 100644 --- a/fcl/configurations/cluster_icarus.fcl +++ b/fcl/configurations/cluster_icarus.fcl @@ -43,5 +43,10 @@ icarus_cluster3d.ClusterPathAlg.ClusterAlg.MinPairPts: 1 icarus_cluster3d.ClusterPathAlg.ClusterAlg.kdTree.PairSigmaPeakTime: 3.0 icarus_cluster3d.ClusterPathAlg.ClusterAlg.kdTree.RefLeafBestDist: 0.75 - +icarus_cluster3d.MakeSpacePointsOnly: true +icarus_cluster3d.Hit3DBuilderAlg.PulseHeightFraction: 0. #0.75 #0.25 +icarus_cluster3d.Hit3DBuilderAlg.PHLowSelection: 0. #4.0 # 20. +icarus_cluster3d.Hit3DBuilderAlg.MaxHitChiSquare: 1000000. +icarus_cluster3d.Hit3DBuilderAlg.MaxMythicalChiSquare: 30. +icarus_cluster3d.Hit3DBuilderAlg.OutputHistograms: false END_PROLOG diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index e22e5be71..4175b5761 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -42,70 +42,12 @@ icarus_stage1_producers: gaushit2dTPCEE: @local::gaus_hitfinder_icarus ### Cluster3D / SPINE version (using gaushitPT2dTPC* input tags for the hits) - cluster3DCryoW: - { - @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg: - { - @table::icarus_cluster3d.Hit3DBuilderAlg - HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] - PulseHeightFraction: 0. #0.75 #0.25 - PHLowSelection: 0. #4.0 # 20. - MaxHitChiSquare: 1000000. - MaxMythicalChiSquare: 30. - OutputHistograms: false - } - } - - cluster3DCryoE: - { - @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg: - { - @table::icarus_cluster3d.Hit3DBuilderAlg - HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] - PulseHeightFraction: 0. #0.75 #0.25 - PHLowSelection: 0. #4.0 # 20. - MaxHitChiSquare: 1000000. - MaxMythicalChiSquare: 30. - OutputHistograms: false - } - } + cluster3DCryoW: @local::icarus_cluster3d + cluster3DCryoE: @local::icarus_cluster3d ### Cluster3D / Pandora + NG2 + Pandora version (using gaushit2dTPC* input tags for the hits) - pandoraCluster3DCryoW: - { - @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg: - { - @table::icarus_cluster3d.Hit3DBuilderAlg - HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] - PulseHeightFraction: 0. #0.75 #0.25 - PHLowSelection: 0. #4.0 # 20. - MaxHitChiSquare: 1000000. - MaxMythicalChiSquare: 30. - OutputHistograms: false - } - } - - pandoraCluster3DCryoE: - { - @table::icarus_cluster3d - MakeSpacePointsOnly: true - Hit3DBuilderAlg: - { - @table::icarus_cluster3d.Hit3DBuilderAlg - HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] - PulseHeightFraction: 0. #0.75 #0.25 - PHLowSelection: 0. #4.0 # 20. - MaxHitChiSquare: 1000000. - MaxMythicalChiSquare: 30. - OutputHistograms: false - } - } + pandoraCluster3DCryoW: @local::icarus_cluster3d + pandoraCluster3DCryoE: @local::icarus_cluster3d ### Hit combiner combineHitsCryoE: @local::icarus_hitmerger_cryoE @@ -512,6 +454,13 @@ icarus_stage1_filters.TPCHitFilterCryoW.MaximumHits: 60000 icarus_stage1_filters.TPCHitFilterCryoE.HitDataLabelVec: ["cluster3DCryoE"] icarus_stage1_filters.TPCHitFilterCryoE.MaximumHits: 60000 +## Cluster3D changes +icarus_stage1_producers.cluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCWW", "gaushitPT2dTPCWE"] +icarus_stage1_producers.cluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushitPT2dTPCEW", "gaushitPT2dTPCEE"] + +icarus_stage1_producers.pandoraCluster3DCryoW.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCWW", "gaushit2dTPCWE"] +icarus_stage1_producers.pandoraCluster3DCryoE.Hit3DBuilderAlg.HitFinderTagVec: ["gaushit2dTPCEW", "gaushit2dTPCEE"] + ### Definitions for Pandora by cryostat icarus_stage1_producers.pandoraGausCryoE.HitFinderModuleLabel: "pandoraCluster3DCryoE" icarus_stage1_producers.pandoraGausCryoW.HitFinderModuleLabel: "pandoraCluster3DCryoW"