diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml index 47ba76e1b1f56df9be49b81755b9fa153df0b9bd..b6d1bb892e6a33e187d83c4de3a6d30abefec6ac 100644 --- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml +++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml @@ -46,7 +46,7 @@ <include ref="../CRD_common_v01/OTKEndcap_v02.xml"/> <include ref="../CRD_common_v01/Ecal_Crystal_Barrel_v02_02.xml"/> - <include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v02_01.xml"/> + <include ref="../CRD_common_v01/Ecal_Crystal_Endcap_v02_02.xml"/> <include ref="../CRD_common_v01/SHcalGlass_Barrel_v05.xml"/> <include ref="../CRD_common_v01/SHcalGlass_Endcaps_v01.xml"/> diff --git a/Reconstruction/RecPFACyber/src/Algorithm/HoughClusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/HoughClusteringAlg.cpp index e7de187a7ec74e77ece21b33ac81f11eb297f5d6..5f8e04d35aae3de00d2ca1b99854e5f8497219ec 100644 --- a/Reconstruction/RecPFACyber/src/Algorithm/HoughClusteringAlg.cpp +++ b/Reconstruction/RecPFACyber/src/Algorithm/HoughClusteringAlg.cpp @@ -713,6 +713,7 @@ StatusCode HoughClusteringAlg::ClusterFinding(vector<Cyber::HoughObject>& Hobjec //bk_HFclus.insert( bk_HFclus.end(), m_clusCol.begin(), m_clusCol.end() ); m_longiClusCol.insert( m_longiClusCol.end(), m_clusCol.begin(), m_clusCol.end() ); + m_clusCol.clear(); return StatusCode::SUCCESS; } // ClusterFinding() end diff --git a/Reconstruction/RecPFACyber/src/CyberPFAlg.cpp b/Reconstruction/RecPFACyber/src/CyberPFAlg.cpp index 9bdcc842c04f3119615139cfb5fc205d10483e1b..42f5421ca7a296badc5b9922f4b1f5ff0886babc 100644 --- a/Reconstruction/RecPFACyber/src/CyberPFAlg.cpp +++ b/Reconstruction/RecPFACyber/src/CyberPFAlg.cpp @@ -31,8 +31,8 @@ int Cyber::CaloUnit::NbarZ = 24; //int Cyber::CaloUnit::over_module_set = 2; float Cyber::CaloUnit::barsize = 15.2; //mm float Cyber::CaloUnit::ecal_innerR = 1830; //mm -float Cyber::CaloUnit::ecal_endcap_deadarea = 8.5; //mm -float Cyber::CaloUnit::ecal_endcap_barsize = 15.2; //mm +float Cyber::CaloUnit::ecal_endcap_deadarea = 10.5; //mm, a bit larger than real value 8.5 mm in geometry +float Cyber::CaloUnit::ecal_endcap_barsize = 16.2; //mm, a bit larger than real value 15.2 mm in geometry DECLARE_COMPONENT( CyberPFAlg ) diff --git a/Reconstruction/RecPFACyber/src/Objects/CaloHalfCluster.cc b/Reconstruction/RecPFACyber/src/Objects/CaloHalfCluster.cc index 7a817c7580b8552ab7e99f9feac76f8aabbddc79..bc228fb6a2cb40a14316ed49ba61d7fc669ae32f 100644 --- a/Reconstruction/RecPFACyber/src/Objects/CaloHalfCluster.cc +++ b/Reconstruction/RecPFACyber/src/Objects/CaloHalfCluster.cc @@ -12,6 +12,10 @@ namespace Cyber{ m_1dclusters.clear(); map_localMax.clear(); map_halfClusCol.clear(); + m_TrackCol.clear(); + MCParticleWeight.clear(); + + delete track; } void CaloHalfCluster::Check(){