Import Geant4 10.2.0 source tree
This commit is contained in:
@@ -29,6 +29,9 @@
|
||||
#include "globals.hh"
|
||||
#include "G4VAnnihilationCrossSection.hh"
|
||||
|
||||
#include "G4Pow.hh"
|
||||
|
||||
|
||||
class G4ASCCrossSection : public G4VAnnihilationCrossSection
|
||||
{
|
||||
public:
|
||||
@@ -57,7 +60,8 @@ InCharge(G4int aCode, G4int bCode)
|
||||
inline G4double G4ASCCrossSection::
|
||||
GetXsec(G4double S)
|
||||
{
|
||||
G4double result = theX*std::pow(S, theEps) + theY*std::pow(S, -theEta);
|
||||
G4double result = theX*G4Pow::GetInstance()->powA(S, theEps) +
|
||||
theY*G4Pow::GetInstance()->powA(S, -theEta);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4QGSDiffractiveExcitation.hh 69570 2013-05-08 13:23:39Z gcosmo $
|
||||
// $Id: G4QGSDiffractiveExcitation.hh 93511 2015-10-23 13:43:49Z gcosmo $
|
||||
|
||||
#ifndef G4QGSDiffractiveExcitation_h
|
||||
#define G4QGSDiffractiveExcitation_h 1
|
||||
|
||||
@@ -103,7 +103,7 @@ G4ExcitedStringVector * G4QGSModel<ParticipantType>::GetStrings()
|
||||
G4PartonPair* aPair;
|
||||
G4ExcitedStringVector* theStrings = new G4ExcitedStringVector;
|
||||
G4ExcitedString * aString;
|
||||
while( (aPair = theParticipants.GetNextPartonPair()) )
|
||||
while( (aPair = theParticipants.GetNextPartonPair()) ) /* Loop checking, 26.10.2015, A.Ribon */
|
||||
{
|
||||
if (aPair->GetCollisionType() == G4PartonPair::DIFFRACTIVE)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user