From 157fe3519c52212300550c1950b73309740ad551 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Wed, 25 Mar 2020 13:03:50 +0000
Subject: [PATCH 1/2] sweep 31444 and resolve conflicts
---
.../MuonReadoutGeometry/src/MMReadoutElement.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
index ff09a3cee4aa..316216ccd5c6 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
@@ -283,13 +283,11 @@ namespace MuonGM {
// identifier of the first channel
Identifier id = manager()->mmIdHelper()->channelID(getStationName(),getStationEta(),getStationPhi(),m_ml, layer+1, 1);
- // move the readout plane to the sensitive volume boundary
- double shift = 0.5*m_etaDesign[layer].thickness;
- double rox = ( layer==0 || layer==2) ? shift : -shift;
-
+ /// keep the tracking surface at the center of the gap
+ double sAngle = m_etaDesign[layer].sAngle;
// need to operate switch x<->z because of GeoTrd definition
m_surfaceData->m_layerSurfaces.push_back( new Trk::PlaneSurface(*this, id) );
- m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*Amg::Translation3D(rox,0.,0.)*
+ m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
Amg::AngleAxis3D(-90.*CLHEP::deg,Amg::Vector3D(0.,1.,0.)) );
// surface info (center, normal)
--
GitLab
From 939844224513db9e9297313904144d6b272d9eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20K=C3=B6hler?= <nicolas.koehler@cern.ch>
Date: Tue, 14 Apr 2020 11:02:44 +0200
Subject: [PATCH 2/2] fix compilation warnings
---
.../MuonReadoutGeometry/src/MMReadoutElement.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
index 316216ccd5c6..d21d212ddca8 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
@@ -283,8 +283,7 @@ namespace MuonGM {
// identifier of the first channel
Identifier id = manager()->mmIdHelper()->channelID(getStationName(),getStationEta(),getStationPhi(),m_ml, layer+1, 1);
- /// keep the tracking surface at the center of the gap
- double sAngle = m_etaDesign[layer].sAngle;
+ // keep the tracking surface at the center of the gap
// need to operate switch x<->z because of GeoTrd definition
m_surfaceData->m_layerSurfaces.push_back( new Trk::PlaneSurface(*this, id) );
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
@@ -293,7 +292,7 @@ namespace MuonGM {
// surface info (center, normal)
m_surfaceData->m_layerCenters.push_back(m_surfaceData->m_layerTransforms.back().translation());
m_surfaceData->m_layerNormals.push_back(m_surfaceData->m_layerTransforms.back().linear()*Amg::Vector3D(0.,0.,-1.));
- // get phi direction of MM eta strip
+
#ifndef NDEBUG
double sAngle = m_etaDesign[layer].sAngle;
if (log.level()<=MSG::DEBUG) log << MSG::DEBUG <<"MMReadoutElement layer " << layer << " sAngle " << sAngle << " phi direction MM eta strip " << (m_surfaceData->m_layerTransforms.back().linear()*Amg::Vector3D(0.,1.,0.)).phi() << endmsg;
--
GitLab