From 54cf7d06939da1866ecfcc49e76e3856f4f5162c Mon Sep 17 00:00:00 2001
From: Petr Jacka <petr.jacka@cern.ch>
Date: Tue, 29 May 2018 10:55:44 +0200
Subject: [PATCH] Resolving conflicts
Former-commit-id: 31e0d85bedb5296a00b007d9288a257ecefd8b37
---
.../ISF_FastCaloSimParametrization/src/CaloGeometry.cxx | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
index 55df2d4fa2f..62d5a6bb6c5 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/CaloGeometry.cxx
@@ -1003,6 +1003,12 @@ void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2
y=it->second.y();
m_FCal_ChannelMap.tileSize(imap, eta_index, phi_index,dx,dy);
+
+ double r=sqrt(x*x+y*y);
+
+ if(r<m_FCal_rmin[imap-1])m_FCal_rmin[imap-1]=r;
+ if(r>m_FCal_rmax[imap-1])m_FCal_rmax[imap-1]=r;
+
id=(mask1[imap-1]<<12) + (eta_index << 5) +2*phi_index;
if(imap==2) id+= (8<<8);
@@ -1031,6 +1037,7 @@ void CaloGeometry::LoadFCalGeometryFromFiles(TString filename1,TString filename2
}
+
}
--
GitLab