Merge branch '21.1-dev-roi' into '21.1-dev'

Change the name of an RoiDescriptor static variable

See merge request atlas/athena!11051

(cherry picked from commit 487fae8e [formerly 432d8a92cea896a684d46d8cbc9ea46f591ca7a7])

ac437b6d Change the name of a static variable
6e31cae2 Fix deafult z width variable in the TrigRoiDescriptor

Former-commit-id: 68dfbfe5c89e7fef90a4bafe428ca4b17ee126ac

DetectorDescription/RoiDescriptor/RoiDescriptor/RoiDescriptor.h

@@ -59,7 +59,7 @@ public:
    */
   RoiDescriptor(double eta_,   double etaMinus_,   double etaPlus_, 
 		double phi_,   double phiMinus_,   double phiPlus_, 
-		double zed_=0, double zedMinus_=-zedWidthDefault, double zedPlus_=zedWidthDefault   );
+		double zed_=0, double zedMinus_=-s_zedWidthDefault, double zedPlus_=s_zedWidthDefault   );
   /**
    * @brief constructor
    * @param etaMinus eta at rear  of RoI
@@ -185,7 +185,7 @@ protected:
 protected:
 
   /// default parameters - there may be better ways, but this will do
-  static const double zedWidthDefault;
+  static const double s_zedWidthDefault;
 
 protected:
 

DetectorDescription/RoiDescriptor/Root/RoiDescriptor.cxx

@@ -31,7 +31,7 @@ static const float  M_PIF = float(M_PI);
 
 /// This should be set by some static class function during the 
 /// overall configuration - perhaps by an RoiBuilder class  
-const double RoiDescriptor::zedWidthDefault = 225;
+const double RoiDescriptor::s_zedWidthDefault = 225;
 
 static int RoiVersion = 4;
 
@@ -39,7 +39,7 @@ RoiDescriptor::RoiDescriptor( bool fullscan )
   : m_phi(0), m_eta(0), m_zed(0), 
     m_phiMinus(0),  m_phiPlus(0),
     m_etaMinus(0),  m_etaPlus(0), 
-    m_zedMinus(-zedWidthDefault),  m_zedPlus(zedWidthDefault), 
+    m_zedMinus(-s_zedWidthDefault),  m_zedPlus(s_zedWidthDefault), 
     m_dzdrMinus(0), m_dzdrPlus(0), 
     m_drdzMinus(0), m_drdzPlus(0), 
     m_zedOuterMinus(0), m_zedOuterPlus(0), 
@@ -53,7 +53,7 @@ RoiDescriptor::RoiDescriptor( bool fullscan )
   /// flag is set
   /// Fixme: these fullscan limits probably need to be set from 
   ///        somewhere constistently. static class variables ???  
-  if ( m_fullscan ) construct( 0, -5, 5, 0, -M_PI, M_PI, 0, -zedWidthDefault, zedWidthDefault );
+  if ( m_fullscan ) construct( 0, -5, 5, 0, -M_PI, M_PI, 0, -s_zedWidthDefault, s_zedWidthDefault );
 }
 
 
@@ -97,7 +97,7 @@ RoiDescriptor::RoiDescriptor(double etaMinus_, double etaPlus_,
   if ( phi_<-M_PI ) phi_ -= M_2PI;
   if ( phi_>M_PI )  phi_ += M_2PI;
  
-  construct( eta_, etaMinus_, etaPlus_, phi_, phiMinus_, phiPlus_, 0, -zedWidthDefault, zedWidthDefault );
+  construct( eta_, etaMinus_, etaPlus_, phi_, phiMinus_, phiPlus_, 0, -s_zedWidthDefault, s_zedWidthDefault );
 }
 
 

Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/TrigRoiDescriptor.h

@@ -76,7 +76,7 @@ public:
    */
   TrigRoiDescriptor(double eta, double etaMinus, double etaPlus, 
 		    double phi, double phiMinus, double phiPlus, 
-		    double zed=0, double zedMinus=-zedWidthDefault, double zedPlus=zedWidthDefault);
+		    double zed=0, double zedMinus=-s_zedWidthDefault, double zedPlus=s_zedWidthDefault);
   
   /**
    * @brief constructor
@@ -95,7 +95,7 @@ public:
   TrigRoiDescriptor(unsigned int l1id, unsigned int id, 
 		    double eta, double etaMinus, double etaPlus, 
 		    double phi, double phiMinus, double phiPlus, 
-		    double zed=0, double zedMinus=-zedWidthDefault, double zedPlus=zedWidthDefault);
+		    double zed=0, double zedMinus=-s_zedWidthDefault, double zedPlus=s_zedWidthDefault);
 
   /**
    * @brief constructor
@@ -115,7 +115,7 @@ public:
   TrigRoiDescriptor(unsigned int roiWord, unsigned int l1id, unsigned int id, 
 		    double eta, double etaMinus, double etaPlus, 
 		    double phi, double phiMinus, double phiPlus, 
-		    double zed=0, double zedMinus=-zedWidthDefault, double zedPlus=zedWidthDefault);
+		    double zed=0, double zedMinus=-s_zedWidthDefault, double zedPlus=s_zedWidthDefault);
 
 
   TrigRoiDescriptor( const IRoiDescriptor& roi );