Merge branch 'cherry-pick-bc27550a-master' into 'master'

Sweeping !31654 from 21.3 to master.
Fix Unused class rule warning in MuonSimEvent (ATLASSIM-4476)

See merge request !31732

MuonSpectrometer/MuonSimEvent/MuonSimEvent/MMSimHit.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONSIMEVENT_MMSimHit_H
-#define MUONSIMEVENT_MMSimHit_H 1
+#define MUONSIMEVENT_MMSimHit_H
 
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "GeneratorObjects/HepMcParticleLink.h"
@@ -21,14 +21,10 @@ class MMSimHit {
   MMSimHit();
 
   // Destructor:
-  virtual ~MMSimHit();
+  virtual ~MMSimHit()=default;
    MMSimHit(HitID id, double time, const Amg::Vector3D& position, const int particleEncoding, const double kineticEnergy, const Amg::Vector3D& direction, const double depositEnergy, const int trackNumber);
       MMSimHit(HitID id, double time, const Amg::Vector3D& position, const int particleEncoding, const double kineticEnergy, const Amg::Vector3D& direction, const double depositEnergy, const HepMcParticleLink hmpl);
- 
-  //
-  // member functions
-  //
-  
+
   //postStep globalTime
   double  globalTime()    const { return (double) m_globalTime; }
   
@@ -86,4 +82,4 @@ inline double MMSimHit::meanTime() const
 inline float hitTime(const MMSimHit& hit)
 { return (float) hit.meanTime(); }	
 
-#endif
+#endif // MUONSIMEVENT_MMSimHit_H

MuonSpectrometer/MuonSimEvent/MuonSimEvent/MuonSimEventDict.h

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONSIMEVENT_MUONSIMEVENTDICT_H
@@ -9,7 +9,8 @@
 #include "MuonSimEvent/MDTSimHitCollection.h"
 #include "MuonSimEvent/RPCSimHitCollection.h"
 #include "MuonSimEvent/TGCSimHitCollection.h"
-#include "MuonSimEvent/GenericMuonSimHitCollection.h"
 #include "MuonSimEvent/sTGCSimHitCollection.h"
+#include "MuonSimEvent/MMSimHitCollection.h"
+#include "MuonSimEvent/GenericMuonSimHitCollection.h"
 
 #endif

MuonSpectrometer/MuonSimEvent/src/MMSimHit.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonSimEvent/MMSimHit.h"
@@ -15,11 +15,6 @@ MMSimHit::MMSimHit():
 {
 }
 /*******************************************************************************/
-//virtual destructor required by Pool
-MMSimHit::~MMSimHit()
-{
-}
-/*******************************************************************************/
 MMSimHit::MMSimHit(HitID id, double time, 
                                      const Amg::Vector3D& position,
                                      const int particleEncoding,