Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.1 1999/01/07 16:12:00 gunter Exp $
|
||||
# $Id: GNUmakefile,v 1.2 2003/06/18 13:25:16 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: G4DiffractiveSplitableHadron.hh,v 1.6 2002/12/12 19:17:25 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#ifndef G4DiffractiveSplitableHadron_h
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4FTFModel.hh,v 1.7 2002/12/12 19:17:25 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// Class Description
|
||||
// Final state production code for hadron inelastic scattering above 20 GeV
|
||||
|
||||
+4
-4
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FTFParticipants.hh,v 1.8 2002/12/12 19:17:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4FTFParticipants.hh,v 1.9 2003/06/16 17:06:54 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#ifndef G4FTFParticipants_h
|
||||
@@ -37,7 +37,7 @@
|
||||
// ------------------------------------------------------------
|
||||
|
||||
#include "G4VParticipants.hh"
|
||||
#include "g4std/vector"
|
||||
#include <vector>
|
||||
#include "G4Nucleon.hh"
|
||||
#include "G4V3DNucleus.hh"
|
||||
#include "G4Fancy3DNucleus.hh"
|
||||
@@ -64,7 +64,7 @@ class G4FTFParticipants : public G4VParticipants
|
||||
|
||||
private:
|
||||
|
||||
G4std::vector<G4InteractionContent *> theInteractions;
|
||||
std::vector<G4InteractionContent *> theInteractions;
|
||||
|
||||
G4int currentInteraction;
|
||||
|
||||
|
||||
+7
-7
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4DiffractiveSplitableHadron.cc,v 1.8 2002/12/12 19:17:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4DiffractiveSplitableHadron.cc,v 1.10 2003/06/16 17:06:55 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
// ------------------------------------------------------------
|
||||
@@ -67,7 +67,7 @@ G4DiffractiveSplitableHadron::G4DiffractiveSplitableHadron(const G4VKineticNucle
|
||||
G4DiffractiveSplitableHadron::~G4DiffractiveSplitableHadron()
|
||||
{}
|
||||
|
||||
const G4DiffractiveSplitableHadron & G4DiffractiveSplitableHadron::operator=(const G4DiffractiveSplitableHadron &right)
|
||||
const G4DiffractiveSplitableHadron & G4DiffractiveSplitableHadron::operator=(const G4DiffractiveSplitableHadron &)
|
||||
{
|
||||
G4Exception("G4DiffractiveSplitableHadron::operator= meant to not be accessable");
|
||||
return *this;
|
||||
@@ -122,8 +122,8 @@ void G4DiffractiveSplitableHadron::ChooseStringEnds(G4int PDGcode,G4int * aEnd,
|
||||
G4int heavy= absPDGcode/ 100;
|
||||
G4int light= (absPDGcode %100)/10;
|
||||
|
||||
// G4int anti= pow(-1 , G4std::max( heavy, light));
|
||||
G4int anti= 1 -2 * ( G4std::max( heavy, light ) % 2 );
|
||||
// G4int anti= pow(-1 , std::max( heavy, light));
|
||||
G4int anti= 1 -2 * ( std::max( heavy, light ) % 2 );
|
||||
if (PDGcode < 0 ) anti *=-1;
|
||||
|
||||
heavy *= anti;
|
||||
@@ -196,8 +196,8 @@ G4int G4DiffractiveSplitableHadron::Diquark(G4int aquark,G4int bquark,G4int Spin
|
||||
{
|
||||
G4int diquarkPDG;
|
||||
|
||||
diquarkPDG = G4std::max( abs(aquark), abs(bquark) )*1000 +
|
||||
G4std::min( abs(aquark), abs(bquark) )*100 +
|
||||
diquarkPDG = std::max( abs(aquark), abs(bquark) )*1000 +
|
||||
std::min( abs(aquark), abs(bquark) )*100 +
|
||||
2*Spin + 1;
|
||||
return ( aquark > 0 && bquark > 0 ) ? diquarkPDG : -1*diquarkPDG;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FTFModel.cc,v 1.10 2002/12/12 19:17:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4FTFModel.cc,v 1.12 2003/06/16 17:06:56 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
// ------------------------------------------------------------
|
||||
@@ -62,7 +62,7 @@ G4FTFModel::~G4FTFModel()
|
||||
{}
|
||||
|
||||
|
||||
const G4FTFModel & G4FTFModel::operator=(const G4FTFModel &right)
|
||||
const G4FTFModel & G4FTFModel::operator=(const G4FTFModel &)
|
||||
{
|
||||
G4Exception("G4FTFModel::operator= is not meant to be accessed ");
|
||||
return *this;
|
||||
@@ -108,18 +108,18 @@ G4ExcitedStringVector * G4FTFModel::BuildStrings()
|
||||
G4ExcitedStringVector * strings;
|
||||
strings = new G4ExcitedStringVector();
|
||||
|
||||
G4std::vector<G4VSplitableHadron *> primaries;
|
||||
G4std::vector<G4VSplitableHadron *> targets;
|
||||
std::vector<G4VSplitableHadron *> primaries;
|
||||
std::vector<G4VSplitableHadron *> targets;
|
||||
|
||||
theParticipants.StartLoop(); // restart a loop
|
||||
while ( theParticipants.Next() )
|
||||
{
|
||||
const G4InteractionContent & interaction=theParticipants.GetInteraction();
|
||||
// do not allow for duplicates ...
|
||||
if ( primaries.end() == G4std::find(primaries.begin(), primaries.end(), interaction.GetProjectile()) )
|
||||
if ( primaries.end() == std::find(primaries.begin(), primaries.end(), interaction.GetProjectile()) )
|
||||
primaries.push_back(interaction.GetProjectile());
|
||||
|
||||
if ( targets.end() == G4std::find(targets.begin(), targets.end(),interaction.GetTarget()) )
|
||||
if ( targets.end() == std::find(targets.begin(), targets.end(),interaction.GetTarget()) )
|
||||
targets.push_back(interaction.GetTarget());
|
||||
}
|
||||
|
||||
@@ -140,9 +140,9 @@ G4ExcitedStringVector * G4FTFModel::BuildStrings()
|
||||
strings->push_back(theExcitation->String(targets[ahadron], isProjectile));
|
||||
}
|
||||
|
||||
G4std::for_each(primaries.begin(), primaries.end(), DeleteVSplitableHadron());
|
||||
std::for_each(primaries.begin(), primaries.end(), DeleteVSplitableHadron());
|
||||
primaries.clear();
|
||||
G4std::for_each(targets.begin(), targets.end(), DeleteVSplitableHadron());
|
||||
std::for_each(targets.begin(), targets.end(), DeleteVSplitableHadron());
|
||||
targets.clear();
|
||||
|
||||
return strings;
|
||||
|
||||
+3
-3
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FTFParticipants.cc,v 1.7 2002/12/12 19:17:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4FTFParticipants.cc,v 1.8 2003/05/30 13:27:19 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -48,7 +48,7 @@ G4FTFParticipants::G4FTFParticipants()
|
||||
{
|
||||
}
|
||||
|
||||
G4FTFParticipants::G4FTFParticipants(const G4FTFParticipants &right)
|
||||
G4FTFParticipants::G4FTFParticipants(const G4FTFParticipants &): G4VParticipants()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user