From be9fbb4ea670986ff652b1a5398ff1998babe637 Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Thu, 24 Apr 2025 17:12:33 +0200 Subject: [PATCH 1/2] This commit removes deprecated CRTT0 producers in Stage1 definitions and removes the duplication of CRTT0Tagging at cafs level.\ --- fcl/caf/cafmaker_defs.fcl | 14 ++------------ fcl/reco/Definitions/stage1_icarus_defs.fcl | 8 -------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl index 6c676dc26..94af5df72 100644 --- a/fcl/caf/cafmaker_defs.fcl +++ b/fcl/caf/cafmaker_defs.fcl @@ -17,14 +17,12 @@ #include "mcreco.fcl" #include "mcsproducer.fcl" #include "rangeproducer.fcl" -#include "crthitconverter_producer.fcl" #include "flashmatch_simple_icarus.fcl" #include "scecorrections.fcl" #include "trackfindermodules_icarus.fcl" #include "showerfindermodules_icarus.fcl" #include "sbn_stub.fcl" #include "transfer_flashmatch_producer.fcl" -#include "crtt0producer_icarus.fcl" #include "showercosmicdistanceproducer.fcl" @@ -87,13 +85,6 @@ recoana_datacalo_producers.vertexChargeCryoW.NormTools: @local::icarus_calonormt recoana_datacalo_producers.vertexStubCryoE.NormTools: @local::icarus_calonormtools recoana_datacalo_producers.vertexStubCryoW.NormTools: @local::icarus_calonormtools -# CRT Hit to TPC Track matching in E/W -standard_crtt0producer_cryoE: @local::standard_crtt0producer -standard_crtt0producer_cryoE.TpcTrackModuleLabel: ["pandoraTrackGausCryoE"] -standard_crtt0producer_cryoE.PFParticleLabel: ["pandoraGausCryoE"] -standard_crtt0producer_cryoW: @local::standard_crtt0producer -standard_crtt0producer_cryoW.TpcTrackModuleLabel: ["pandoraTrackGausCryoW"] -standard_crtt0producer_cryoW.PFParticleLabel: ["pandoraGausCryoW"] # Producers for making analysis level products recoana_caf_preprocess_producers: { @@ -251,7 +242,6 @@ caf_preprocess_sequence: [ mcreco, # Track Momentum Estimation pandoraTrackMCSCryoE, pandoraTrackMCSCryoW, pandoraTrackRangeCryoE, pandoraTrackRangeCryoW, - pandoraCRTMatchCryoE, pandoraCRTMatchCryoW, # TODO: rns?? # Shower ShowerCosmicDistCryoE, ShowerCosmicDistCryoW @@ -266,7 +256,6 @@ caf_preprocess_data_sequence: [ # Track Momentum Estimation pandoraTrackMCSCryoE, pandoraTrackMCSCryoW, pandoraTrackRangeCryoE, pandoraTrackRangeCryoW, - pandoraCRTMatchCryoE, pandoraCRTMatchCryoW, # TODO: rns?? # Shower ShowerCosmicDistCryoE, ShowerCosmicDistCryoW @@ -318,7 +307,8 @@ cafmaker.TrackChi2PidLabel: "pandoraPidGaus" cafmaker.TrackScatterClosestApproachLabel: "" # unavailable cafmaker.TrackStoppingChi2FitLabel: "" # unavailable cafmaker.TrackDazzleLabel: "" # unavailable -cafmaker.CRTHitMatchLabel: "pandoraCRTMatch" +cafmaker.CRTHitMatchLabel: "CRTT0Tagging" +cafmaker.CRTHitMatchInfoLabel: "CRTT0Tagging" cafmaker.CRTTrackMatchLabel: "" # unavailable cafmaker.TrackMCSLabel: "pandoraTrackMCS" cafmaker.TrackRangeLabel: "pandoraTrackRange" diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index e8def4213..dbb35e79b 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -16,10 +16,6 @@ #include "flashmatch_simple_icarus.fcl" #include "crttrackproducer_icarus.fcl" #include "crtbacktracker_icarus.fcl" -### FPoppi : The following CRT matching algorithms are deprecated. -#include "crtt0matchingalg_icarus.fcl" -#include "crtt0producer_icarus.fcl" -### FPoppi : The following one is mantained. #include "crtt0tagging.fcl" ## The below can be found from the softlink to Supera in sbncode #include "supera_modules.fcl" @@ -68,10 +64,6 @@ icarus_stage1_producers: ## crt producer crttrack: @local::standard_crttrackproducer - ### FPoppi: the following are deprecated (and the one above not mantained) - ## CRTT0Matching: @local::standard_crtt0producer - ## CRTT0MatchingW: @local::standard_crtt0producerW - ## CRTT0MatchingE: @local::standard_crtt0producerE CRTT0Tagging: @local::icarus_crtt0tagging_data tpcpmtbarycentermatchCryoE: @local::data_tpcpmtbarycentermatchproducer_east From cbf245c71a734e943c13b6e20bb2f949ab03df8c Mon Sep 17 00:00:00 2001 From: Francesco Poppi Date: Tue, 13 May 2025 10:15:06 +0200 Subject: [PATCH 2/2] This Commits changes some fcl parameters of the CRT Tagging algorithm. The best candidates can now have up to 300 cm distance, this is done to give the analyzer more freedom of selection at CAF level. Additionally, specific cuts have been implemented for common values in East and West Cryos. --- fcl/reco/Definitions/stage1_icarus_defs.fcl | 4 ++++ icaruscode/CRT/CRTUtils/crtmatchingalg_icarus.fcl | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl index dbb35e79b..ce692545f 100644 --- a/fcl/reco/Definitions/stage1_icarus_defs.fcl +++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl @@ -144,6 +144,10 @@ icarus_stage1_analyzers_crthittagged.caloskimE: @local::caloskim_cryoe_crthittag icarus_stage1_analyzers_crthittagged.caloskimW: @local::caloskim_cryow_crthittagged_goldentracks icarus_stage1_analyzers_crthittagged.caloskimE.T0producers: ["pandoraGausCryoE", "CRTT0Tagging"] icarus_stage1_analyzers_crthittagged.caloskimW.T0producers: ["pandoraGausCryoW", "CRTT0Tagging"] +icarus_stage1_analyzers_crthittagged.caloskimE.TopCRTDistanceCut_stopping: 100. +icarus_stage1_analyzers_crthittagged.caloskimE.TopCRTDistanceCut_throughgoing: 100. +icarus_stage1_analyzers_crthittagged.caloskimW.TopCRTDistanceCut_stopping: 100. +icarus_stage1_analyzers_crthittagged.caloskimW.TopCRTDistanceCut_throughgoing: 100. ### Below are a list of convenient sequences that can be used for production/typical users. ### diff --git a/icaruscode/CRT/CRTUtils/crtmatchingalg_icarus.fcl b/icaruscode/CRT/CRTUtils/crtmatchingalg_icarus.fcl index 94e207321..ee20eb527 100644 --- a/icaruscode/CRT/CRTUtils/crtmatchingalg_icarus.fcl +++ b/icaruscode/CRT/CRTUtils/crtmatchingalg_icarus.fcl @@ -24,9 +24,8 @@ icarus_crtt0tagging_base: MinimalTrackLength: 40. # Minimal TrackLength to match with a CRT MinimumGoodHits: 5 # Minimum number of good hits to perform the fit MaximalCRTDistance: 300. # Maximal distance between CRT Hit Candidate and Track Projection - GoodCandidateDistance: 100. # 96 cm maximizes EfficiencyXPurity (both > 92%) + GoodCandidateDistance: 300. # loose cut. Decision for the cut to implement is left to analyzers (CAFs) or Calibration Team (calibration ntuples) MaximumDeltaT: 10000. # Maximal Time difference between a T0 tagged track and CRT Hit time for the combination to be considered acceptable. [ns] - }