Merge branch 'HMPLmigrationMuonPRDTest' into '21.3'

Switch to writing out hits using HepMcParticleLinks/barcodes rather than G4 Track IDs

See merge request atlas/athena!14719

MuonSpectrometer/MuonG4/MuonG4SD/src/TGCSensitiveDetector.h

@@ -45,7 +45,8 @@ We describe in the following, how each field of the identifier is retrieved.
    layout, the volume name (whether it contains the string "Q02", for instance)
    is used to retrieve geometry information.
    In the year 2018 and even some years before there are not any more other
-   database layouts / volumes than MUONQ02 and therefore some logic was removed.
+   database layouts / volumes than MUONQ02 and therefore some logic was removed
+
 
 2) for each hit, the time of flight (the G4 globalTime), is recorded and
    associated to the hit.

MuonSpectrometer/MuonG4/MuonG4SD/src/sTGCSensitiveDetector.cxx

@@ -113,8 +113,6 @@ G4bool sTGCSensitiveDetector::ProcessHits(G4Step* aStep,G4TouchableHistory* /*RO
 
   int sTgcId = m_muonHelper->BuildsTgcHitId(subType, iPhi, iRing, mLayer,nLayer, iSide);
   TrackHelper trHelp(aStep->GetTrack());
-  //int barcode = trHelp.GetBarcode(); // Added for GenericMuonSimHIT
-
   m_GenericMuonHitCollection->Emplace(sTgcId,globalTime,globalpreTime,position,local_position,preposition,local_preposition,pdgCode,eKin,direction,depositEnergy,StepLength,trHelp.GetParticleLink());
   m_sTGCSimHitCollection->Emplace(sTgcId,globalTime,position,pdgCode,direction,depositEnergy,trHelp.GetParticleLink());