Merge branch '22.0-coverity-TRT_GeoModel' into 'master'

22.0 coverity TRT_GeoModel

See merge request atlas/athena!11774

InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.cxx

@@ -48,8 +48,7 @@ TRT_DetDescrDB_ParameterInterface::~TRT_DetDescrDB_ParameterInterface() {
 
   delete m_distortedMatManager;
   delete m_placements;
-  //std::map<std::string, TRT_Part *>::const_iterator iter;
-  //for (iter=m_parts.begin(); iter != m_parts.end(); ++iter) delete iter->second;
+  
 
 }
 
@@ -339,14 +338,9 @@ void TRT_DetDescrDB_ParameterInterface::SetValues() {
 
   endCapShiftForEachRotation = RDBVars_EndCapOverallPars->getFloat("SHIFTFOREACHROTATION")*CLHEP::radian;
 
-  //endCapPhiOfFirstStraw = RDBVars_EndCapOverallPars->getFloat("PHIOFFIRSTSTRAW")*CLHEP::radian;
   endCapPhiOfFirstStraw = 0; // Temporary
 
-  // These are used in the factory and should at some point come from here:
-  //  const unsigned int nSides = 2;
-  //  const unsigned int nStrawLayMaxEc = 16;
-  //  const unsigned int nPhiMax = 32;
-
+ 
   endCapInnerRadiusOfSupportA = RDBVars_A_Wheel->getFloat("INNERRADIUSOFSUPPORT")*CLHEP::mm;
   endCapInnerRadiusOfSupportB = RDBVars_B_Wheel->getFloat("INNERRADIUSOFSUPPORT")*CLHEP::mm;
   endCapInnerRadiusOfSupportC = RDBVars_C_Wheel->getFloat("INNERRADIUSOFSUPPORT")*CLHEP::mm;
@@ -465,14 +459,7 @@ void TRT_DetDescrDB_ParameterInterface::SetValues() {
     const IRDBRecord* row = (*RDB_EndCapStrwLayZPos)[iiPlane];
     endCapLayerZPositionC[iiPlane] = row->getFloat("LAYERZPOSCWHEELS")*CLHEP::mm;
   };
-  
-  //   //Do some overrides for cosmic run:
-  //   if (oldConfiguration&&isCosmicRun) {
-  //     endcapNumberOfAWheels = 0;
-  //     endcapNumberOfBWheels = 0;
-  //     endcapNumberOfCWheels = 0;
-  //   };
-
+ 
 
   
   if (includeECFoilHeatExchangerAndMembranes) {

InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.h

@@ -15,7 +15,6 @@ class IRDBRecord;
 class TopLevelPlacements;
 
 
-#include <map>
 
 class TRT_DetDescrDB_ParameterInterface : public TRTParameterInterface {
 
@@ -26,7 +25,11 @@ public:
   TRT_DetDescrDB_ParameterInterface(const InDetDD::AthenaComps * athenaComps);
 
   ~TRT_DetDescrDB_ParameterInterface();
-
+  // delete copy c'tor
+  TRT_DetDescrDB_ParameterInterface(const TRT_DetDescrDB_ParameterInterface &) = delete;
+  // delete assignment
+  TRT_DetDescrDB_ParameterInterface & operator=(const TRT_DetDescrDB_ParameterInterface &) = delete;
+  //
   virtual const HepGeom::Transform3D & partTransform(const std::string & partName) const;
   virtual bool partPresent(const std::string & partName) const;
   virtual const InDetDD::DistortedMaterialManager * distortedMatManager() const;