diff --git a/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h b/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h index daff62d11815d..d34a9616100f0 100644 --- a/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h +++ b/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h @@ -6,7 +6,7 @@ class G4ProcessTypeEnumerator { public: G4ProcessTypeEnumerator(); - ~G4ProcessTypeEnumerator(); + ~G4ProcessTypeEnumerator() = default; inline unsigned int processId(const G4VProcess* p) const { return (p) ? p->GetProcessSubType() : 0; } inline int processIdLong(const G4VProcess* p) const { return (p) ? p->GetProcessSubType() : 0; } diff --git a/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc b/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc index 2426c4221209a..38313cb6f5e2a 100644 --- a/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc +++ b/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc @@ -2,14 +2,14 @@ static const int nprocesses = 49; static const std::string g4processes[nprocesses] = { - "Primary", "Transportation", "CoupleTrans", "CoulombScat", "Ionisation", "Brems", - "PairProdCharged", "Annih", "AnnihToMuMu", "AnnihToHad", "NuclearStopp", "Msc", - "Rayleigh", "PhotoElectric", "Compton", "Conv", "ConvToMuMu", "Cerenkov", - "Scintillation", "SynchRad", "TransRad", "OpAbsorp", "OpBoundary", "OpRayleigh", - "OpWLS", "OpMieHG", "DNAElastic", "DNAExcit", "DNAIonisation", "DNAVibExcit", - "DNAAttachment", "DNAChargeDec", "DNAChargeInc", "HadElastic", "HadInelastic", "HadCapture", - "HadFission", "HadAtRest", "HadCEX", "Decay", "DecayWSpin", "DecayPiWSpin", - "DecayRadio", "DecayUnKnown", "DecayExt", "GFlash", "StepLimiter", "UsrSpecCuts", + "Primary", "Transportation", "CoupleTrans", "CoulombScat", "Ionisation", "Brems", + "PairProdCharged", "Annih", "AnnihToMuMu", "AnnihToHad", "NuclearStopp", "Msc", + "Rayleigh", "PhotoElectric", "Compton", "Conv", "ConvToMuMu", "Cerenkov", + "Scintillation", "SynchRad", "TransRad", "OpAbsorp", "OpBoundary", "OpRayleigh", + "OpWLS", "OpMieHG", "MuDBrem", "MuMuonPairProd", "DNAIonisation", "DNAVibExcit", + "DNAAttachment", "DNAChargeDec", "DNAChargeInc", "HadElastic", "HadInelastic", "HadCapture", + "HadFission", "HadAtRest", "HadCEX", "Decay", "DecayWSpin", "DecayPiWSpin", + "DecayRadio", "DecayUnKnown", "DecayExt", "GFlash", "StepLimiter", "UsrSpecCuts", "NeutronKiller"}; static const int g4subtype[nprocesses] = { 0, // Primary generator @@ -24,12 +24,15 @@ static const int g4subtype[nprocesses] = { 7, // AnnihToHad 8, // NuclearStopp 10, // Msc - 11, // + 11, // Rayleigh 12, // PhotoElectric 13, // Compton 14, // Conv 15, // ConvToMuMu - 21, 22, 23, 24, 31, 32, 33, 34, 35, 51, 52, 53, 54, 55, 56, 57, + 21, 22, 23, 24, 31, 32, 33, 34, 35, + 40, // muDBrem + 49, // MuMuonPairProd + 53, 54, 55, 56, 57, 111, // HadElastic 121, // HadInelastic 131, // HadCapture @@ -50,8 +53,6 @@ static const int g4subtype[nprocesses] = { G4ProcessTypeEnumerator::G4ProcessTypeEnumerator() {} -G4ProcessTypeEnumerator::~G4ProcessTypeEnumerator() {} - std::string G4ProcessTypeEnumerator::processG4Name(int idx) const { std::string res = ""; for (int i = 0; i < nprocesses; ++i) {