Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Small update for FLUKA coupling output + geant4 #1055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 26, 2020
Merged

Small update for FLUKA coupling output + geant4 #1055

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28c2ae1
Add some missing return cases for FLUKA (where FLUKAIO will not return
JamesMolson Feb 24, 2020
94188c2
Add mass tolerance for geant4 mass differences.
JamesMolson Feb 24, 2020
85ad74d
Delete fluka_init_brhono at Alessio's request.
JamesMolson Feb 25, 2020
73a8942
Update the changelog.
JamesMolson Feb 25, 2020
b17b9eb
Update CHANGELOG.md
amereghe Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add mass tolerance for geant4 mass differences.
  • Loading branch information
@JamesMolson
JamesMolson committed Feb 24, 2020
commit 94188c295cdbe708f1ddcd6a58a60e36347f16a1
13 changes: 12 additions & 1 deletion source/g4collimation/CollimationParticleGun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ void CollimationParticleGun::SetParticleDetails(double x, double y, double px, d
ParticleGun->SetParticleCharge(q*CLHEP::eplus);
}
const G4double mp = particle->GetPDGMass();
if(mp != mass)

if(fabs(mp - mass) > (1e-5*mass))
{
std::cout.precision(17);
std::cout << "GEANT4> Mass missmatch between Geant4 and SixTrack!" << std::endl;
Expand All @@ -92,6 +93,16 @@ void CollimationParticleGun::SetParticleDetails(double x, double y, double px, d
std::cout << "GEANT4> If the HION block is used, convert to GeV!" << std::endl;
exit(EXIT_FAILURE);
}
else
{
//scale mass
/*
* From FLUKA coupling:
ECBEAM = (ECBEAM/AMBEAM)*AM(IONID)
AMBEAM = AM(IONID)
*/
e = (e/mass)*mp;
}

//The kinetic energy (Total energy - rest mass)
ParticleGun->SetParticleEnergy(e - mp);
Expand Down