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

Sweeping !5648 from 21.3 to master.
adjust TrkTruthCreatorTools for NSW (ATLASSIM-3465)

See merge request !5796

Tracking/TrkTools/TrkTruthCreatorTools/src/DetailedTrackTruthBuilder.cxx

@@ -193,6 +193,10 @@ DetailedTrackTruthBuilder::findSubDetType(Identifier id) const {
     return SubDetHitStatistics::RPC;
   if (m_idHelper->is_tgc(id))
     return SubDetHitStatistics::TGC;
+  if (m_idHelper->is_stgc(id))
+    return SubDetHitStatistics::STGC;
+  if (m_idHelper->is_mm(id))
+    return SubDetHitStatistics::MM;
   if (m_idHelper->is_csc(id))
     return SubDetHitStatistics::CSC;