main-coverity-MCTruth

[minor] Coverity defects 16833, 16834 addressed (COPY_INSTEAD_OF_MOVE). Also tidied headers and moved an enum out of global namespace into class.

Simulation/G4Sim/MCTruth/MCTruth/AtlasG4EventUserInfo.h

@@ -64,7 +64,7 @@ public:
    * time an interaction of the G4Track is recorded to the
    * HepMC::GenEvent. TODO Rename
    */
-  void SetCurrentGenParticle(HepMC::GenParticlePtr p) {m_currentlyTraced=std::move(p);}
+  void SetCurrentGenParticle(HepMC::GenParticlePtr p) {m_currentGenParticle = std::move(p);}
 
   /**
    * @brief return the value of G4Track::GetTrackID() for the last
@@ -104,7 +104,7 @@ public:
 private:
   HepMC::GenEvent *m_theEvent{};
   HepMC::ConstGenParticlePtr m_currentPrimaryGenParticle{};
-  HepMC::GenParticlePtr m_currentlyTraced{};
+  HepMC::GenParticlePtr m_currentGenParticle{};
   // These next two variables are used by the CaloCalibrationHit
   // recording code as event-level flags They correspond to the Track
   // ID and step number of the last G4Step processed by a