diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/Spacer.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/Spacer.h index 0ed326090a4e39961dd940c1db336ceec936ccff..0a0ed6062d681af42638d9ad5e5267c175616200 100755 --- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/Spacer.h +++ b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/Spacer.h @@ -6,7 +6,7 @@ #define Spacer_H #include "MuonGeoModel/DetectorElement.h" -#include "MuonGeoModel/SpacerComponent.h" +#include "MuonGeoModel/SpaComponent.h" class GeoVPhysVol; @@ -27,7 +27,7 @@ public: void print(); private: - SpacerComponent m_component; + SpaComponent m_component; }; } // namespace MuonGM diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/SpacerComponent.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/SpacerComponent.h deleted file mode 100755 index 329227f4e7e1aa7219eda7b49774750a6197a06c..0000000000000000000000000000000000000000 --- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/SpacerComponent.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef SpacerComponent_H -#define SpacerComponent_H - -#include "MuonGeoModel/StandardComponent.h" - -namespace MuonGM { - -class SpacerComponent: public StandardComponent { -public: - double maxwdy; // length from bottom to the max width of the CSL - // for CSC it is = dy -}; -} // namespace MuonGM - -#endif diff --git a/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx b/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx index 5fd08955a62ebc6752170024f091fe7f7077cb53..2bfd146e9a8b0c7901e16e7e96d06e4856b434b1 100755 --- a/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx +++ b/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx @@ -6,7 +6,7 @@ #include "MuonGeoModel/Station.h" #include "MuonGeoModel/MYSQL.h" #include "MuonGeoModel/Technology.h" -#include "MuonGeoModel/SpacerComponent.h" +#include "MuonGeoModel/SpaComponent.h" #include "GeoModelKernel/GeoTrd.h" #include "GeoModelKernel/GeoTube.h" #include "GeoModelKernel/GeoVPhysVol.h" @@ -29,7 +29,7 @@ namespace MuonGM { Spacer::Spacer(Component *ss): DetectorElement(ss->name) { - SpacerComponent* s = (SpacerComponent*)ss; + SpaComponent* s = dynamic_cast<SpaComponent*>(ss); width = s->dx1; longWidth = s->dx2; MYSQL* mysql = MYSQL::GetPointer();