Skip to content
Snippets Groups Projects

Manual sweep fo !32457 (Fix MM Digitization Warnings)

Merged Nicolas Koehler requested to merge nkoehler/athena:swp32457 into master
11 files
+ 129
138
Compare changes
  • Side-by-side
  • Inline
Files
11
@@ -2,29 +2,16 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
MM Readout Element properties
-----------------------------------------
***************************************************************************/
#ifndef MUONGEOMODEL_MMREADOUTELEMENT_H
# define MUONGEOMODEL_MMREADOUTELEMENT_H
#define MUONGEOMODEL_MMREADOUTELEMENT_H
#include "MuonReadoutGeometry/MuonClusterReadoutElement.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/MuonChannelDesign.h"
#include <cmath>
class StoreGateSvc;
class BLinePar;
namespace Trk{
class RectangleBounds;
class PlaneSurface;
}
namespace MuonGM {
/**
An MMReadoutElement corresponds to a single STGC module; therefore
@@ -58,7 +45,7 @@ namespace MuonGM {
If the strip number is outside the range of valid strips, the function will return false */
virtual bool stripPosition( const Identifier& id, Amg::Vector2D& pos ) const override;
bool stripGlobalPosition( const Identifier& id, Amg::Vector3D& gpos ) const;
double stripLength( const Identifier& id) const;
/** number of layers in phi/eta projection */
@@ -68,6 +55,10 @@ namespace MuonGM {
virtual int numberOfStrips( const Identifier& layerId ) const override;
virtual int numberOfStrips( int , bool measuresPhi ) const override;
/** Number of missing bottom and top strips (not read out) */
int numberOfMissingTopStrips( const Identifier& layerId ) const;
int numberOfMissingBottomStrips( const Identifier& layerId ) const;
/** space point position for a given pair of phi and eta identifiers
The LocalPosition is expressed in the reference frame of the phi surface.
If one of the identifiers is outside the valid range, the function will return false */
@@ -252,6 +243,20 @@ namespace MuonGM {
else return -1;
}
inline int MMReadoutElement::numberOfMissingTopStrips( const Identifier& id ) const {
const MuonChannelDesign* design = getDesign(id);
if( !design ) return -1;
int nStrips = design->sAngle == 0 ? design->nMissedTopEta : design->nMissedTopStereo;
return nStrips;
}
inline int MMReadoutElement::numberOfMissingBottomStrips( const Identifier& id ) const {
const MuonChannelDesign* design = getDesign(id);
if( !design ) return -1;
int nStrips = design->sAngle == 0 ? design->nMissedBottomEta : design->nMissedBottomStereo;
return nStrips;
}
inline bool MMReadoutElement::spacePointPosition( const Identifier& phiId, const Identifier& etaId, Amg::Vector2D& pos ) const {
Amg::Vector2D phiPos;
Amg::Vector2D etaPos;
Loading