lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc
+7 -7
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DiffractiveSplitableHadron.cc,v 1.3 2003/11/03 17:54:53 hpw Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
// $Id: G4DiffractiveSplitableHadron.cc,v 1.4 2004/12/07 13:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// ------------------------------------------------------------
@@ -115,14 +115,14 @@ void G4DiffractiveSplitableHadron::ChooseStringEnds(G4int PDGcode,G4int * aEnd,
const G4double uuspin1= 1./3.;
// const G4double udspin0= 1./2.; //@
G4int absPDGcode=abs(PDGcode);
G4int absPDGcode=std::abs(PDGcode);
if ( absPDGcode < 1000 ) //-------------------- Meson -------------
{
G4int heavy= absPDGcode/ 100;
G4int light= (absPDGcode %100)/10;
// G4int anti= pow(-1 , std::max( heavy, light));
// G4int anti= std::pow(-1 , std::max( heavy, light));
G4int anti= 1 -2 * ( std::max( heavy, light ) % 2 );
if (PDGcode < 0 ) anti *=-1;
@@ -149,7 +149,7 @@ void G4DiffractiveSplitableHadron::ChooseStringEnds(G4int PDGcode,G4int * aEnd,
G4double random= G4UniformRand();
if ( abs(j100) >= abs(j10) )
if ( std::abs(j100) >= std::abs(j10) )
{
if ( random < udspin1 )
{
@@ -196,8 +196,8 @@ G4int G4DiffractiveSplitableHadron::Diquark(G4int aquark,G4int bquark,G4int Spin
{
G4int diquarkPDG;
diquarkPDG = std::max( abs(aquark), abs(bquark) )*1000 +
std::min( abs(aquark), abs(bquark) )*100 +
diquarkPDG = std::max( std::abs(aquark), std::abs(bquark) )*1000 +
std::min( std::abs(aquark), std::abs(bquark) )*100 +
2*Spin + 1;
return ( aquark > 0 && bquark > 0 ) ? diquarkPDG : -1*diquarkPDG;
}
source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FTFModel.cc,v 1.4 2003/12/11 10:50:49 gunter Exp $
// GEANT4 tag $Name: geant4-06-01 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// ------------------------------------------------------------
source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4FTFParticipants.cc,v 1.3 2003/12/11 11:54:31 hpw Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4FTFParticipants.cc,v 1.4 2004/12/07 13:50:09 gunter Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -85,7 +85,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
// G4cout << " primary Total E (GeV): " << thePrimary.GetTotalEnergy()/GeV << G4endl;
// G4cout << " primary Mass (GeV): " << thePrimary.GetMass() /GeV << G4endl;
// G4cout << "cms sqrt(s) (GeV) = " << sqrt(s) / GeV << G4endl;
// G4cout << "cms std::sqrt(s) (GeV) = " << std::sqrt(s) / GeV << G4endl;
G4PomeronCrossSection theCrossSection(thePrimary.GetDefinition());
@@ -141,7 +141,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
// G4cout << "Number of Hit nucleons " << theInteractions.entries()
// << "\t" << impactX/fermi << "\t"<<impactY/fermi
// << "\t" << sqrt(sqr(impactX)+sqr(impactY))/fermi <<G4endl;
// << "\t" << std::sqrt(sqr(impactX)+sqr(impactY))/fermi <<G4endl;
}