From 488f0a72178ace35b596edd7723fadbd217ed945 Mon Sep 17 00:00:00 2001 From: John Chapman <jchapman@cern.ch> Date: Wed, 13 Dec 2017 12:01:55 +0100 Subject: [PATCH] Add new max radius cut specifically for layer EMB1 and EME1 During the Simulation workshop (Dec 2017) it was decided that we should just merge hits within 5mm everywhere except in layers 1 (EMB1) and 5 (EME1) where only hits within 1mm should be merged. This commit adds a new property to allow the max radius (squared) cut to be configured separately for EMB1 and EME1. Former-commit-id: 62b06329b5f1da88291fadbd7e572427cf504e98 --- .../ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h | 1 + .../ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx | 1 + 2 files changed, 2 insertions(+) diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h index 1a4c3410976..ee742efedf1 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h @@ -45,6 +45,7 @@ namespace FCS_Param { // Merging properties double m_maxRadius=25.; //!< property, see @link LArG4GenShowerLib::LArG4GenShowerLib @endlink + double m_maxRadiusFine=1.; //!< property, see @link LArG4GenShowerLib::LArG4GenShowerLib @endlink double m_maxRadiusLAr=25.; //!< property, see @link LArG4GenShowerLib::LArG4GenShowerLib @endlink double m_maxRadiusHEC=100.; //!< property, see @link LArG4GenShowerLib::LArG4GenShowerLib @endlink double m_maxRadiusFCAL=100.; //!< property, see @link LArG4GenShowerLib::LArG4GenShowerLib @endlink diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx index 0068ce2db88..0426231ce43 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx @@ -92,6 +92,7 @@ namespace FCS_Param declareProperty("shorten_lar_step",m_config.shorten_lar_step, ""); declareProperty("maxRadius",m_config.m_maxRadius, ""); + declareProperty("maxRadiusFine",m_config.m_maxRadiusFine, ""); declareProperty("maxRadiusLAr",m_config.m_maxRadiusLAr, ""); declareProperty("maxRadiusHEC",m_config.m_maxRadiusHEC, ""); declareProperty("maxRadiusFCAL",m_config.m_maxRadiusFCAL, ""); -- GitLab