Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.2 1999/05/07 14:07:08 stesting Exp $
|
||||
# $Id: GNUmakefile,v 1.3 2003/06/18 13:35:26 gcosmo Exp $
|
||||
# -----------------------------------------------------------
|
||||
# GNUmakefile for hadronic library. Gabriele Cosmo, 18/9/96.
|
||||
# -----------------------------------------------------------
|
||||
@@ -11,8 +11,6 @@ endif
|
||||
|
||||
include $(G4INSTALL)/config/architecture.gmk
|
||||
|
||||
G4TMPDIR = $(G4TMP)/$(G4SYSTEM)/$(name)
|
||||
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include \
|
||||
-I$(G4BASE)/global/HEPRandom/include \
|
||||
-I$(G4BASE)/global/HEPNumerics/include \
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4ExcitedStringDecay.hh,v 1.10 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
#ifndef G4ExcitedStringDecay_h
|
||||
#define G4ExcitedStringDecay_h 1
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FragmentingString.hh,v 1.1 2001/10/09 10:38:32 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#ifndef G4FragmentingString_h
|
||||
|
||||
+7
-7
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4HadronBuilder.hh,v 1.2 2001/10/30 08:33:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4HadronBuilder.hh,v 1.3 2003/06/16 17:09:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class header file
|
||||
@@ -37,7 +37,7 @@
|
||||
#define G4HadronBuilder_h 1
|
||||
|
||||
#include "globals.hh"
|
||||
#include <g4std/vector>
|
||||
#include <vector>
|
||||
#include "G4ParticleDefinition.hh"
|
||||
#include "G4ParticleDefinition.hh"
|
||||
|
||||
@@ -52,8 +52,8 @@ public:
|
||||
|
||||
// ctor
|
||||
G4HadronBuilder(G4double mesonMix, G4double barionMix,
|
||||
G4std::vector<double> scalarMesonMix,
|
||||
G4std::vector<double> vectorMesonMix);
|
||||
std::vector<double> scalarMesonMix,
|
||||
std::vector<double> vectorMesonMix);
|
||||
|
||||
private:
|
||||
|
||||
@@ -67,8 +67,8 @@ private:
|
||||
|
||||
G4double mesonSpinMix;
|
||||
G4double barionSpinMix;
|
||||
G4std::vector<double> scalarMesonMixings;
|
||||
G4std::vector<double> vectorMesonMixings;
|
||||
std::vector<double> scalarMesonMixings;
|
||||
std::vector<double> vectorMesonMixings;
|
||||
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4LundStringFragmentation.hh,v 1.6 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $ Maxim Komogorov
|
||||
// GEANT4 tag $Name: geant4-05-02 $ Maxim Komogorov
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4QGSMFragmentation.hh,v 1.6 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VKinkyStringDecay.hh,v 1.6 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
// Maxim Komogorov
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
+7
-7
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VLongitudinalStringDecay.hh,v 1.13 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VLongitudinalStringDecay.hh,v 1.14 2003/06/16 17:09:28 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
// Maxim Komogorov
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
@@ -64,8 +64,8 @@ public:
|
||||
void SetVectorMesonProbability(G4double aValue);
|
||||
void SetSpinThreeHalfBarionProbability(G4double aValue);
|
||||
|
||||
void SetScalarMesonMixings( G4std::vector<G4double> aVector);
|
||||
void SetVectorMesonMixings( G4std::vector<G4double> aVector);
|
||||
void SetScalarMesonMixings( std::vector<G4double> aVector);
|
||||
void SetVectorMesonMixings( std::vector<G4double> aVector);
|
||||
|
||||
// used by G4VKinkyStringDecy..
|
||||
G4int SampleQuarkFlavor(void);
|
||||
@@ -102,8 +102,8 @@ private:
|
||||
|
||||
G4double pspin_meson;
|
||||
G4double pspin_barion;
|
||||
G4std::vector<G4double> vectorMesonMix;
|
||||
G4std::vector<G4double> scalarMesonMix;
|
||||
std::vector<G4double> vectorMesonMix;
|
||||
std::vector<G4double> scalarMesonMix;
|
||||
|
||||
G4bool PastInitPhase;
|
||||
|
||||
@@ -114,7 +114,7 @@ private:
|
||||
// G4double MinFragmentationMass(G4ExcitedString * theString,
|
||||
// G4ParticleDefinition*& Hadron1,
|
||||
// G4ParticleDefinition*& Hadron2);
|
||||
typedef G4std::pair<G4ParticleDefinition*, G4ParticleDefinition*> pDefPair;
|
||||
typedef std::pair<G4ParticleDefinition*, G4ParticleDefinition*> pDefPair;
|
||||
typedef G4ParticleDefinition * (G4HadronBuilder::*Pcreate)
|
||||
(G4ParticleDefinition*, G4ParticleDefinition*);
|
||||
G4double FragmentationMass(
|
||||
|
||||
+4
-4
@@ -32,7 +32,7 @@ G4ExcitedStringDecay::G4ExcitedStringDecay(G4VLongitudinalStringDecay * aStringD
|
||||
: theStringDecay(aStringDecay)
|
||||
{}
|
||||
|
||||
G4ExcitedStringDecay::G4ExcitedStringDecay(const G4ExcitedStringDecay &right)
|
||||
G4ExcitedStringDecay::G4ExcitedStringDecay(const G4ExcitedStringDecay &) : G4VStringFragmentation()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -40,18 +40,18 @@ G4ExcitedStringDecay::~G4ExcitedStringDecay()
|
||||
{
|
||||
}
|
||||
|
||||
const G4ExcitedStringDecay & G4ExcitedStringDecay::operator=(const G4ExcitedStringDecay &right)
|
||||
const G4ExcitedStringDecay & G4ExcitedStringDecay::operator=(const G4ExcitedStringDecay &)
|
||||
{
|
||||
G4Exception("G4ExcitedStringDecay::operator= meant to not be accessable");
|
||||
return *this;
|
||||
}
|
||||
|
||||
int G4ExcitedStringDecay::operator==(const G4ExcitedStringDecay &right) const
|
||||
int G4ExcitedStringDecay::operator==(const G4ExcitedStringDecay &) const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int G4ExcitedStringDecay::operator!=(const G4ExcitedStringDecay &right) const
|
||||
int G4ExcitedStringDecay::operator!=(const G4ExcitedStringDecay &) const
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
+9
-9
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4HadronBuilder.cc,v 1.3 2001/10/30 08:33:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4HadronBuilder.cc,v 1.4 2003/06/16 17:09:29 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -37,8 +37,8 @@
|
||||
#include "G4ParticleTable.hh"
|
||||
|
||||
G4HadronBuilder::G4HadronBuilder(G4double mesonMix, G4double barionMix,
|
||||
G4std::vector<double> scalarMesonMix,
|
||||
G4std::vector<double> vectorMesonMix)
|
||||
std::vector<double> scalarMesonMix,
|
||||
std::vector<double> vectorMesonMix)
|
||||
{
|
||||
mesonSpinMix=mesonMix;
|
||||
barionSpinMix=barionMix;
|
||||
@@ -111,7 +111,7 @@ G4ParticleDefinition * G4HadronBuilder::Meson(G4ParticleDefinition * black,
|
||||
|
||||
G4int id1= black->GetPDGEncoding();
|
||||
G4int id2= white->GetPDGEncoding();
|
||||
// G4int ifl1= G4std::max(abs(id1), abs(id2));
|
||||
// G4int ifl1= std::max(abs(id1), abs(id2));
|
||||
if ( abs(id1) < abs(id2) )
|
||||
{
|
||||
G4int xchg = id1;
|
||||
@@ -213,10 +213,10 @@ G4ParticleDefinition * G4HadronBuilder::Barion(G4ParticleDefinition * black,
|
||||
G4int kflb = abs(ifl2);
|
||||
G4int kflc = abs(ifl3);
|
||||
|
||||
G4int kfld = G4std::max(kfla,kflb);
|
||||
kfld = G4std::max(kfld,kflc);
|
||||
G4int kflf = G4std::min(kfla,kflb);
|
||||
kflf = G4std::min(kflf,kflc);
|
||||
G4int kfld = std::max(kfla,kflb);
|
||||
kfld = std::max(kfld,kflc);
|
||||
G4int kflf = std::min(kfla,kflb);
|
||||
kflf = std::min(kflf,kflc);
|
||||
|
||||
G4int kfle = kfla + kflb + kflc - kfld - kflf;
|
||||
|
||||
|
||||
+5
-5
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4LundStringFragmentation.cc,v 1.5 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4LundStringFragmentation.cc,v 1.6 2003/05/30 14:36:44 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -44,7 +44,7 @@ G4LundStringFragmentation::G4LundStringFragmentation()
|
||||
// {
|
||||
// }
|
||||
|
||||
G4LundStringFragmentation::G4LundStringFragmentation(const G4LundStringFragmentation &right)
|
||||
G4LundStringFragmentation::G4LundStringFragmentation(const G4LundStringFragmentation &) : G4VLongitudinalStringDecay()
|
||||
{
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ G4LundStringFragmentation::~G4LundStringFragmentation()
|
||||
|
||||
//****************************************************************************************
|
||||
|
||||
const G4LundStringFragmentation & G4LundStringFragmentation::operator=(const G4LundStringFragmentation &right)
|
||||
const G4LundStringFragmentation & G4LundStringFragmentation::operator=(const G4LundStringFragmentation &)
|
||||
{
|
||||
G4Exception("G4LundStringFragmentation::operator= meant to not be accessable");
|
||||
return *this;
|
||||
@@ -73,7 +73,7 @@ int G4LundStringFragmentation::operator!=(const G4LundStringFragmentation &right
|
||||
|
||||
//****************************************************************************************
|
||||
|
||||
G4double G4LundStringFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int PartonEncoding, G4ParticleDefinition* pHadron, G4double Px, G4double Py)
|
||||
G4double G4LundStringFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int , G4ParticleDefinition* pHadron, G4double Px, G4double Py)
|
||||
{
|
||||
const G4double alund = 0.7/GeV/GeV;
|
||||
|
||||
|
||||
+5
-5
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4QGSMFragmentation.cc,v 1.8 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4QGSMFragmentation.cc,v 1.9 2003/05/30 14:36:44 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -41,7 +41,7 @@ arho(0.5), aphi(0.), an(-0.5), ala(-0.75), aksi(-1.), alft(0.5)
|
||||
{
|
||||
}
|
||||
|
||||
G4QGSMFragmentation::G4QGSMFragmentation(const G4QGSMFragmentation &right) :
|
||||
G4QGSMFragmentation::G4QGSMFragmentation(const G4QGSMFragmentation &) : G4VLongitudinalStringDecay(),
|
||||
arho(0.5), aphi(0.), an(-0.5), ala(-0.75), aksi(-1.), alft(0.5)
|
||||
{
|
||||
}
|
||||
@@ -52,7 +52,7 @@ G4QGSMFragmentation::~G4QGSMFragmentation()
|
||||
|
||||
//****************************************************************************************
|
||||
|
||||
const G4QGSMFragmentation & G4QGSMFragmentation::operator=(const G4QGSMFragmentation &right)
|
||||
const G4QGSMFragmentation & G4QGSMFragmentation::operator=(const G4QGSMFragmentation &)
|
||||
{
|
||||
G4Exception("G4QGSMFragmentation::operator= meant to not be accessable");
|
||||
return *this;
|
||||
@@ -70,7 +70,7 @@ int G4QGSMFragmentation::operator!=(const G4QGSMFragmentation &right) const
|
||||
|
||||
//****************************************************************************************
|
||||
|
||||
G4double G4QGSMFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int PartonEncoding, G4ParticleDefinition* pHadron, G4double Px, G4double Py)
|
||||
G4double G4QGSMFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int PartonEncoding, G4ParticleDefinition* , G4double , G4double )
|
||||
{
|
||||
G4double z;
|
||||
G4double theA(0), d1, d2, yf;
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VKinkyStringDecay.cc,v 1.8 2002/12/12 19:17:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
// Maxim Komogorov
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
+14
-14
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VLongitudinalStringDecay.cc,v 1.24 2002/06/18 06:44:25 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4VLongitudinalStringDecay.cc,v 1.26 2003/06/16 17:09:30 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -110,13 +110,13 @@ G4VLongitudinalStringDecay::~G4VLongitudinalStringDecay()
|
||||
|
||||
// Operators
|
||||
|
||||
//const & G4VLongitudinalStringDecay::operator=(const G4VLongitudinalStringDecay &right)
|
||||
//const & G4VLongitudinalStringDecay::operator=(const G4VLongitudinalStringDecay &)
|
||||
// {
|
||||
// }
|
||||
|
||||
//----------------------------------------------------------------------------------------------------------
|
||||
|
||||
int G4VLongitudinalStringDecay::operator==(const G4VLongitudinalStringDecay &right) const
|
||||
int G4VLongitudinalStringDecay::operator==(const G4VLongitudinalStringDecay &) const
|
||||
{
|
||||
G4Exception("G4VLongitudinalStringDecay::operator== forbidden");
|
||||
return false;
|
||||
@@ -124,7 +124,7 @@ int G4VLongitudinalStringDecay::operator==(const G4VLongitudinalStringDecay &rig
|
||||
|
||||
//----------------------------------------------------------------------------------------------------------
|
||||
|
||||
int G4VLongitudinalStringDecay::operator!=(const G4VLongitudinalStringDecay &right) const
|
||||
int G4VLongitudinalStringDecay::operator!=(const G4VLongitudinalStringDecay &) const
|
||||
{
|
||||
G4Exception("G4VLongitudinalStringDecay::operator!= forbidden");
|
||||
return true;
|
||||
@@ -150,7 +150,7 @@ G4VLongitudinalStringDecay::pDefPair G4VLongitudinalStringDecay::CreatePartonPai
|
||||
G4int q2 = SampleQuarkFlavor();
|
||||
G4int spin = (q1 != q2 && G4UniformRand() <= 0.5)? 1 : 3;
|
||||
// convention: quark with higher PDG number is first
|
||||
G4int PDGcode = (G4std::max(q1,q2) * 1000 + G4std::min(q1,q2) * 100 + spin) * NeedParticle;
|
||||
G4int PDGcode = (std::max(q1,q2) * 1000 + std::min(q1,q2) * 100 + spin) * NeedParticle;
|
||||
return pDefPair (FindParticle(-PDGcode),FindParticle(PDGcode));
|
||||
|
||||
|
||||
@@ -258,8 +258,8 @@ G4ParticleDefinition *G4VLongitudinalStringDecay::DiQuarkSplitup(
|
||||
pDefPair QuarkPair = CreatePartonPair(IsParticle,false); // no diquarks wanted
|
||||
//... Build new Diquark
|
||||
G4int QuarkEncoding=QuarkPair.second->GetPDGEncoding();
|
||||
G4int i10 = G4std::max(abs(QuarkEncoding), abs(stableQuarkEncoding));
|
||||
G4int i20 = G4std::min(abs(QuarkEncoding), abs(stableQuarkEncoding));
|
||||
G4int i10 = std::max(abs(QuarkEncoding), abs(stableQuarkEncoding));
|
||||
G4int i20 = std::min(abs(QuarkEncoding), abs(stableQuarkEncoding));
|
||||
G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1 : 3;
|
||||
G4int NewDecayEncoding = -1*IsParticle*(i10 * 1000 + i20 * 100 + spin);
|
||||
created = FindParticle(NewDecayEncoding);
|
||||
@@ -447,9 +447,9 @@ G4KineticTrackVector* G4VLongitudinalStringDecay::FragmentString(const G4Excited
|
||||
{
|
||||
G4FragmentingString *currentString=new G4FragmentingString(*theStringInCMS);
|
||||
|
||||
G4std::for_each(LeftVector->begin(), LeftVector->end(), DeleteKineticTrack());
|
||||
std::for_each(LeftVector->begin(), LeftVector->end(), DeleteKineticTrack());
|
||||
LeftVector->clear();
|
||||
G4std::for_each(RightVector->begin(), RightVector->end(), DeleteKineticTrack());
|
||||
std::for_each(RightVector->begin(), RightVector->end(), DeleteKineticTrack());
|
||||
RightVector->clear();
|
||||
|
||||
inner_sucess=true; // set false on failure..
|
||||
@@ -486,9 +486,9 @@ G4KineticTrackVector* G4VLongitudinalStringDecay::FragmentString(const G4Excited
|
||||
|
||||
if ( ! success )
|
||||
{
|
||||
G4std::for_each(LeftVector->begin(), LeftVector->end(), DeleteKineticTrack());
|
||||
std::for_each(LeftVector->begin(), LeftVector->end(), DeleteKineticTrack());
|
||||
LeftVector->clear();
|
||||
G4std::for_each(RightVector->begin(), RightVector->end(), DeleteKineticTrack());
|
||||
std::for_each(RightVector->begin(), RightVector->end(), DeleteKineticTrack());
|
||||
delete RightVector;
|
||||
return LeftVector;
|
||||
}
|
||||
@@ -740,7 +740,7 @@ void G4VLongitudinalStringDecay::SetSpinThreeHalfBarionProbability(G4double aVal
|
||||
|
||||
//----------------------------------------------------------------------------------------------------------
|
||||
|
||||
void G4VLongitudinalStringDecay::SetScalarMesonMixings(G4std::vector<G4double> aVector)
|
||||
void G4VLongitudinalStringDecay::SetScalarMesonMixings(std::vector<G4double> aVector)
|
||||
{
|
||||
if ( PastInitPhase ) {
|
||||
G4Exception("4VLongitudinalStringDecay::SetScalarMesonMixings after FragmentString() not allowed");
|
||||
@@ -761,7 +761,7 @@ void G4VLongitudinalStringDecay::SetScalarMesonMixings(G4std::vector<G4double> a
|
||||
|
||||
//----------------------------------------------------------------------------------------------------------
|
||||
|
||||
void G4VLongitudinalStringDecay::SetVectorMesonMixings(G4std::vector<G4double> aVector)
|
||||
void G4VLongitudinalStringDecay::SetVectorMesonMixings(std::vector<G4double> aVector)
|
||||
{
|
||||
if ( PastInitPhase ) {
|
||||
G4Exception("4VLongitudinalStringDecay::SetVectorMesonMixings after FragmentString() not allowed");
|
||||
|
||||
Reference in New Issue
Block a user