diff --git a/NPSimulation/Core/EventGeneratorParticleDecay.cc b/NPSimulation/Core/EventGeneratorParticleDecay.cc index 1c8991adef9845b2c0569207b5df3250f0c2bac8..e70080ef2523205ab8f4e8a3bc9593c7f7ebd3cb 100644 --- a/NPSimulation/Core/EventGeneratorParticleDecay.cc +++ b/NPSimulation/Core/EventGeneratorParticleDecay.cc @@ -312,7 +312,6 @@ void EventGeneratorParticleDecay::GenerateEvent(G4Event*){ } } } - } @@ -352,7 +351,7 @@ void EventGeneratorParticleDecay::SetDecay(vector<string> DaughterName, vector<b int InitialMass = myNucleus->GetA() ; int FinalMass = 0 ; delete myNucleus; for (unsigned int i = 0 ; i< DaughterName.size(); i++) { - if(DaughterName[i] == "p" || DaughterName[i] == "proton" ){ + if(DaughterName[i] == "p" || DaughterName[i] == "proton" || DaughterName[i] == "1H"){ m_DaughterNuclei.push_back(G4ParticleTable::GetParticleTable()->FindParticle("proton")); FinalMass++;FinalCharge++; } diff --git a/NPSimulation/Core/ParticleStack.cc b/NPSimulation/Core/ParticleStack.cc index f2138e61432553329fb9499c1d03f0060ce769bc..b93028c477e03dec42e8b6d4ae2c9a33b12f7608 100644 --- a/NPSimulation/Core/ParticleStack.cc +++ b/NPSimulation/Core/ParticleStack.cc @@ -218,7 +218,7 @@ string ParticleStack::ChangeNameToG4Standard(string OriginalName){ // Special case for light particles string FinalName=Nucleid+NumberOfMass; if (FinalName=="H1") FinalName="proton"; - else if (FinalName=="H2") FinalName="deuteron"; +// else if (FinalName=="H2") FinalName="deuteron"; else if (FinalName=="H3") FinalName="triton"; else if (FinalName=="He4") FinalName="alpha"; else if (FinalName=="p") FinalName="proton";