From a422424605e0e6fb11aa9584aec61eef64675125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20K=C3=B6hler?= Date: Tue, 15 Oct 2019 18:59:14 +0200 Subject: [PATCH] cleaning up MuonReadoutGeometry wrt MT --- .../MuonReadoutGeometry/CscReadoutElement.h | 6 +- .../MuonReadoutGeometry/MdtDetectorElement.h | 7 +- .../MuonClusterReadoutElement.h | 22 +- .../MuonReadoutGeometry/MuonDetectorElement.h | 20 +- .../MuonReadoutGeometry/MuonPadDesign.h | 6 - .../MuonReadoutGeometry/MuonReadoutElement.h | 16 +- .../MuonReadoutGeometry/RpcReadoutElement.h | 6 +- .../MuonReadoutGeometry/RpcReadoutSet.h | 3 - .../MuonReadoutGeometry/TgcReadoutElement.h | 8 +- .../MuonReadoutGeometry/TgcReadoutParams.h | 34 +- .../MuonReadoutGeometry/sTgcReadoutElement.h | 10 +- .../src/CscDetectorElement.cxx | 1 - .../src/CscReadoutElement.cxx | 55 +--- .../src/MMReadoutElement.cxx | 24 +- .../src/MdtDetectorElement.cxx | 22 +- .../src/MdtReadoutElement.cxx | 307 ++++++------------ .../src/MuonClusterReadoutElement.cxx | 9 +- .../src/MuonDetectorElement.cxx | 11 +- .../MuonReadoutGeometry/src/MuonPadDesign.cxx | 16 +- .../src/MuonReadoutElement.cxx | 25 +- .../src/RpcDetectorElement.cxx | 2 - .../src/RpcReadoutElement.cxx | 45 +-- .../MuonReadoutGeometry/src/RpcReadoutSet.cxx | 117 +++---- .../src/TgcDetectorElement.cxx | 1 - .../src/TgcReadoutElement.cxx | 14 +- .../src/TgcReadoutParams.cxx | 74 ++--- .../src/sTgcReadoutElement.cxx | 93 ++---- 27 files changed, 333 insertions(+), 621 deletions(-) diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h index 9846d5af29a..7d4a6a21d89 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/CscReadoutElement.h @@ -336,12 +336,12 @@ namespace MuonGM { bool CscReadoutElement::measuresPhi(const Identifier& id) const { return manager()->cscIdHelper()->measuresPhi(id); } double CscReadoutElement::distanceToReadout( const Amg::Vector2D& , const Identifier& ) const { - reLog() << MSG::WARNING << " distanceToReadout::dummy routine " << endmsg; + (*m_Log) << MSG::WARNING << " distanceToReadout::dummy routine " << endmsg; return 0.; } int CscReadoutElement::stripNumber( const Amg::Vector2D& , const Identifier& ) const { - reLog() << MSG::WARNING << " stripNumber::dummy routine " << endmsg; + (*m_Log) << MSG::WARNING << " stripNumber::dummy routine " << endmsg; return 1; } @@ -349,7 +349,7 @@ namespace MuonGM { /** please don't copy the inefficient code below!! Look at the RpcReadoutElement for a proper implementation */ Amg::Vector3D gpos = stripPos(id); if( !surface(id).globalToLocal(gpos,gpos,pos) ){ - reLog() << MSG::WARNING << " stripPosition:: globalToLocal failed " << surface(id).transform().inverse()*gpos << std::endl; + (*m_Log) << MSG::WARNING << " stripPosition:: globalToLocal failed " << surface(id).transform().inverse()*gpos << std::endl; return false; } return true; diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h index b3ca48240af..e4522f0a5e2 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MdtDetectorElement.h @@ -45,15 +45,10 @@ class MuonStation; class MdtDetectorElement: public MuonDetectorElement { -public: +public: MdtDetectorElement(GeoVFullPhysVol* pv, MuonDetectorManager* mgr, Identifier id, IdentifierHash idHash); virtual ~MdtDetectorElement(){}; - - //Declaring the Message method for further use - MsgStream& msg( MSG::Level lvl ) const ; - //Declaring the Method providing Verbosity Level - bool msgLevel( MSG::Level lvl ) ; virtual int getStationEta() const {return 0;}; //!< returns stationEta virtual int getStationPhi() const {return 0;}; //!< returns stationPhi diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h index 6721cd900e8..fd5dc274879 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonClusterReadoutElement.h @@ -138,7 +138,6 @@ namespace MuonGM { void restoreSurfaces() const; mutable SurfaceData* m_surfaceData; - mutable SurfaceData* m_surfaceDataBackup; /** these are all surfaces represented by this detector element : it's for visualization without casting */ mutable std::vector m_elementSurfaces; @@ -161,18 +160,17 @@ namespace MuonGM { // clear base cache MuonReadoutElement::clear(); delete m_surfaceData; m_surfaceData = 0; - delete m_surfaceDataBackup; m_surfaceDataBackup = 0; } inline const Trk::PlaneSurface& MuonClusterReadoutElement::surface(int hash) const { if( !m_surfaceData ){ - reLog()<= (int)m_surfaceData->m_layerSurfaces.size() ){ - reLog()<m_layerSurfaces.size() << endmsg; + (*m_Log) <m_layerSurfaces.size() << endmsg; return *m_surfaceData->m_layerSurfaces.front(); } return *m_surfaceData->m_layerSurfaces[hash]; @@ -181,12 +179,12 @@ namespace MuonGM { inline const Amg::Transform3D& MuonClusterReadoutElement::transform(int hash) const { if( !m_surfaceData ){ - reLog()<= (int)m_surfaceData->m_layerTransforms.size() ){ - reLog()<m_layerTransforms.size() << endmsg; + (*m_Log) <m_layerTransforms.size() << endmsg; return m_surfaceData->m_layerTransforms.front(); } return m_surfaceData->m_layerTransforms[hash]; @@ -194,12 +192,12 @@ namespace MuonGM { inline const Amg::Vector3D& MuonClusterReadoutElement::center(int hash) const { if( !m_surfaceData ){ - reLog()<= (int)m_surfaceData->m_layerCenters.size() ){ - reLog()<m_layerCenters.size() << endmsg; + (*m_Log) <m_layerCenters.size() << endmsg; return m_surfaceData->m_layerCenters.front(); } return m_surfaceData->m_layerCenters[hash]; @@ -207,12 +205,12 @@ namespace MuonGM { inline const Amg::Vector3D& MuonClusterReadoutElement::normal(int hash) const { if( !m_surfaceData ){ - reLog()<= (int)m_surfaceData->m_layerNormals.size() ){ - reLog()<m_layerNormals.size() << endmsg; + (*m_Log) <m_layerNormals.size() << endmsg; return m_surfaceData->m_layerNormals.front(); } return m_surfaceData->m_layerNormals[hash]; @@ -220,12 +218,12 @@ namespace MuonGM { inline const Trk::SurfaceBounds& MuonClusterReadoutElement::bounds(int hash) const { if( !m_surfaceData ){ - reLog()<= (int)m_surfaceData->m_surfBounds.size() ){ - reLog()<m_surfBounds.size() << endmsg; + (*m_Log) <m_surfBounds.size() << endmsg; return *m_surfaceData->m_surfBounds.front(); } return *m_surfaceData->m_surfBounds[hash]; diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h index 17188038fc2..de7c18eeb99 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorElement.h @@ -28,9 +28,10 @@ #include "TrkDetElementBase/TrkDetElementBase.h" #include "Identifier/Identifier.h" #include "Identifier/IdentifierHash.h" -#include "AthenaKernel/MsgStreamMember.h" +#include "AthenaKernel/CLASS_DEF.h" +class IMessageSvc; class MsgStream; class GeoPhysVol; @@ -56,11 +57,6 @@ public: MuonDetectorElement(GeoVFullPhysVol* pv, MuonDetectorManager* mgr, Identifier id, IdentifierHash idHash); virtual ~MuonDetectorElement(); - - //Declaring the Message method for further use - MsgStream& msg( MSG::Level lvl ) const ; - //Declaring the Method providing Verbosity Level - bool msgLevel( MSG::Level lvl ) ; // Identification methods Identifier identify() const {return m_id;}//!< returns the collection extended identifier (EDM granularity) @@ -78,10 +74,10 @@ public: virtual unsigned int nTGCinStation() const = 0; virtual unsigned int nRPCinStation() const = 0; - // inline MsgStream& reLog() const; - protected: - + // Gaudi message service + IMessageSvc* m_msgSvc; + mutable std::unique_ptr m_Log ATLAS_THREAD_SAFE; // compute from MuonStation ---- // double m_Ssize, m_Rsize, m_Zsize, m_LongSsize, // m_LongRsize, m_LongZsize; //!< size in the specified direction @@ -92,11 +88,7 @@ protected: IdentifierHash m_idhash; //!< data-collection hash identifier unsigned int m_nREinDetectorElement; - - //Declaring private message stream member. - mutable Athena::MsgStreamMember m_msg ; - //MsgStream* m_MsgStream; bool m_debug; bool m_verbose; @@ -106,8 +98,6 @@ private: }; -// MsgStream& MuonDetectorElement::reLog() const -// {return *m_MsgStream;} const MuonDetectorManager* MuonDetectorElement::manager() const {return m_muon_mgr;} diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h index fd85d2721e8..4c0aa17c531 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonPadDesign.h @@ -113,12 +113,6 @@ namespace MuonGM { /** access to cache */ void setR( double R) const {this->radialDistance = R; } - MsgStream& msg( MSG::Level lvl ) const { return m_msg << lvl; } - bool msgLvl( MSG::Level lvl ) const { return m_msg.get().level() <= lvl; } - - protected: - mutable Athena::MsgStreamMember m_msg = Athena::MsgStreamMember("MuonPadDesign"); - }; inline double MuonPadDesign::distanceToReadout( /*const Amg::Vector2D& pos*/ ) const { diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h index 0053447576a..fe1399b1578 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonReadoutElement.h @@ -19,12 +19,14 @@ #include "Identifier/IdentifierHash.h" #include "GeoPrimitives/GeoPrimitives.h" #include "GeoPrimitives/CLHEPtoEigenConverter.h" +#include "AthenaKernel/CLASS_DEF.h" //<<<<<< PUBLIC VARIABLES >>>>>> #define maxfieldindex 10 -class MsgStream; class GeoPhysVol; +class IMessageSvc; +class MsgStream; namespace MuonGM { @@ -171,11 +173,11 @@ public: const Amg::Transform3D& defTransform(const Identifier&) const {return defTransform();}; - - inline MsgStream& reLog() const; protected: - + // Gaudi message service + IMessageSvc* m_msgSvc; + mutable std::unique_ptr m_Log ATLAS_THREAD_SAFE; double m_Ssize, m_Rsize, m_Zsize, m_LongSsize, m_LongRsize, m_LongZsize; //!< size in the specified direction bool m_descratzneg; @@ -195,9 +197,7 @@ protected: unsigned int m_nCSCinStation; unsigned int m_nRPCinStation; unsigned int m_nTGCinStation; - - MsgStream* m_MsgStream; - + private: double m_stationS; @@ -214,8 +214,6 @@ private: mutable const HepGeom::Transform3D* m_defTransform; }; -MsgStream& MuonReadoutElement::reLog() const {return *m_MsgStream;} - const Identifier MuonReadoutElement::identifyATLAS() const {return m_id;} Identifier MuonReadoutElement::identify() const {return m_id;} IdentifierHash MuonReadoutElement::identifyHash() const {return m_idhash;} diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h index 341440b56ee..fed0ad73356 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutElement.h @@ -322,7 +322,7 @@ namespace MuonGM { // if there is only one doublet phi we should always use one in the hash calculation if ( m_nphistrippanels == 1 ) dbPhi = 1; if( dbPhi > NphiStripPanels() || gasGap > numberOfLayers(true) ) { - reLog() << MSG::WARNING << " surfaceHash: identifier out of range dbphi " << dbPhi << " max " << NphiStripPanels() + (*m_Log) << MSG::WARNING << " surfaceHash: identifier out of range dbphi " << dbPhi << " max " << NphiStripPanels() << " ch dbphi " << getDoubletPhi() << " gp " << gasGap << " max " << numberOfLayers() << endmsg; return -1; } @@ -343,7 +343,7 @@ namespace MuonGM { if ( m_nphistrippanels == 1 ) dbPhi = 1; if( dbPhi > NphiStripPanels() || gasGap > numberOfLayers(true) ) { - reLog() << MSG::WARNING << " layerHash: identifier out of range dbphi " << dbPhi << " max " << NphiStripPanels() + (*m_Log) << MSG::WARNING << " layerHash: identifier out of range dbphi " << dbPhi << " max " << NphiStripPanels() << " ch dbphi " << getDoubletPhi() << " gp " << gasGap << " max " << numberOfLayers() << endmsg; return -1; } @@ -362,7 +362,7 @@ namespace MuonGM { inline const MuonStripDesign* RpcReadoutElement::getDesign( const Identifier& id ) const { int phipanel = m_nphistrippanels == 1 ? 1 : manager()->rpcIdHelper()->doubletPhi(id); if( phipanel > (int)m_phiDesigns.size() ) { - reLog() << MSG::WARNING << " bad identifier, no MuonStripDesign found " << endmsg; + (*m_Log) << MSG::WARNING << " bad identifier, no MuonStripDesign found " << endmsg; return 0; } return manager()->rpcIdHelper()->measuresPhi(id) ? &m_phiDesigns[phipanel-1] : &m_etaDesigns[phipanel-1]; diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h index 9a8a61bc5dc..301c2052be7 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/RpcReadoutSet.h @@ -45,9 +45,6 @@ private: Identifier m_id; // this is a detectorId const RpcIdHelper* m_helper; const MuonDetectorManager* m_mgr; - mutable unsigned int m_nreadoutelemets; - mutable unsigned int m_ndoubletz; - mutable unsigned int m_nsegmenteddoubletz; }; } // namespace MuonGM diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h index c90a2b795bd..c7299549bbe 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutElement.h @@ -381,12 +381,12 @@ namespace MuonGM { bool TgcReadoutElement::measuresPhi(const Identifier& id) const { return manager()->tgcIdHelper()->isStrip(id); } double TgcReadoutElement::distanceToReadout( const Amg::Vector2D& , const Identifier& ) const { - reLog() << MSG::WARNING << " distanceToReadout::dummy routine " << endmsg; + (*m_Log) << MSG::WARNING << " distanceToReadout::dummy routine " << endmsg; return 0.; } int TgcReadoutElement::stripNumber( const Amg::Vector2D& , const Identifier& ) const { - reLog() << MSG::WARNING << " stripNumber::dummy routine " << endmsg; + (*m_Log) << MSG::WARNING << " stripNumber::dummy routine " << endmsg; return 1; } @@ -394,7 +394,7 @@ namespace MuonGM { /** please don't copy the inefficient code below!! Look at the RpcReadoutElement for a proper implementation */ Amg::Vector3D gpos = channelPos(id); if( !surface(id).globalToLocal(gpos,gpos,pos) ){ - reLog() << MSG::WARNING << " stripPosition:: globalToLocal failed " << surface(id).transform().inverse()*gpos << std::endl; + (*m_Log) << MSG::WARNING << " stripPosition:: globalToLocal failed " << surface(id).transform().inverse()*gpos << std::endl; return false; } return true; @@ -433,7 +433,7 @@ namespace MuonGM { Amg::Vector3D gpos; spacePointPosition(phiId,etaId,gpos); if( !surface(phiId).globalToLocal(gpos,gpos,pos) ){ - reLog() << MSG::WARNING << " stripPosition:: globalToLocal failed " << surface(phiId).transform().inverse()*gpos << std::endl; + (*m_Log) << MSG::WARNING << " stripPosition:: globalToLocal failed " << surface(phiId).transform().inverse()*gpos << std::endl; return false; } return true; diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h index be806211036..184517ef7b9 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h @@ -38,8 +38,9 @@ // ****************************************************************************** #include +#include +#include "AthenaKernel/CLASS_DEF.h" -class MsgStream; class IMessageSvc; namespace MuonGM { @@ -69,7 +70,7 @@ public: // Access to wire gang parameters float wirePitch() const; - float gangThickness() const; + inline float gangThickness() const; int nGangs(int gasGap) const; int totalWires(int gasGap) const; int nWires(int gasGap, int gang) const; @@ -77,12 +78,16 @@ public: // Access to strip parameters - float stripThickness() const; + inline float stripThickness() const; int nStrips(int gasGap) const; float stripOffset(int gasGap) const; float physicalDistanceFromBase() const; float stripPositionOnLargeBase(int strip) const; float stripPositionOnShortBase(int strip) const; +protected: + // Gaudi message service + IMessageSvc* m_msgSvc; + mutable std::unique_ptr m_Log ATLAS_THREAD_SAFE; private: @@ -121,20 +126,23 @@ private: float m_stripPositionOnShortBase[MaxNStrips]; // Hard-coded data - static float s_gangThickness; - static float s_stripThickness; - - // message stream pointer and method to access it - MsgStream* m_MsgStream; - inline MsgStream& reLog() const; + const float m_gangThickness = 0.05; + const float m_stripThickness = 0.03; }; - -MsgStream& TgcReadoutParams::reLog() const {return *m_MsgStream;} +float TgcReadoutParams::stripThickness() const +{ + return m_stripThickness; +} +float TgcReadoutParams::gangThickness() const +{ + return m_gangThickness; +} const std::string TgcReadoutParams::GetName() const -{return m_chamberName;} - +{ + return m_chamberName; +} } // namespace MuonGM #endif // MUONGEOMODEL_TGCREADOUTPARAMS_H diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h index 8e881b156d6..df38933c3c1 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h @@ -245,7 +245,7 @@ namespace MuonGM { if (manager()->stgcIdHelper()->channelType(id)==0){ const MuonPadDesign* design = getPadDesign(id); if( !design ) { - *m_MsgStream << MSG::WARNING << "no pad Design" << endmsg; + (*m_Log) << MSG::WARNING << "no pad Design" << endmsg; return -1; } return design->channelWidth( Amg::Vector2D (0,0),0); @@ -266,11 +266,11 @@ namespace MuonGM { const MuonPadDesign* design = getPadDesign(id); if( !design ) { - *m_MsgStream << MSG::WARNING << "no pad Design" << endmsg; + (*m_Log) << MSG::WARNING << "no pad Design" << endmsg; return -1; } std::pair pad(design->channelNumber(pos)); - *m_MsgStream << MSG::DEBUG << "pad numbers from MuonPadDesign " <0 && pad.second>0) { @@ -284,12 +284,12 @@ namespace MuonGM { int padEta = manager()->stgcIdHelper()->padEta(padID); int padPhi = manager()->stgcIdHelper()->padPhi(padID); if( padEta != pad.first || padPhi != pad.second ){ - *m_MsgStream << MSG::WARNING << " bad pad indices: input " << pad.first << " " << pad.second << " from ID " << padEta << " " << padPhi << endmsg; + (*m_Log) << MSG::WARNING << " bad pad indices: input " << pad.first << " " << pad.second << " from ID " << padEta << " " << padPhi << endmsg; return -1; } return channel; } - *m_MsgStream << MSG::WARNING << "bad channelNumber" << endmsg; + (*m_Log) << MSG::WARNING << "bad channelNumber" << endmsg; return -1; } diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscDetectorElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscDetectorElement.cxx index 5b14d838054..940e63657f9 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscDetectorElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscDetectorElement.cxx @@ -23,7 +23,6 @@ namespace MuonGM { CscDetectorElement::CscDetectorElement(GeoVFullPhysVol* pv, MuonDetectorManager* mgr,Identifier id, IdentifierHash idHash) : MuonDetectorElement(pv,mgr,id,idHash), m_cscre(NULL) { - //m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:CscDetectorElement"); m_nREinDetectorElement=1; } diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx index dd33094a70d..43fd72de7aa 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx @@ -44,8 +44,6 @@ CscReadoutElement::CscReadoutElement(GeoVFullPhysVol* pv, std::string stName, m_wirepitch(-9999.), m_first_strip_localcoo(-9999.), m_first_wire_localcoo(-9999.) { // Set a few parameters here. The rest are set in MuonChamber::setCscReadoutGeometry - - m_MsgStream = new MsgStream(mgr->msgSvc(), "MuGM:CscReadoutElement"); // get the setting of the caching flag from the manager setCachingFlag(mgr->cachingFlag()); @@ -307,17 +305,6 @@ const Amg::Vector3D CscReadoutElement::stripPos(int eta, int chamberLayer, int w const Amg::Vector3D localP = localStripPos(eta, chamberLayer, wireLayer, measPhi, channel); const Amg::Transform3D cscTrans = absTransform(); - // Amg::Transform3D transfPtr_internalgeo(HepGeom::TranslateY3D(m_cscIntTransl[wireLayer-1][0])* - // HepGeom::TranslateZ3D(m_cscIntTransl[wireLayer-1][1])* - // HepGeom::TranslateX3D(m_cscIntTransl[wireLayer-1][2])* - // HepGeom::RotateY3D(m_cscIntRot[wireLayer-1][0])* - // HepGeom::RotateZ3D(m_cscIntRot[wireLayer-1][1])* - // HepGeom::RotateX3D(m_cscIntRot[wireLayer-1][2])); - // reLog()<get_module_hash(id, collIdhash); if (gethash_code != 0) - reLog()<show_to_string(identify())<<" it's parent " <show_to_string(idp)<show_to_string(identify())<: m_cscIntTransl["<<(wlayer-1)<<"]["<: m_cscIntRot["<<(wlayer-1)<<"]["<: m_cscIntTransl["<<(wlayer-1)<<"]["<: m_cscIntRot["<<(wlayer-1)<<"]["<cscIdHelper(); diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx index bc0a595f580..e03ea72d1d9 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************** @@ -7,10 +7,6 @@ ---------------------------------------------------- ***************************************************************************/ - -// $Id: MMReadoutElement.cxx,v 1.5 2009-05-13 15:03:47 stefspa Exp $ -// $Name: not supported by cvs2svn $ - #include "MuonReadoutGeometry/MMReadoutElement.h" #include "GeoModelKernel/GeoPhysVol.h" #include "GeoModelKernel/GeoTrd.h" @@ -37,8 +33,6 @@ namespace MuonGM { : MuonClusterReadoutElement(pv, stName, zi, fi, is_mirrored, mgr) { m_ml = mL; - m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:MMReadoutElement"); - //MsgStream log(Athena::getMessageSvc(), "MuGM:MMReadoutElement"); // get the setting of the caching flag from the manager setCachingFlag(mgr->cachingFlag()); @@ -128,7 +122,7 @@ namespace MuonGM { } } if( !foundShape ){ - *m_MsgStream << MSG::WARNING << " failed to initialize dimensions of this chamber " << endmsg; + (*m_Log) << MSG::WARNING << " failed to initialize dimensions of this chamber " << endmsg; } //fillCache(); @@ -149,14 +143,14 @@ namespace MuonGM { // set parent data collection hash id int gethash_code = manager()->mmIdHelper()->get_module_hash(id, collIdhash); if (gethash_code != 0) - reLog()<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 - *m_MsgStream << 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; + (*m_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; } } diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtDetectorElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtDetectorElement.cxx index 755025d5f68..72c562c8214 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtDetectorElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtDetectorElement.cxx @@ -23,13 +23,6 @@ MdtDetectorElement::MdtDetectorElement(GeoVFullPhysVol* pv, IdentifierHash idHash) : MuonDetectorElement(pv, mgr, id, idHash) { - - //m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:MdtDetectorElement"); - // m_debug = m_MsgStream->level() <= MSG::DEBUG; - // m_verbose = m_MsgStream->level() <= MSG::VERBOSE; - // if (m_debug) reLog() << MSG::DEBUG << "A new MdtDetectorElement was born: idhash = " - // << (int)idHash << endmsg; - for (unsigned int i=0; imultilayer(id); if ( ml <=0 || ml > nReadoutElements() ) { - msg( MSG::WARNING ) - // reLog()<show_to_string(id) <<"): multilayer out of range 1-" < (int)nReadoutElements() ) { - // reLog() << MSG::WARNING - msg(MSG::WARNING)<< "getMdtReadoutElement(" << ml + (*m_Log) << MSG::WARNING << "getMdtReadoutElement(" << ml << "): multilayer out of range 1-" << nReadoutElements() << " for MdtDetectorElement " << (manager()->mdtIdHelper())->show_to_string(identify()) @@ -143,7 +130,4 @@ const std::vector& MdtDetectorElement::surfaces() const return m_detectorSurfaces; } -MsgStream& MdtDetectorElement::msg( MSG::Level lvl ) const { return m_msg << lvl ; } -bool MdtDetectorElement::msgLevel( MSG::Level lvl ) { return m_msg.get().level() <= lvl ; } - } diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtReadoutElement.cxx index fddb2b17691..4caad479b07 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtReadoutElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MdtReadoutElement.cxx @@ -26,7 +26,6 @@ #include "MuonAlignmentData/BLinePar.h" -#include "GaudiKernel/MsgStream.h" #include // From Dan Levin: MDT @@ -72,7 +71,6 @@ MdtReadoutElement::MdtReadoutElement(GeoVFullPhysVol* pv, std::string stName, m_associatedSurface(0), m_associatedBounds(0) { - m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:MdtReadoutElement"); m_multilayer = 0; @@ -162,28 +160,20 @@ double MdtReadoutElement::innerTubeRadius() const } double MdtReadoutElement::outerTubeRadius() const { - // std::cout<<" asking for outer radius; inner first "<getGenericMdtDescriptor()->innerRadius<getGenericMdtDescriptor()->outerRadius<getGenericMdtDescriptor()->outerRadius; return m_innerRadius + m_tubeWallThickness; } double MdtReadoutElement::getTubeLengthForCaching(int tubeLayer, int tube) const { - //std::cout<<"In getTubeLengthForCaching "<mdtIdHelper(); - //reLog() << MSG::INFO << "getTubeLenght for Element named " << getStationName() << " with tech. " - //<< getTechnologyType() <<" DEid = "<show_to_string(identify())<< " called with: tubeL, tube " << tubeLayer << " " - //<< tube <= m_nsteps) { - reLog() << MSG::WARNING << "getTubeLenght for Element named " << getStationName() << " with tech. " + (*m_Log) << MSG::WARNING << "getTubeLenght for Element named " << getStationName() << " with tech. " << getTechnologyType() <<" DEid = "<show_to_string(identify())<< " called with: tubeL, tube " << tubeLayer << " " << tube << "; step " << istep << " out of range 0-" << m_nsteps-1 << " m_ntubesinastep " << m_ntubesinastep <getNChildVols(); - if (reLog().level() <= MSG::VERBOSE) reLog() << MSG::VERBOSE << " nchild = "<=nGrandchildren) { - reLog() << MSG::WARNING << " MdtReadoutElement " << getStationName() << " stEta " << getStationEta() + (*m_Log) << MSG::WARNING << " MdtReadoutElement " << getStationName() << " stEta " << getStationEta() << " stPhi " << getStationPhi() << " multilayer "<getChildVol(ii); @@ -252,13 +237,13 @@ double MdtReadoutElement::getTubeLengthForCaching(int tubeLayer, int tube) const //theTube->getRMax(); tlength = 2.*theTube->getZHalfLength(); } - else reLog() << MSG::WARNING << "PhysChild with index "<mdtIdHelper(); int tubelayer = idh->tubeLayer(id); int tube = idh->tube(id); Amg::Vector3D cPos = center(tubelayer, tube); Amg::Vector3D roPos = ROPos(id); - // reLog()<mdtIdHelper(); int tubel = idh->tubeLayer(id); int tube = idh->tube(id); double distance = distanceFromRO(GlobalHitPosition, id); if (distance < 0) { - reLog()<MinimalGeoFlag() == 0) { - if ( reLog().level() <= MSG::DEBUG ) reLog() << MSG::DEBUG << " MdtReadoutElement " << getStationName() << " stEta " << getStationEta() + (*m_Log) << MSG::DEBUG << " MdtReadoutElement " << getStationName() << " stEta " << getStationEta() << " stPhi " << getStationPhi() << " has cutouts, check for real position of tubes " << endmsg; PVConstLink cv = getMaterialGeom(); // it is "Multilayer" int nGrandchildren = cv->getNChildVols(); @@ -578,8 +553,7 @@ MdtReadoutElement::nodeform_localTubePos(int multilayer, int tubelayer, int tube layernbr = ( cv->getIdOfChildVol(kk) - tubenbr ) / 100; if( tubenbr == tube && layernbr == tubelayer) { ii = kk; - if (reLog().level() <= MSG::DEBUG) - reLog() << MSG::DEBUG << " MdtReadoutElement tube match found for BMG - input : tube(" << tube << "), layer(" << tubelayer + (*m_Log) << MSG::DEBUG << " MdtReadoutElement tube match found for BMG - input : tube(" << tube << "), layer(" << tubelayer << ") - output match : tube(" << tubenbr << "), layer(" << layernbr << ")" << endmsg; break; } @@ -590,9 +564,8 @@ MdtReadoutElement::nodeform_localTubePos(int multilayer, int tubelayer, int tube double maxtol = 0.0000001; if (std::abs(xtube - tubeTrans(0,3)) > maxtol || - //std::abs(ytube - tubeTrans[1][3]) > maxtol && std::abs(tubeTrans[1][3]) > maxtol || std::abs(ztube - tubeTrans(2,3)) > maxtol) { - reLog()< maxtol) { - if ( reLog().level() <= MSG::DEBUG ) - reLog()< maxtol) // check only for tubes actually shifted { - reLog()<tubeLayer(id); int tube = idh->tube(id); - //std::cerr<<" localTubePos for Id = "<show_to_string(id)<getAbsoluteTransform(); const Amg::Transform3D mdtTrans = transform(); - // reLog()<mdtIdHelper())->show_to_string(identify()) + (*m_Log) <mdtIdHelper())->show_to_string(identify()) <<" ml, tl, t = "<mdtIdHelper(); int ml = idh->multilayer(id); int layer = idh->tubeLayer(id); int tube = idh->tube(id); #ifndef NDEBUG - if ( reLog().level() <= MSG::VERBOSE ) - { - reLog()<getNativeToAmdbLRS()); - -// std::cerr<<" Station "<= m_nsteps) { - reLog() << MSG::WARNING << "getNominalTubeLengthWoCutouts for Element named " << getStationName() << " with tech. " + (*m_Log) << MSG::WARNING << "getNominalTubeLengthWoCutouts for Element named " << getStationName() << " with tech. " << getTechnologyType() <<" DEid = "<show_to_string(identify())<< " called with: tubeL, tube " << tubeLayer << " " << tube << "; step " << istep << " out of range 0-" << m_nsteps-1 << " m_ntubesinastep " << m_ntubesinastep <( 1 ); - if (reLog().level() <= MSG::VERBOSE) - reLog() << MSG::VERBOSE <<"RE "<< idh->show_to_string(identify())<<" created vector of deform-trasf with size 1 - pointer "<<(uintptr_t)m_deformTransfs<show_to_string(identify())<<" created vector of deform-trasf with size 1 - pointer "<<(uintptr_t)m_deformTransfs<show_to_string(identify())<<" creating deform-trasf as identity for tLayer, tube "<show_to_string(identify())<<" creating deform-trasf as identity for tLayer, tube "<show_to_string(identify()) + (*m_Log) << MSG::VERBOSE <<"Creating vector of deform-Transformations for RE "<< idh->show_to_string(identify()) <<" with "<( ntot_tubes ); for (int j=0; j=ntot_tubes) { - reLog() << MSG::WARNING <<"global index for tubelayer/tube = "<=ntot_tubes ="<=ntot_tubes ="<show_to_string(identify()) + (*m_Log) << MSG::VERBOSE <<"RE "<< idh->show_to_string(identify()) <<" reusing deform-trasf for tLayer, tube "<show_to_string(identify()) + if (fabs(height-heightML)>10.) + (*m_Log) << MSG::DEBUG <<"RE "<< idh->show_to_string(identify()) <<"Different ML and MDTStation length in the precision coord.direction --- MultiLayerHeight, MDTstationHeigh " <show_to_string(identify()) + (*m_Log) << MSG::DEBUG <<"RE "<< idh->show_to_string(identify()) <<" created deform-trasf for tLayer, tube "<bz(), bLine->bp(), bLine->bn(), - //bLine->sp(),bLine->sn(), - //bLine->tw(), - //bLine->pg(), - //bLine->tr(), - //bLine->eg(),bLine->ep(),bLine->en(), fixedPoint); - -//} - // //Correspondence to AMDB parameters -TBM // //cpl_x is tr "trapezoidal effect" // //cpl_y is sy "Longbeam vertical sagitta" @@ -1220,7 +1139,7 @@ MdtReadoutElement::posOnDefChamWire( const Amg::Vector3D& locAMDBPos, if (fabs(fixedPoint.y())>0.01) z0mdt = z0-fixedPoint.y(); double t0mdt = t0; // unless in the D section of this station there's a dz diff. from 0 for the innermost MDT multilayer (often in barrel) if (fabs(fixedPoint.z())>0.01) t0mdt = t0-fixedPoint.z(); - if (z0mdt<0 || t0mdt<0) reLog()<mdtIdHelper()->show_to_string(identify())<getMdtAsBuiltParams(); if (!params) { - reLog() << MSG::WARNING << "Cannot find Mdt AsBuilt parameters for chamber " + (*m_Log) << MSG::WARNING << "Cannot find Mdt AsBuilt parameters for chamber " << getStationType() << ", eta " << getStationEta() << ", phi " << getStationPhi() << endmsg; return; } - reLog() << MSG::DEBUG + (*m_Log) << MSG::DEBUG << "Applying as-built parameters for chamber " << getStationType() << ", eta " << getStationEta() << ", phi " << getStationPhi() << " -- multilayer=" << multilayer << " tubelayer=" << tubelayer << " tube=" << tube << endmsg; @@ -1369,14 +1288,10 @@ void MdtReadoutElement::wireEndpointsAsBuilt(Amg::Vector3D& locAMDBWireEndP, Amg Amg::Vector3D ret(reference_point.x() + xshift, reference_point.y() + z0 + end_plug.y(), reference_point.z() + y0 + end_plug.z()); - //std::cout << "RET X: " << ret.x() << " " << wireEnd[isid].x() << " " << ret.x()-wireEnd[isid].x() << std::endl; - //std::cout << "RET Y: " << ret.y() << " " << wireEnd[isid].y() << " " << ret.y()-wireEnd[isid].y() << std::endl; - //std::cout << "RET Z: " << ret.z() << " " << wireEnd[isid].z() << " " << ret.z()-wireEnd[isid].z() << std::endl; - // Warn if result of calculation is too far off // BIL1A13 has as-built parameters up to 3mm off, giving the size of the cut if ((ret-wireEnd[isid]).mag() > 3.*CLHEP::mm) - reLog() << MSG::WARNING << "Large as-built correction for chamber " + (*m_Log) << MSG::WARNING << "Large as-built correction for chamber " << getStationType() << ", eta " << getStationEta() << ", phi " << getStationPhi() << ", ML " << multilayer << ", layer " << tubelayer << ", tube " << tube << ", side " << isid << ", Delta (" << ret.x()-wireEnd[isid].x() << ", " << ret.y()-wireEnd[isid].y() << ", " << ret.z()-wireEnd[isid].z() << ")" @@ -1398,13 +1313,13 @@ void MdtReadoutElement::setIdentifier(Identifier id) IdentifierHash detIdhash = 0; int gethash_code = idh->get_module_hash(id, collIdhash); if (gethash_code != 0) - reLog()<show_to_string(identify())<<" named "<show_to_string(id)<<" computing tranform for first tube of this RE"<show_to_string(identify())<<" named "<show_to_string(id)<<" computing tranform for first tube of this RE"<= ntot_tubes ) { - reLog() << MSG::WARNING + (*m_Log) << MSG::WARNING <<" transform called with tubeLayer or tube out of range in chamber " << manager()->mdtIdHelper()->print_to_string(m_id) << " : layer " << tubeLayer << " max " << m_nlayers << " tube " << tube << " max " << m_ntubesperlayer <<" will compute transform for first tube in this chamber"<< endmsg; - reLog() <<"Please run in DEBUG mode to get extra diagnostic"<= ntot_tubes ) { - reLog() << MSG::WARNING <<"surface called with tubeLayer or tube out of range in chamber " + (*m_Log) << MSG::WARNING <<"surface called with tubeLayer or tube out of range in chamber " << manager()->mdtIdHelper()->print_to_string(m_id) << " : layer " << tubeLayer << " max " << m_nlayers << " tube " << tube << " max " << m_ntubesperlayer <<" will compute surface for first tube in this chamber"<< endmsg; - reLog()<<"Please run in DEBUG mode to get extra diagnostic"<valid(id) ) { // is input id valid ? - reLog()<show_to_string(identify())<<" named "<show_to_string(id)<<" computing surface for first tube of this RE"<show_to_string(identify())<<" named "<show_to_string(id)<<" computing surface for first tube of this RE"<= ntot_steps ) { const MdtIdHelper* idh = manager()->mdtIdHelper(); - reLog() << MSG::WARNING <<"bounds for Element named " << getStationName() << " with tech. " + (*m_Log) << MSG::WARNING <<"bounds for Element named " << getStationName() << " with tech. " << getTechnologyType() <<" DEid = "<show_to_string(identify())<< " called with: tubeL, tube " << tubeLayer << " " << tube << "; step " << istep << " out of range 0-" << m_nsteps-1 << " m_ntubesinastep " << m_ntubesinastep <( ntot_steps ); Trk::CylinderBounds * boundsPtr = (*m_tubeBounds)[istep]; if (!boundsPtr) { - //std::cout<<" First time this bound is built: entering getTubeLengthForCaching "<valid(id) ) { // is input id valid ? - reLog()<show_to_string(identify())<<" named "<show_to_string(id)<<" computing bounds for first tube in this mdt RE"<show_to_string(identify())<<" named "<show_to_string(id)<<" computing bounds for first tube in this mdt RE"<valid(id) ) { // is input id valid ? - reLog()<show_to_string(identify())<<" named "<show_to_string(id)<<" computing center for first tube in this mdt RE"<show_to_string(identify())<<" named "<show_to_string(id)<<" computing center for first tube in this mdt RE"<= ntot_tubes ) { - reLog() << MSG::WARNING <<"center called with tubeLayer or tube out of range in chamber " + (*m_Log) << MSG::WARNING <<"center called with tubeLayer or tube out of range in chamber " << manager()->mdtIdHelper()->print_to_string(m_id) << " : layer " << tubeLayer << " max " << m_nlayers << " tube " << tube << " max " << m_ntubesperlayer <<" will compute center for first tube in this chamber"<< endmsg; - reLog()<<"Please run in DEBUG mode to get extra diagnostic"<empty()) { - if (reLog().level() <= MSG::VERBOSE) - reLog()<size()<size()<size(); ++tsf) { - if (reLog().level() <= MSG::VERBOSE) - reLog()<size()<size()<empty()) { #ifndef NDEBUG - if ( reLog().level() <= MSG::VERBOSE ) reLog()<size()<size()<size(); ++i) { @@ -1935,25 +1839,25 @@ void MdtReadoutElement::clearCache() const #ifndef NDEBUG else { - if ( reLog().level() <= MSG::VERBOSE ) reLog()<size()<size()<clear(); } #ifndef NDEBUG else - {if ( reLog().level() <= MSG::VERBOSE ) reLog()<size()<size()<clear(); } #ifndef NDEBUG else - {if ( reLog().level() <= MSG::VERBOSE ) reLog()<size()<size()<clear(); } #ifndef NDEBUG else - {if ( reLog().level() <= MSG::VERBOSE ) reLog()<size()<size()<clear(); } #ifndef NDEBUG else - {if ( reLog().level() <= MSG::VERBOSE ) reLog()<service("MessageSvc", m_msgSvc); + if (sc.isFailure()) std::cout << "Fail to locate Message Service" << std::endl; + m_Log = std::make_unique(m_msgSvc, "MuonDetectorElement"); } MuonDetectorElement::~MuonDetectorElement() { - // if (m_MsgStream) delete m_MsgStream; - // m_MsgStream=0; } } diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MuonPadDesign.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MuonPadDesign.cxx index 2a53e71e036..3f2674987c5 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MuonPadDesign.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MuonPadDesign.cxx @@ -3,6 +3,7 @@ */ #include "MuonReadoutGeometry/MuonPadDesign.h" +#include // for Form using MuonGM::MuonPadDesign; @@ -63,7 +64,6 @@ std::pair MuonPadDesign::channelNumber( const Amg::Vector2D& pos) const double fuzziedX = pos.x() - (-1.0*PadPhiShift /cos(locPhi*M_PI/180)); double fuzziedlocPhi = 180*atan(-1.0*fuzziedX/(radialDistance + pos.y()))/M_PI; - //std::cout << "\tMuonPadDesign::channelPosition locPhi " << locPhi << " maxlocPhi " << maxlocPhi << " fuzziedlocPhi " << fuzziedlocPhi << std::endl; bool below_half_length = (y1<0); bool outside_phi_range = (std::abs(locPhi)>maxlocPhi) or (std::abs(fuzziedlocPhi)>maxlocPhi); @@ -85,7 +85,6 @@ std::pair MuonPadDesign::channelNumber( const Amg::Vector2D& pos) const padPhidouble = (fuzziedlocPhi-firstPhiPos)/inputPhiPitch; int padPhi = padPhidouble+2; //(+1 because remainder means next column e.g. 1.1=2, +1 so rightmostcolumn=1) - //std::cout << "\tMuonPadDesign::channelPosition fuzziedlocPhi " << fuzziedlocPhi << " firstPhiPos " << firstPhiPos << " inputPhiPitch " << inputPhiPitch << std::endl; // adjust indices if necessary if(padEta==nPadH+1){ padEta-=1; } //the top row can be bigger, therefore it is really in the nPadH row. @@ -97,16 +96,14 @@ std::pair MuonPadDesign::channelNumber( const Amg::Vector2D& pos) const bool iphi_out_of_range = (padPhi < 0 || padPhi > nPadColumns+1); bool index_out_of_range = ieta_out_of_range or iphi_out_of_range; if(index_out_of_range) { - ATH_MSG_ERROR((ieta_out_of_range ? "eta" : "phi") - <<" out of range " - <<" (x,y)=("< pad, std::vectormaxY) yTop = maxY; @@ -198,7 +193,6 @@ bool MuonPadDesign::channelCorners(std::pair pad, std::vector $Id: MuonReadoutElement.cxx,v 1.3 2009-03-03 00:27:38 dwright Exp $ -// $Name: not supported by cvs2svn $ - #include "MuonReadoutGeometry/MuonReadoutElement.h" #include "MuonReadoutGeometry/MuonDetectorManager.h" #include "MuonReadoutGeometry/MuonStation.h" @@ -18,11 +15,13 @@ #include "GeoModelKernel/GeoPhysVol.h" #include "GeoModelKernel/GeoDefinitions.h" -#include "AthenaKernel/getMessageSvc.h" #include "TrkSurfaces/CylinderBounds.h" #include "TrkSurfaces/StraightLineSurface.h" -// Test +#include "GaudiKernel/ISvcLocator.h" +#include "GaudiKernel/Bootstrap.h" +#include "GaudiKernel/MsgStream.h" +#include "GaudiKernel/IMessageSvc.h" namespace MuonGM { @@ -31,10 +30,9 @@ namespace MuonGM { MuonDetectorManager* mgr) : TrkDetElementBase(pv), m_Ssize(-9999.), m_Rsize(-9999.), m_Zsize(-9999.), m_LongSsize(-9999.), - m_LongRsize(-9999.), m_LongZsize(-9999.), m_caching(-1), m_MsgStream(NULL), + m_LongRsize(-9999.), m_LongZsize(-9999.), m_caching(-1), m_eta(-1), m_phi(-1), m_id_max_init_field(-1), m_absTransform(nullptr),m_defTransform(nullptr) { - //m_msgSvc = Athena::getMessageSvc(); m_stationS = 0.; m_zi = zi; m_fi = fi; @@ -52,12 +50,15 @@ namespace MuonGM { m_nCSCinStation = 0; m_nRPCinStation = 0; m_nTGCinStation = 0; + ISvcLocator* svcLocator = Gaudi::svcLocator(); + StatusCode sc = svcLocator->service("MessageSvc", m_msgSvc); + if (sc.isFailure()) std::cout << "Fail to locate Message Service" << std::endl; + m_Log = std::make_unique(m_msgSvc, "MuonReadoutElement"); } MuonReadoutElement::~MuonReadoutElement() { - delete m_MsgStream; m_MsgStream=0; } void MuonReadoutElement::clear() const { @@ -202,12 +203,6 @@ namespace MuonGM { GeoTrf::Transform3D par_to_child = GeoTrf::Transform3D::Identity(); if ( m_indexOfREinMuonStation >=0 ) par_to_child = par->getXToChildVol( (unsigned int)m_indexOfREinMuonStation ); -#ifndef NDEBUG - else - { - reLog()<msgSvc(),"MuGM:RpcDetectorElement"); - //std::cerr<<"Costruttore di RpcDetectorElement per idhash = "<rpcIdHelper(); diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx index d7c74e4fcff..aa6937c624e 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx @@ -36,8 +36,6 @@ namespace MuonGM { m_etastrippitch(-9999.), m_phistriplength(-9999.), m_etastriplength(-9999.), m_phipaneldead(-9999.), m_etapaneldead(-9999.), m_exthonthick(-9999.), m_set(nullptr) { - m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:RpcReadoutElement"); - //MsgStream log(Athena::getMessageSvc(), "MuGM:RpcReadoutElement"); std::string gVersion = manager()->geometryVersion(); // get the setting of the caching flag from the manager @@ -545,19 +543,17 @@ namespace MuonGM { if ( fabs(localP1.x()-localPold.x())>0.01 || fabs(localP1.y()-localPold.y())>0.01 || fabs(localP1.z()-localPold.z())>0.01 ) { const RpcIdHelper* idh = manager()->rpcIdHelper(); - reLog()<show_to_string(identify())<<" and dbZ/dbPhi/gg "<rpcIdHelper()->show_to_string(identify())<<" and dbZ/dbPhi/gg "<get_module_hash(id, collIdhash); if (gethash_code != 0) - reLog()<rpcIdHelper(); - reLog()<show_to_string(identify()) + (*m_Log) <show_to_string(identify()) <<" ::distanceToPhiReadout --- z of the Point "<rpcIdHelper(); - reLog()<show_to_string(identify()) + (*m_Log) <show_to_string(identify()) <<" ::distanceToPhiReadout --- z of the Point "<getSsize()/2.) { //MsgStream log(m_msgSvc, "MuGM:RpcReadoutElement"); const RpcIdHelper* idh = manager()->rpcIdHelper(); - reLog()<show_to_string(identify()) + (*m_Log) <show_to_string(identify()) <<" ::distanceToEtaReadout --- in amdb local frame x of the point "<5*CLHEP::cm) { - // reLog()< 0 ) { sdistToCenter = getSsize()/2.; - reLog()<rpcIdHelper(); @@ -59,81 +56,75 @@ void RpcReadoutSet::setId(Identifier id) unsigned int RpcReadoutSet::NreadoutElements() const { - if( m_nreadoutelemets == 999 ) { - m_nreadoutelemets = 0; - // for (int dbz = 1; dbz< 4; ++dbz) - // std::cerr<<" dbzmax, dbphimax = "<doubletZMax(m_id)<<" " - // <doubletPhiMax(m_id)<doubletZMax(m_id); ++dbz) { - const RpcReadoutElement* rpcold = nullptr; - for (int dbp = 1; dbp<=m_helper->doubletPhiMax(m_id) ; ++dbp) { - Identifier chid = m_helper->channelID(m_id, dbz, dbp, 1, 0, 1); - const RpcReadoutElement* rpc = m_mgr->getRpcReadoutElement(chid); - //std::cerr<<" iz, ip "<getStationName() - // <<"/"<getTechnologyName()<getStationName() - // <<"/"<getTechnologyName()<doubletPhiMax(m_id)<doubletZMax(m_id); ++dbz) { + const RpcReadoutElement* rpcold = nullptr; + for (int dbp = 1; dbp<=m_helper->doubletPhiMax(m_id) ; ++dbp) { + Identifier chid = m_helper->channelID(m_id, dbz, dbp, 1, 0, 1); + const RpcReadoutElement* rpc = m_mgr->getRpcReadoutElement(chid); + //std::cerr<<" iz, ip "<getStationName() + // <<"/"<getTechnologyName()<getStationName() + // <<"/"<getTechnologyName()<doubletZMax(m_id); ++dbz) - { - int dbp = 1; - Identifier chid = m_helper->channelID(m_id, dbz, dbp, 1, 0, 1); - const RpcReadoutElement* rpc = m_mgr->getRpcReadoutElement(chid); - if (rpc != nullptr) ++m_ndoubletz; - } - } - return m_ndoubletz; + unsigned int ndoubletz = 0; + for (int dbz = 1; dbz<=m_helper->doubletZMax(m_id); ++dbz) + { + int dbp = 1; + Identifier chid = m_helper->channelID(m_id, dbz, dbp, 1, 0, 1); + const RpcReadoutElement* rpc = m_mgr->getRpcReadoutElement(chid); + if (rpc != nullptr) ++ndoubletz; + } + return ndoubletz; } unsigned int RpcReadoutSet::NsegmentedDoubletZ() const { - if( m_nsegmenteddoubletz == 999 ) { - m_nsegmenteddoubletz = 0; - for (int dbz = 1; dbz<=m_helper->doubletZMax(m_id); ++dbz) + unsigned int nsegmenteddoubletz = 0; + for (int dbz = 1; dbz<=m_helper->doubletZMax(m_id); ++dbz) + { + int nre = 0; + const RpcReadoutElement* rpcold = nullptr; + for (int dbp = 1; dbp<=m_helper->doubletPhiMax(m_id); ++dbp) { - int nre = 0; - const RpcReadoutElement* rpcold = nullptr; - for (int dbp = 1; dbp<=m_helper->doubletPhiMax(m_id); ++dbp) - { - Identifier chid = m_helper->channelID(m_id, dbz, dbp, 1, 0, 1); - const RpcReadoutElement* rpc = m_mgr->getRpcReadoutElement(chid); - if (rpc != nullptr) { - if (dbp == 2 && rpc != rpcold ) - { - std::cout<<" componenti "<getStationName() - <<"/"<getTechnologyName()<getStationName() - <<"/"<getTechnologyName()<channelID(m_id, dbz, dbp, 1, 0, 1); + const RpcReadoutElement* rpc = m_mgr->getRpcReadoutElement(chid); + if (rpc != nullptr) { + if (dbp == 2 && rpc != rpcold ) + { + std::cout<<" componenti "<getStationName() + <<"/"<getTechnologyName()<getStationName() + <<"/"<getTechnologyName()< 1) m_nsegmenteddoubletz++; } - } - return m_nsegmenteddoubletz; + if (nre > 1) nsegmenteddoubletz++; + } + return nsegmenteddoubletz; } unsigned int RpcReadoutSet::NPhimodules(int dbz) const diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcDetectorElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcDetectorElement.cxx index 7ec3a07d593..31393d14668 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcDetectorElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcDetectorElement.cxx @@ -23,7 +23,6 @@ namespace MuonGM { TgcDetectorElement::TgcDetectorElement(GeoVFullPhysVol* pv, MuonDetectorManager* mgr,Identifier id, IdentifierHash idHash) : MuonDetectorElement(pv,mgr,id,idHash), m_tgcre(NULL) { - //m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:TgcDetectorElement"); m_nREinDetectorElement=1; } diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutElement.cxx index 19ee127e1f2..28d00c5332b 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutElement.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutElement.cxx @@ -31,8 +31,6 @@ TgcReadoutElement::TgcReadoutElement(GeoVFullPhysVol* pv, std::string stName, : MuonClusterReadoutElement(pv, stName, zi, fi, is_mirrored, mgr), m_readout_type(-1), m_readoutParams(NULL) { - m_MsgStream = new MsgStream(mgr->msgSvc(),"MuGM:TgcReadoutElement"); - //std::string gVersion = manager()->geometryVersion(); setStationName(stName); // get the setting of the caching flag from the manager setCachingFlag(mgr->cachingFlag()); @@ -496,10 +494,8 @@ float TgcReadoutElement::stripDeltaPhi(int gasGap) const { assert(validGap(gasGap)); - if (reLog().level()<=MSG::DEBUG) { - reLog()<get_module_hash(id, collIdhash); if (gethash_code != 0) - reLog()<tgcIdHelper(); diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx index 3841c6906a1..0eec832f4c5 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx @@ -12,8 +12,11 @@ // $Name: not supported by cvs2svn $ #include "MuonReadoutGeometry/TgcReadoutParams.h" -#include "GaudiKernel/IMessageSvc.h" +#include "GaudiKernel/ISvcLocator.h" +#include "GaudiKernel/Bootstrap.h" #include "GaudiKernel/MsgStream.h" +#include "GaudiKernel/IMessageSvc.h" + #include #include @@ -26,23 +29,14 @@ TgcReadoutParams::TgcReadoutParams(std::string name, int iCh, int Version, float :m_chamberName(name), m_chamberType(iCh), m_readoutVersion(Version), m_wirePitch(WireSp), m_nPhiChambers((int)NCHRNG), m_physicalDistanceFromBase(-9999.) { - m_MsgStream = new MsgStream(msgSvc,"MuGM:TgcReadoutParams"); - // std::cout<<"TgcReadoutParams:: constructor - MaxNGaps = "<service("MessageSvc", m_msgSvc); + if (sc.isFailure()) std::cout << "Fail to locate Message Service" << std::endl; + m_Log = std::make_unique(m_msgSvc, "TgcReadoutParams"); + if (msgSvc) (*m_Log) << MSG::WARNING<<"TgcReadoutParams::TgcReadoutParams() - passed IMessageSvc which is not needed anymore." << endmsg; } @@ -74,23 +71,13 @@ TgcReadoutParams::TgcReadoutParams(std::string name, int iCh, int Version, float : m_chamberName(name), m_chamberType(iCh), m_readoutVersion(Version), m_wirePitch(WireSp), m_nPhiChambers(NCHRNG) { - m_MsgStream = new MsgStream(msgSvc,"MuGM:TgcReadoutParams"); - - // std::cout<<"TgcReadoutParams:: constructor - MaxNGaps = "<service("MessageSvc", m_msgSvc); + if (sc.isFailure()) std::cout << "Fail to locate Message Service" << std::endl; + m_Log = std::make_unique(m_msgSvc, "TgcReadoutParams"); + if (msgSvc) (*m_Log) << MSG::WARNING<<"TgcReadoutParams::TgcReadoutParams() - passed IMessageSvc which is not needed anymore." << endmsg; } TgcReadoutParams::~TgcReadoutParams() { - delete m_MsgStream; - m_MsgStream = 0; } // Access to general parameters @@ -163,16 +150,11 @@ float TgcReadoutParams::wirePitch() const return m_wirePitch; } -float TgcReadoutParams::gangThickness() const -{ - return s_gangThickness; -} - int TgcReadoutParams::nGangs(int gasGap) const { if (gasGap<1 || gasGap>MaxNGaps) { - reLog()<MaxNGaps) { - reLog()<MaxNGaps) { - reLog()<MaxNGaps) { - reLog()<MaxNGaps) { - reLog()< check the first one) if (istrip <= m_nStrips[0]+1) return m_stripPositionOnLargeBase[istrip-1]; else { - reLog()<cachingFlag()); @@ -66,10 +65,10 @@ namespace MuonGM { std::string sTGCname = std::string("sTG1-")+sName; - reLog() << MSG::DEBUG << "sTGCname: " << sTGCname << endmsg; + (*m_Log) << MSG::DEBUG << "sTGCname: " << sTGCname << endmsg; sTGCDetectorDescription *sTGC = sTGC_helper.Get_sTGCDetectorType(sTGCname); if(sTGC) - reLog() << MSG::DEBUG << "Found sTGC detector: " << sTGCname << " " << sTGC << endmsg; + (*m_Log) << MSG::DEBUG << "Found sTGC detector: " << sTGCname << " " << sTGC << endmsg; static const int nLayers = 4; @@ -79,7 +78,7 @@ namespace MuonGM { double ysFrame = sTGC->ysFrame(); //Frame thickness on short parallel edge double ylFrame = sTGC->ylFrame(); //Frame thickness on long parallel edge - reLog() << MSG::DEBUG << "length: " << length << " ysFrame: " << ysFrame << " ylFrame: " << ylFrame << endmsg; + (*m_Log) << MSG::DEBUG << "length: " << length << " ysFrame: " << ysFrame << " ylFrame: " << ylFrame << endmsg; } @@ -92,52 +91,19 @@ namespace MuonGM { for (unsigned ich=0; ichgetChildVol(ich); std::string childname = (pc->getLogVol())->getName(); - reLog() << MSG::DEBUG << "Volume Type: " << pc->getLogVol()->getShape()->type() << endmsg; + (*m_Log) << MSG::DEBUG << "Volume Type: " << pc->getLogVol()->getShape()->type() << endmsg; if ((npos = childname.find("Sensitive")) != std::string::npos ) { llay ++; if (llay > 4) { - reLog() << MSG::WARNING << "number of sTGC layers > 4: increase transform array size"<< endmsg; + (*m_Log) << MSG::WARNING << "number of sTGC layers > 4: increase transform array size"<< endmsg; continue; } m_Xlg[llay-1] = pvc->getXToChildVol(ich); - /*if (llay==1 || abs(zi)<3 ) { - if (pc->getLogVol()->getShape()->type()=="Shift") { - const GeoShapeShift* myshift = dynamic_cast (pc->getLogVol()->getShape()); - if(!myshift) { - reLog() << MSG::ERROR << "sTgcReadoutElement : even though the shape is of type shift it's not a shift - better crashing ..." << endmsg; - throw; - } - const GeoSimplePolygonBrep* poly=dynamic_cast(myshift->getOp()); - if(!poly) { - reLog() << MSG::ERROR << "sTgcReadoutElement : the sTGC is no polygon even though it should - better crashing ..." << endmsg; - throw; - } - if (poly->getNVertices()==4) - { - m_halfX[llay-1] = poly->getYVertex(0); - m_minHalfY[llay-1] = poly->getXVertex(3); - m_maxHalfY[llay-1] = poly->getXVertex(0); - } - else if (poly->getNVertices()==6) - { - m_halfX[llay-1] = poly->getYVertex(0); - m_minHalfY[llay-1] = poly->getXVertex(4); - double d1 = poly->getXVertex(5)-poly->getXVertex(4); - double d2 = poly->getYVertex(5)-poly->getYVertex(4); - double x = 2*poly->getYVertex(0)*d1/d2; - m_maxHalfY[llay-1] = m_minHalfY[llay-1]+x; - } - - } - else { - reLog() << MSG::WARNING << "sTGC layer shape not recognized:" << pc->getLogVol()->getShape()->type() << endmsg; - } - }*/ } } m_nlayers=llay; } else { - reLog() << MSG::WARNING << "Cannot read the GeoModel tree" << endmsg; + (*m_Log) << MSG::WARNING << "Cannot read the GeoModel tree" << endmsg; } } @@ -161,14 +127,14 @@ namespace MuonGM { // set parent data collection hash id int gethash_code = idh->get_module_hash(id, collIdhash); if (gethash_code != 0) - reLog()<GetName() << endmsg; else { - reLog() << MSG::DEBUG << "No sTGC Detector" << endmsg; - reLog() << MSG::DEBUG << sector_l <<" " << getStationEta() << " " << getStationPhi() << " " <GetTechnology(); @@ -276,7 +242,7 @@ namespace MuonGM { m_etaDesign[il].inputLength = m_etaDesign[il].minYSize; m_etaDesign[il].inputWidth = stgc->stripWidth(); if (!tech){ - reLog()<GetName() << endmsg; + (*m_Log) <GetName() << endmsg; m_etaDesign[il].thickness = 0; } else{ @@ -287,7 +253,7 @@ namespace MuonGM { if (m_sTGC_type == 3) m_etaDesign[il].firstPos = -(m_etaDesign[il].xSize -yCutout) + m_etaDesign[il].firstPitch; else m_etaDesign[il].firstPos = -0.5*m_etaDesign[il].xSize + m_etaDesign[il].firstPitch; - reLog() << MSG::DEBUG + (*m_Log) << MSG::DEBUG << "firstPos: " << m_etaDesign[il].firstPos << endmsg; m_etaDesign[il].sAngle = 0.; m_etaDesign[il].signY = 1 ; @@ -296,7 +262,7 @@ namespace MuonGM { m_nStrips.push_back(m_etaDesign[il].nch); - reLog()<0){ - good =1; - } - -reLog() << MSG::DEBUG<<"initDesign Sum Height Check: "<GetName()<<" stgc->Length(): "<Length()<<"ActiveArea Height "<GetName()<<" stgc - reLog() << MSG::DEBUG<<"initDesign stationname "<GetName()<<" stgc { if( !m_surfaceData ) m_surfaceData = new SurfaceData(); else{ - reLog()<GetName()<<" stgc Amg::Translation3D(0,0.,-offset + m_PadhalfX[layer] - m_padDesign[layer].yCutout)* Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.))* Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,0.,1.)) ); - else reLog()<m_layerCenters.push_back(m_surfaceData->m_layerTransforms.back().translation()); @@ -486,7 +439,7 @@ reLog() << MSG::DEBUG<<"initDesign Sum Height Check: "<GetName()<<" stgc m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]* Amg::Translation3D(shift,0.,-offset + m_halfX[layer] - m_etaDesign[layer].yCutout)* Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.)) ); - else reLog()<m_layerCenters.push_back(m_surfaceData->m_layerTransforms.back().translation()); @@ -507,7 +460,7 @@ reLog() << MSG::DEBUG<<"initDesign Sum Height Check: "<GetName()<<" stgc Amg::Translation3D(-shift,0.,-offset + m_PadhalfX[layer] - m_padDesign[layer].yCutout)* Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.))* Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,0.,1.)) ); - else reLog()<m_layerCenters.push_back(m_surfaceData->m_layerTransforms.back().translation()); @@ -545,8 +498,8 @@ reLog() << MSG::DEBUG<<"initDesign Sum Height Check: "<GetName()<<" stgc int gg = manager()->stgcIdHelper()->gasGap(id); Amg::Vector3D locP = m_Xlg[gg-1]*locPos; - reLog() << MSG::DEBUG << "locPos in the gg r.f. "<