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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ExcitationHandler.hh,v 1.3.4.1 1999/12/07 20:51:33 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// Hadronic Process: Nuclear De-excitations
// by V. Lara (May 1998)
source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4FissionBarrier.hh,v 1.1.10.1 1999/12/07 20:51:33 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// Hadronic Process: Nuclear De-excitations
// by V. Lara (Oct 1998)
source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
+2 -2
View File
@@ -33,7 +33,7 @@
#include "G4PtrLevelVector.hh"
#include "G4NuclearLevel.hh"
#include "G4ios.hh"
#include <fstream.h>
#include "g4std/fstream"
class G4NuclearLevelManager
{
@@ -73,7 +73,7 @@ private:
G4bool operator==(const G4NuclearLevelManager &right) const;
G4bool operator!=(const G4NuclearLevelManager &right) const;
G4bool Read(ifstream& aDataFile);
G4bool Read(G4std::ifstream& aDataFile);
void MakeLevels();
source/processes/hadronic/models/generator/de_excitation/include/G4Solver.templates.cc
+12 -12
View File
@@ -3,13 +3,13 @@ G4bool G4Solver<Function>::Bisection(Function & theFunction)
{
// Check the interval before start
if (a > b || abs(a-b) <= tolerance) {
G4cerr << "G4Solver::Bisection: The interval must be properly set." << endl;
G4cerr << "G4Solver::Bisection: The interval must be properly set." << G4endl;
return false;
}
G4double fa = theFunction(a);
G4double fb = theFunction(b);
if (fa*fb > 0.0) {
G4cerr << "G4Solver::Bisection: The interval must include a root." << endl;
G4cerr << "G4Solver::Bisection: The interval must include a root." << G4endl;
return false;
}
@@ -36,7 +36,7 @@ G4bool G4Solver<Function>::Bisection(Function & theFunction)
fb=fc;
}
}
G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << endl;
G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << G4endl;
return false;
}
@@ -46,13 +46,13 @@ G4bool G4Solver<Function>::RegulaFalsi(Function & theFunction)
{
// Check the interval before start
if (a > b || abs(a-b) <= tolerance) {
G4cerr << "G4Solver::RegulaFalsi: The interval must be properly set." << endl;
G4cerr << "G4Solver::RegulaFalsi: The interval must be properly set." << G4endl;
return false;
}
G4double fa = theFunction(a);
G4double fb = theFunction(b);
if (fa*fb > 0.0) {
G4cerr << "G4Solver::RegulaFalsi: The interval must include a root." << endl;
G4cerr << "G4Solver::RegulaFalsi: The interval must include a root." << G4endl;
return false;
}
@@ -62,7 +62,7 @@ G4bool G4Solver<Function>::RegulaFalsi(Function & theFunction)
// Finding the root
for (G4int i = 0; i < MaxIter; i++) {
G4double c = (a*fb-b*fa)/(fb-fa);
G4double delta = min(abs(c-a),abs(b-c));
G4double delta = G4std::min(abs(c-a),abs(b-c));
if (delta < eps) {
root = c;
return true;
@@ -80,7 +80,7 @@ G4bool G4Solver<Function>::RegulaFalsi(Function & theFunction)
fa=fc;
}
}
G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << endl;
G4cerr << "G4Solver::Bisection: Excedded maximum number of iterations whithout convegence." << G4endl;
return false;
}
@@ -93,13 +93,13 @@ G4bool G4Solver<Function>::Brent(Function & theFunction)
// Check the interval before start
if (a > b || abs(a-b) <= tolerance) {
G4cerr << "G4Solver::Brent: The interval must be properly set." << endl;
G4cerr << "G4Solver::Brent: The interval must be properly set." << G4endl;
return false;
}
G4double fa = theFunction(a);
G4double fb = theFunction(b);
if (fa*fb > 0.0) {
G4cerr << "G4Solver::Brent: The interval must include a root." << endl;
G4cerr << "G4Solver::Brent: The interval must include a root." << G4endl;
return false;
}
@@ -153,7 +153,7 @@ G4bool G4Solver<Function>::Brent(Function & theFunction)
p = abs(p);
G4double min1 = 3.0*xm*q-abs(Tol1*q);
G4double min2 = abs(e*q);
if (2.0*p < min(min1,min2)) {
if (2.0*p < G4std::min(min1,min2)) {
// Interpolation
e = d;
d = p/q;
@@ -177,7 +177,7 @@ G4bool G4Solver<Function>::Brent(Function & theFunction)
}
fb = theFunction(b);
}
G4cerr << "G4Solver::Brent: Number of iterations exceeded." << endl;
G4cerr << "G4Solver::Brent: Number of iterations exceeded." << G4endl;
return false;
}
@@ -185,7 +185,7 @@ template <class Function>
void G4Solver<Function>::SetIntervalLimits(const G4double Limit1, const G4double Limit2)
{
if (abs(Limit1-Limit2) <= tolerance) {
G4cerr << "G4Solver::SetIntervalLimits: Interval must be wider than tolerance." << endl;
G4cerr << "G4Solver::SetIntervalLimits: Interval must be wider than tolerance." << G4endl;
return;
}
if (Limit1 < Limit2) {
source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VFissionBarrier.hh,v 1.1.10.1 1999/12/07 20:51:35 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// Hadronic Process: Nuclear De-excitations
// by V. Lara (Oct 1998)
source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
+2 -2
View File
@@ -239,7 +239,7 @@ G4int G4CompetitiveFission::FissionAtomicNumber(const G4int A, const G4FissionPa
G4double C2 = 0.0;
if (w > 1000.0 ) C2 = C2S;
else if (w < 0.001) C2 = C2A;
else C2 = max(C2A,C2S);
else C2 = G4std::max(C2A,C2S);
G4double C1 = A-C2;
if (C1 < 30.0) {
@@ -338,7 +338,7 @@ G4double G4CompetitiveFission::FissionKineticEnergy(const G4double A, const G4do
{
// Find maximal value of A for fragments
G4double AfMax = max(Af1,Af2);
G4double AfMax = G4std::max(Af1,Af2);
if (AfMax < (A/2.0)) AfMax = A - AfMax;
// Weights for symmetric and asymmetric components
source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
+6 -6
View File
@@ -63,7 +63,7 @@ G4VGammaTransition* G4ContinuumGammaDeexcitation::CreateTransition()
}
if (_verbose > 1)
G4cout << "G4ContinuumGammaDeexcitation::CreateTransition - Created" << endl;
G4cout << "G4ContinuumGammaDeexcitation::CreateTransition - Created" << G4endl;
return new G4ContinuumGammaTransition(_levelManager,Z,A,excitation,_verbose );
}
@@ -80,7 +80,7 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout
<< "G4ContinuumGammaDeexcitation::CanDoTransition - Null transition "
<< endl;
<< G4endl;
}
G4Fragment nucleus = GetNucleus();
@@ -94,7 +94,7 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout
<< "G4ContinuumGammaDeexcitation::CanDoTransition - n/p/H"
<< endl;
<< G4endl;
}
@@ -105,7 +105,7 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout
<< "G4ContinuumGammaDeexcitation::CanDoTransition - Excitation <= 0"
<< endl;
<< G4endl;
}
if (excitation <= _levelManager.MaxLevelEnergy())
@@ -114,13 +114,13 @@ G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition - Excitation "
<< excitation << " below max discrete level "
<< _levelManager.MaxLevelEnergy() << endl;
<< _levelManager.MaxLevelEnergy() << G4endl;
}
if (canDo)
{ if (_verbose > 1)
G4cout <<"G4ContinuumGammaDeexcitation::CanDoTransition - CanDo"
<< endl;
<< G4endl;
}
return canDo;
source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
+5 -5
View File
@@ -101,7 +101,7 @@ void G4ContinuumGammaTransition::SelectGamma()
if(_verbose > 10)
G4cout << "*---* G4ContinuumTransition: e = " << e
<< " pdf = " << sampleArray[i] << endl;
<< " pdf = " << sampleArray[i] << G4endl;
}
G4RandGeneralTmp randGeneral(sampleArray, nBins);
G4double random = randGeneral.shoot();
@@ -113,7 +113,7 @@ void G4ContinuumGammaTransition::SelectGamma()
if(_verbose > 10)
G4cout << "*---*---* G4ContinuumTransition: eGamma = " << _eGamma
<< " finalExcitation = " << finalExcitation
<< " random = " << random << endl;
<< " random = " << random << G4endl;
// if (finalExcitation < 0)
if(finalExcitation < _minLevelE/2.)
@@ -133,7 +133,7 @@ void G4ContinuumGammaTransition::SelectGamma()
if(_verbose > 10)
G4cout << "*---*---* G4ContinuumTransition: _gammaCreationTime = "
<< _gammaCreationTime/second << endl;
<< _gammaCreationTime/second << G4endl;
return;
}
@@ -172,7 +172,7 @@ G4double G4ContinuumGammaTransition::E1Pdf(G4double e)
if(_verbose > 20)
G4cout << _nucleusA << " LevelDensityParameter = " << aLevelDensityParam
<< " Bef Aft " << levelDensBef << " " << levelDensAft << endl;
<< " Bef Aft " << levelDensBef << " " << levelDensAft << G4endl;
// Now form the probability density
@@ -197,7 +197,7 @@ G4double G4ContinuumGammaTransition::E1Pdf(G4double e)
G4cout << ".. " << Egdp << " .. " << GammaR
<< " .. " << normC << " .. " << sigmaAbs
<< " .. " << e*e << " .. " << levelDensAft/levelDensBef
<< endl;
<< G4endl;
// theProb = normC * sigmaAbs * e*e * levelDensAft/levelDensBef;
theProb = sigmaAbs * e*e * levelDensAft/levelDensBef;
source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
+8 -8
View File
@@ -47,7 +47,7 @@ G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
if (_verbose > 1)
G4cout
<< "G4DiscreteGammaDeexcitation::CreateTransition - (A,Z) is valid "
<< endl;
<< G4endl;
if (_nucleusA != A || _nucleusZ != Z)
{
@@ -66,7 +66,7 @@ G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
G4cout
<< "G4DiscreteGammaDeexcitation::CreateTransition - Created from level energy "
<< level->Energy() << ", excitation is "
<< excitation << endl;
<< excitation << G4endl;
return new G4DiscreteGammaTransition(*level);
}
else
@@ -74,7 +74,7 @@ G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
if (_verbose > 0)
G4cout
<< "G4DiscreteGammaDeexcitation::CreateTransition - No transition created from "
<< excitation << " within tolerance " << _tolerance << endl;
<< excitation << " within tolerance " << _tolerance << G4endl;
return 0;
}
@@ -95,7 +95,7 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout
<< "G4DiscreteGammaDeexcitation::CanDoTransition - Null transition "
<< endl;
<< G4endl;
}
G4Fragment nucleus = GetNucleus();
@@ -109,7 +109,7 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout
<< "G4DiscreteGammaDeexcitation::CanDoTransition - n/p/H/>U"
<< endl;
<< G4endl;
}
G4double excitation = nucleus.GetExcitationEnergy();
@@ -119,7 +119,7 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
if (_verbose > 0)
G4cout
<< "G4DiscreteGammaDeexcitation::CanDoTransition - Excitation <= 0"
<< endl;
<< G4endl;
}
if (excitation > _levelManager.MaxLevelEnergy() + _tolerance) canDo = false;
@@ -133,12 +133,12 @@ G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
G4cout << "G4DiscreteGammaDeexcitation::CanDoTransition - Excitation "
<< excitation << ", Min-Max are "
<< _levelManager.MinLevelEnergy() << " "
<< _levelManager.MaxLevelEnergy() << endl;
<< _levelManager.MaxLevelEnergy() << G4endl;
}
if (canDo)
{ if (_verbose > 0)
G4cout <<"G4DiscreteGammaDeexcitation::CanDoTransition - CanDo" << endl; }
G4cout <<"G4DiscreteGammaDeexcitation::CanDoTransition - CanDo" << G4endl; }
// else
// {
// delete _transition;
source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
+1 -1
View File
@@ -98,7 +98,7 @@ void G4DiscreteGammaTransition::SelectGamma()
// if(_verbose > 10)
// G4cout << "*---*---* G4DiscreteTransition: _gammaCreationTime = "
// << _gammaCreationTime/second << endl;
// << _gammaCreationTime/second << G4endl;
return;
}
source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
+12 -12
View File
@@ -85,16 +85,16 @@ G4double G4E1Probability::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, gammaE = "<<Uexcite<<" "<<gammaE<<endl;
//cout<<" Uexcite, gammaE = "<<Uexcite*MeV<<" "<<gammaE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, gammaE = "<<Uexcite<<" "<<gammaE<<G4endl;
//cout<<" Uexcite, gammaE = "<<Uexcite*MeV<<" "<<gammaE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * gammaE*gammaE * GammaR*GammaR;
G4double denominator = (gammaE*gammaE - Egdp*Egdp)*
@@ -106,8 +106,8 @@ G4double G4E1Probability::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
+12 -12
View File
@@ -84,16 +84,16 @@ G4double G4E1Probability001::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability001::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
+12 -12
View File
@@ -84,16 +84,16 @@ G4double G4E1Probability01::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability01::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
+12 -12
View File
@@ -84,16 +84,16 @@ G4double G4E1Probability10::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability10::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
+12 -12
View File
@@ -84,16 +84,16 @@ G4double G4E1Probability100::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -105,8 +105,8 @@ G4double G4E1Probability100::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
+12 -12
View File
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability001::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability001::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
+12 -12
View File
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability01::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability01::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
+12 -12
View File
@@ -87,16 +87,16 @@ G4double G4E1SingleProbability1::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -108,8 +108,8 @@ G4double G4E1SingleProbability1::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
+12 -12
View File
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability10::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability10::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
+12 -12
View File
@@ -88,16 +88,16 @@ G4double G4E1SingleProbability100::EmissionProbDensity(const G4Fragment& frag,
G4double normC = 1.0 / ((pi * hbarc)*(pi * hbarc));
// CD
//cout<<" PROB TESTS "<<endl;
//cout<<" hbarc = "<<hbarc<<endl;
//cout<<" pi = "<<pi<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<endl;
//cout<<" lev density param = "<<aLevelDensityParam<<endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<endl;
//cout<<" sigma0 = "<<sigma0<<endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<endl;
//cout<<" normC = "<<normC<<endl;
//cout<<" PROB TESTS "<<G4endl;
//cout<<" hbarc = "<<hbarc<<G4endl;
//cout<<" pi = "<<pi<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite<<" "<<exciteE<<G4endl;
//cout<<" Uexcite, exciteE = "<<Uexcite*MeV<<" "<<exciteE*MeV<<G4endl;
//cout<<" lev density param = "<<aLevelDensityParam<<G4endl;
//cout<<" level densities = "<<levelDensBef<<" "<<levelDensAft<<G4endl;
//cout<<" sigma0 = "<<sigma0<<G4endl;
//cout<<" Egdp, GammaR = "<<Egdp<<" "<<GammaR<<G4endl;
//cout<<" normC = "<<normC<<G4endl;
G4double numerator = sigma0 * exciteE*exciteE * GammaR*GammaR;
G4double denominator = (exciteE*exciteE - Egdp*Egdp)*
@@ -109,8 +109,8 @@ G4double G4E1SingleProbability100::EmissionProbDensity(const G4Fragment& frag,
levelDensAft/levelDensBef;
// CD
//cout<<" sigmaAbs = "<<sigmaAbs<<endl;
//cout<<" Probability = "<<theProb<<endl;
//cout<<" sigmaAbs = "<<sigmaAbs<<G4endl;
//cout<<" Probability = "<<theProb<<G4endl;
return theProb;
source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
+5 -5
View File
@@ -454,11 +454,11 @@ G4FragmentVector * G4Evaporation::BreakItUp(const G4Fragment &theNucleus)
for (i=0; i < TotNumberOfChannels; i++)
TotalProbability += theChannels[i]->GetEmissionProbability();
// G4cout << "---------------- " << theResidualNucleus.GetExcitationEnergy()/MeV << "-----------------------" << endl;
// G4cout << "Prob of neutron: " << theChannels[0]->GetEmissionProbability()/TotalProbability << endl;
// G4cout << "Prob of proton : " << theChannels[1]->GetEmissionProbability()/TotalProbability<< endl;
// G4cout << "Prob of alpha : " << theChannels[5]->GetEmissionProbability()/TotalProbability<< endl;
// G4cout << "Prob of fission: " << theChannels[NumberOfFissionChannel]->GetEmissionProbability()/TotalProbability<< endl;
// G4cout << "---------------- " << theResidualNucleus.GetExcitationEnergy()/MeV << "-----------------------" << G4endl;
// G4cout << "Prob of neutron: " << theChannels[0]->GetEmissionProbability()/TotalProbability << G4endl;
// G4cout << "Prob of proton : " << theChannels[1]->GetEmissionProbability()/TotalProbability<< G4endl;
// G4cout << "Prob of alpha : " << theChannels[5]->GetEmissionProbability()/TotalProbability<< G4endl;
// G4cout << "Prob of fission: " << theChannels[NumberOfFissionChannel]->GetEmissionProbability()/TotalProbability<< G4endl;
if (TotalProbability <= 0.0) {
source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ExcitationHandler.cc,v 1.3.8.1 1999/12/07 20:51:37 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// Hadronic Process: Nuclear De-excitations
// by V. Lara (May 1998)
source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4FissionBarrier.cc,v 1.1.10.1 1999/12/07 20:51:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// Hadronic Process: Nuclear De-excitations
// by V. Lara (Oct 1998)
source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
+2 -2
View File
@@ -55,8 +55,8 @@ G4FissionParameters::G4FissionParameters(const G4int A, const G4int Z, const G4d
}
if (w == 0.0) {
w1 = max(1.03*wa - FasymAsym, 0.0001);
w2 = max(1.0 - FsymA1A2*wa, 0.0001);
w1 = G4std::max(1.03*wa - FasymAsym, 0.0001);
w2 = G4std::max(1.0 - FsymA1A2*wa, 0.0001);
w = w1/w2;
source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
+6 -6
View File
@@ -128,19 +128,19 @@ void G4NuclearLevel::PrintAll() const
{
G4cout << "---- Level energy = " << _energy << ", angular momentum = "
<< _angularMomentum << ", half life " << _halfLife
<< ", " << _nGammas << " photons" << endl;
<< ", " << _nGammas << " photons" << G4endl;
G4int i;
G4cout << " Gammas: ";
for (i=0; i<_nGammas; i++) { G4cout << _energies.at(i) << " "; }
G4cout << endl << " Weights: ";
G4cout << G4endl << " Weights: ";
for (i=0; i<_nGammas; i++) { G4cout << _weights.at(i) << " "; }
G4cout << endl << " Relative transition probabilities ";
G4cout << G4endl << " Relative transition probabilities ";
for (i=0; i<_nGammas; i++) { G4cout << _prob.at(i) << " "; }
G4cout << endl << " Cumulative probabilities: ";
G4cout << G4endl << " Cumulative probabilities: ";
for (i=0; i<_nGammas; i++) { G4cout << _cumProb.at(i) << " "; }
G4cout << endl << " Polarities: ";
G4cout << G4endl << " Polarities: ";
for (i=0; i<_nGammas; i++) { G4cout << _polarities.at(i) << " "; }
G4cout << endl;
G4cout << G4endl;
return;
}
source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
+14 -18
View File
@@ -32,12 +32,8 @@
#include "G4NuclearLevel.hh"
#include "G4ios.hh"
#include <stdlib.h>
#include <fstream.h>
#ifdef WIN32
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#include "g4std/fstream"
#include "g4std/strstream"
G4NuclearLevelManager::G4NuclearLevelManager():
_nucleusA(0), _nucleusZ(0), _levels(0), _levelEnergy(0), _gammaEnergy(0), _probability(0)
@@ -87,11 +83,11 @@ G4bool G4NuclearLevelManager::IsValid(G4int Z, G4int A) const
G4Exception("G4NuclearLevelManager - Please set the G4LEVELGAMMADATA environment variable");
G4String dirName(env);
char name[100] = {""};
ostrstream ost(name, 100, ios::out);
G4std::ostrstream ost(name, 100, G4std::ios::out);
ost << dirName << "/" << "z" << Z << ".a" << A;
G4String file(name);
ifstream inFile(file);
G4std::ifstream inFile(file);
if (! inFile) valid = false;
return valid;
@@ -174,7 +170,7 @@ const G4NuclearLevel* G4NuclearLevelManager::LowestLevel() const
}
G4bool G4NuclearLevelManager::Read(ifstream& dataFile)
G4bool G4NuclearLevelManager::Read(G4std::ifstream& dataFile)
{
const G4double minProbability = 0.001;
@@ -193,7 +189,7 @@ G4bool G4NuclearLevelManager::Read(ifstream& dataFile)
// zero
if (_probability < minProbability) _probability = minProbability;
// G4cout << "Read " << _levelEnergy << " " << _gammaEnergy << " " << _probability << endl;
// G4cout << "Read " << _levelEnergy << " " << _gammaEnergy << " " << _probability << G4endl;
}
else
{
@@ -211,16 +207,16 @@ void G4NuclearLevelManager::MakeLevels()
G4Exception("G4NuclearLevelManager: please set the G4LEVELGAMMADATA environment variable");
G4String dirName(env);
char name[100] = {""};
ostrstream ost(name, 100, ios::out);
G4std::ostrstream ost(name, 100, G4std::ios::out);
ost << dirName << "/" << "z" << _nucleusZ << ".a" << _nucleusA;
G4String file(name);
ifstream inFile(file, ios::in);
G4std::ifstream inFile(file, G4std::ios::in);
if (! inFile)
{
// G4cout << " G4NuclearLevelManager: (" << _nucleusZ << "," << _nucleusA
// << ") does not have LevelsAndGammas file" << endl;
// << ") does not have LevelsAndGammas file" << G4endl;
return;
}
@@ -254,7 +250,7 @@ void G4NuclearLevelManager::MakeLevels()
G4int nData = eLevel.entries();
// G4cout << " ==== MakeLevels ===== " << nData << " data read " << endl;
// G4cout << " ==== MakeLevels ===== " << nData << " data read " << G4endl;
G4double thisLevelEnergy = eLevel.at(0);
G4double thisLevelHalfLife = 0.;
@@ -272,7 +268,7 @@ void G4NuclearLevelManager::MakeLevels()
{
// G4cout << "Making a new level... " << e << " "
// << thisLevelEnergies.entries() << " "
// << thisLevelWeights.entries() << endl;
// << thisLevelWeights.entries() << G4endl;
G4NuclearLevel* newLevel = new G4NuclearLevel(thisLevelEnergy,
thisLevelHalfLife,
@@ -315,10 +311,10 @@ void G4NuclearLevelManager::PrintAll()
if (_levels != 0) nLevels = _levels->entries();
G4cout << " ==== G4NuclearLevelManager ==== (" << _nucleusZ << ", " << _nucleusA
<< ") has " << nLevels << " levels" << endl
<< ") has " << nLevels << " levels" << G4endl
<< "Highest level is at energy " << MaxLevelEnergy() << " MeV "
<< endl << "Lowest level is at energy " << MinLevelEnergy()
<< " MeV " << endl;
<< G4endl << "Lowest level is at energy " << MinLevelEnergy()
<< " MeV " << G4endl;
G4int i = 0;
for (i=0; i<nLevels; i++)
source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
+6 -6
View File
@@ -102,7 +102,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakUp(const G4Fragment& nucleus)
if (_verbose > 0)
G4cout << " = BreakUp = " << nDiscr
<< " gammas from DiscreteDeexcitation "
<< endl;
<< G4endl;
for (i=0; i<nDiscr; i++)
{
@@ -126,7 +126,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakUp(const G4Fragment& nucleus)
if (_verbose > 0)
G4cout << "*-*-*-* Photon evaporation: " << products->entries() << endl;
G4cout << "*-*-*-* Photon evaporation: " << products->entries() << G4endl;
return products;
}
@@ -151,7 +151,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
if (_verbose > 0)
G4cout << " = BreakItUp = " << nCont
<< " gammas from ContinuumDeexcitation " << endl;
<< " gammas from ContinuumDeexcitation " << G4endl;
G4int i;
if (nCont > 0)
@@ -172,7 +172,7 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
if (_verbose > 0)
G4cout << " = BreakItUp = " << nDiscr
<< " gammas from DiscreteDeexcitation " << endl;
<< " gammas from DiscreteDeexcitation " << G4endl;
for (i=0; i<nDiscr; i++)
{
@@ -184,13 +184,13 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
products->insert(finalNucleus);
if (_verbose > 0)
G4cout << " = BreakItUp = Nucleus added to products" << endl;
G4cout << " = BreakItUp = Nucleus added to products" << G4endl;
delete contProducts; // delete vector, not fragments
delete discrProducts;
if (_verbose > 0)
G4cout << "*-*-* Photon evaporation: " << products->entries() << endl;
G4cout << "*-*-* Photon evaporation: " << products->entries() << G4endl;
return products;
}
source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
+3 -3
View File
@@ -85,7 +85,7 @@ G4FragmentVector * G4StatMF::BreakItUp(const G4Fragment &theFragment)
G4double theMeanMult = theMicrocanonicalEnsemble->GetMeanMultiplicity();
if (theMeanMult <= MaxAverageMultiplicity) {
// G4cout << "MICROCANONICAL" << endl;
// G4cout << "MICROCANONICAL" << G4endl;
// choose fragments atomic numbers and charges from direct simulation
theChannel = theMicrocanonicalEnsemble->ChooseAandZ(theFragment);
_theEnsemble = theMicrocanonicalEnsemble;
@@ -99,7 +99,7 @@ G4FragmentVector * G4StatMF::BreakItUp(const G4Fragment &theFragment)
_theEnsemble = theMacrocanonicalEnsemble;
FirstTime = false;
}
// G4cout << "MACROCANONICAL" << endl;
// G4cout << "MACROCANONICAL" << G4endl;
// Select calculated fragment total multiplicity,
// fragment atomic numbers and fragment charges.
theChannel = theMacrocanonicalEnsemble->ChooseAandZ(theFragment);
@@ -186,7 +186,7 @@ G4bool G4StatMF::FindTemperatureOfBreakingChannel(const G4Fragment & theFragment
G4double Z = theFragment.GetZ();
G4double U = theFragment.GetExcitationEnergy();
G4double T = max(Temperature,0.0012*MeV);
G4double T = G4std::max(Temperature,0.0012*MeV);
G4double Ta = T;
G4double Tb = T;
source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
+1 -1
View File
@@ -48,7 +48,7 @@ G4double G4StatMFFragment::GetEnergy(const G4double T)
{
if (theA < 1 || theZ < 0 || theZ > theA) {
G4cerr << "G4StatMFFragment::GetEnergy: A = " << theA
<< ", Z = " << theZ << endl;
<< ", Z = " << theZ << G4endl;
G4Exception(
"G4StatMFFragment::GetEnergy: Wrong values for A and Z!");
}
source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
+1 -1
View File
@@ -61,7 +61,7 @@ G4double G4StatMFMacroMultiNucleon::CalcMeanMultiplicity(const G4double FreeVol,
if (exponent > 30.0) exponent = 30.0;
_MeanMultiplicity = max((FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*exp(exponent),1.0e-30);
_MeanMultiplicity = G4std::max((FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*exp(exponent),1.0e-30);
return _MeanMultiplicity;
}
source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
+1 -1
View File
@@ -30,7 +30,7 @@ G4double G4StatMFMacroTemperature::CalcTemperature(void)
{
// Temperature
G4double Ta = 0.00012;
G4double Tb = max(sqrt(_ExEnergy/(theA*0.12)),0.01*MeV);
G4double Tb = G4std::max(sqrt(_ExEnergy/(theA*0.12)),0.01*MeV);
G4double fTa = this->operator()(Ta);
G4double fTb = this->operator()(Tb);
source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
+1 -1
View File
@@ -89,7 +89,7 @@ void G4StatMFMacroCanonical::CalculateTemperature(const G4Fragment & theFragment
G4double Z = theFragment.GetZ();
// Fragment Multiplicity
G4double FragMult = max((1.0+(2.31/MeV)*(U/A - 3.5*MeV))*A/100.0, 2.0);
G4double FragMult = G4std::max((1.0+(2.31/MeV)*(U/A - 3.5*MeV))*A/100.0, 2.0);
// Parameter Kappa
source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
+3 -3
View File
@@ -152,7 +152,7 @@ G4double G4StatMFMicroPartition::CalcPartitionTemperature(const G4double U,
// Bracketing the solution
G4double Ta = 0.001;
G4double Tb = max(sqrt(8.0*U/theA),0.0012*MeV);
G4double Tb = G4std::max(sqrt(8.0*U/theA),0.0012*MeV);
G4double Tmid = 0.0;
G4double Da = (U + FreeInternalE0 - GetPartitionEnergy(Ta))/U;
@@ -180,7 +180,7 @@ G4double G4StatMFMicroPartition::CalcPartitionTemperature(const G4double U,
}
// if we arrive here the temperature could not be calculated
G4cerr << "G4StatMFMicroPartition::CalcPartitionTemperature: I can't calculate the temperature"
<< endl;
<< G4endl;
// and set probability to 0 returning T < 0
return -1.0;
@@ -237,7 +237,7 @@ G4double G4StatMFMicroPartition::CalcPartitionProbability(const G4double U,
G4double V0 = (4./3.)*pi*theA*G4StatMFParameters::Getr0()*G4StatMFParameters::Getr0()*
G4StatMFParameters::Getr0();
G4double FreeVolume = kappa*V0;
G4double TranslationalS = max(0.0, log(ProbA32/Fact) +
G4double TranslationalS = G4std::max(0.0, log(ProbA32/Fact) +
(_thePartition.entries()-1.0)*log(FreeVolume/ThermalWaveLenght3) +
1.5*(_thePartition.entries()-1.0) - (3./2.)*log(theA));
source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
+2 -2
View File
@@ -175,7 +175,7 @@ G4double G4StatMFMicroCanonical::CalcEntropyOfCompoundNucleus(const G4Fragment &
const G4double U = theFragment.GetExcitationEnergy();
const G4double A13 = pow(A,1.0/3.0);
G4double Ta = max(sqrt(U/(0.125*A)),0.0012*MeV);
G4double Ta = G4std::max(sqrt(U/(0.125*A)),0.0012*MeV);
G4double Tb = Ta;
G4double ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Ta);
@@ -230,7 +230,7 @@ G4double G4StatMFMicroCanonical::CalcEntropyOfCompoundNucleus(const G4Fragment &
}
}
G4cerr << "G4StatMFMicrocanoncal::CalcEntropyOfCompoundNucleus: I can't calculate the temperature" << endl;
G4cerr << "G4StatMFMicrocanoncal::CalcEntropyOfCompoundNucleus: I can't calculate the temperature" << G4endl;
return 0.0;
}
source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VFissionBarrier.cc,v 1.1.10.1 1999/12/07 20:51:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// Hadronic Process: Nuclear De-excitations
// by V. Lara (Oct 1998)
source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
+6 -6
View File
@@ -68,7 +68,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoTransition()
}
if (_verbose > 1)
G4cout << "G4VGammaDeexcitation::DoTransition - Transition deleted " << endl;
G4cout << "G4VGammaDeexcitation::DoTransition - Transition deleted " << G4endl;
if (_transition != 0) delete _transition;
@@ -82,7 +82,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoChain()
while (CanDoTransition())
{
if (_verbose > 5) G4cout << "G4VGammaDeexcitation::DoChain - Looping" << endl;
if (_verbose > 5) G4cout << "G4VGammaDeexcitation::DoChain - Looping" << G4endl;
G4Fragment* gamma = GenerateGamma();
if (gamma != 0)
@@ -94,7 +94,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoChain()
}
if (_verbose > 1)
G4cout << "G4VGammaDeexcitation::DoChain - Transition deleted, end of chain " << endl;
G4cout << "G4VGammaDeexcitation::DoChain - Transition deleted, end of chain " << G4endl;
if (_transition != 0) delete _transition;
@@ -128,7 +128,7 @@ G4Fragment* G4VGammaDeexcitation::GenerateGamma()
{
G4cout << "G4VGammaDeexcitation::GenerateGamma - Gamma energy " << eGamma
<< " ** New excitation " << _nucleus.GetExcitationEnergy() - eGamma
<< endl;
<< G4endl;
}
// Photon momentum isotropically generated
@@ -153,7 +153,7 @@ G4Fragment* G4VGammaDeexcitation::GenerateGamma()
gammaFragment->SetCreationTime(gammaTime);
if (_verbose > 1)
G4cout << "G4VGammaDeexcitation::GenerateGamma - Gamma fragment generated " << endl;
G4cout << "G4VGammaDeexcitation::GenerateGamma - Gamma fragment generated " << G4endl;
return gammaFragment;
}
@@ -218,7 +218,7 @@ void G4VGammaDeexcitation::Update()
delete _transition;
_transition = 0;
if (_verbose > 1)
G4cout << "G4VGammaDeexcitation::Update - Transition deleted " << endl;
G4cout << "G4VGammaDeexcitation::Update - Transition deleted " << G4endl;
}
_transition = CreateTransition();
source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4DiffractiveSplitableHadron.hh,v 1.2.8.1 1999/12/07 20:51:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4DiffractiveSplitableHadron_h
source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4FTFModel.hh,v 1.2.4.1 1999/12/07 20:51:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4FTFModel_h
#define G4FTFModel_h 1
source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4FTFParticipants.hh,v 1.1.8.1.2.1 1999/12/07 20:51:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4FTFParticipants_h
source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
+6 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4DiffractiveSplitableHadron.cc,v 1.1.10.1 1999/12/07 20:51:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4DiffractiveSplitableHadron.cc,v 1.1.10.1.2.1 1999/12/10 15:42:06 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
@@ -106,8 +106,8 @@ void G4DiffractiveSplitableHadron::ChooseStringEnds(G4int PDGcode,G4int * aEnd,
G4int heavy= absPDGcode/ 100;
G4int light= (absPDGcode %100)/10;
// G4int anti= pow(-1 , max( heavy, light));
G4int anti= 1 -2 * ( max( heavy, light ) % 2 );
// G4int anti= pow(-1 , G4std::max( heavy, light));
G4int anti= 1 -2 * ( G4std::max( heavy, light ) % 2 );
if (PDGcode < 0 ) anti *=-1;
heavy *= anti;
@@ -177,8 +177,8 @@ G4int G4DiffractiveSplitableHadron::Diquark(G4int aquark,G4int bquark,G4int Spin
{
G4int diquarkPDG;
diquarkPDG = max( abs(aquark), abs(bquark) )*1000 +
min( abs(aquark), abs(bquark) )*100 +
diquarkPDG = G4std::max( abs(aquark), abs(bquark) )*1000 +
G4std::min( abs(aquark), abs(bquark) )*100 +
2*Spin + 1;
return ( aquark > 0 && bquark > 0 ) ? diquarkPDG : -1*diquarkPDG;
}
source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
+6 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4FTFModel.cc,v 1.2.2.1.2.1 1999/12/07 20:51:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4FTFModel.cc,v 1.2.2.1.2.1.2.1 1999/12/08 17:34:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
@@ -108,7 +108,7 @@ G4ExcitedStringVector * G4FTFModel::BuildStrings()
// G4cout << "BuildStrings prim/targ " << primaries.entries() << " , " <<
// targets.entries() << endl;
// targets.entries() << G4endl;
G4int ahadron;
@@ -131,15 +131,15 @@ G4ExcitedStringVector * G4FTFModel::BuildStrings()
G4bool G4FTFModel::ExciteParticipants()
{
// G4cout << "G4FTFModel::ExciteParticipants starting " << endl;
// G4cout << "G4FTFModel::ExciteParticipants starting " << G4endl;
while (theParticipants.Next())
{
// G4cout << "next Collision " << endl;
// G4cout << "next Collision " << G4endl;
const G4InteractionContent & collision=theParticipants.GetInteraction();
// G4cout << " soft colls : " << collision.GetNumberOfSoftCollisions() << endl;
// G4cout << " soft colls : " << collision.GetNumberOfSoftCollisions() << G4endl;
G4VSplitableHadron * projectile=collision.GetProjectile();
G4VSplitableHadron * target=collision.GetTarget();
source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
+9 -9
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4FTFParticipants.cc,v 1.1.10.1 1999/12/07 20:51:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4FTFParticipants.cc,v 1.1.10.1.2.1 1999/12/08 17:34:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -40,7 +40,7 @@ G4FTFParticipants::G4FTFParticipants(const G4FTFParticipants &right)
G4FTFParticipants::~G4FTFParticipants()
{
// G4cout << "G4FTFParticipants::~G4FTFParticipants() called" << endl;
// G4cout << "G4FTFParticipants::~G4FTFParticipants() called" << G4endl;
}
@@ -67,9 +67,9 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
sqr( G4Proton::Proton()->GetPDGMass() ) +
2*thePrimary.GetTotalEnergy()*G4Proton::Proton()->GetPDGMass();
// G4cout << " primary Total E (GeV): " << thePrimary.GetTotalEnergy()/GeV << endl;
// G4cout << " primary Mass (GeV): " << thePrimary.GetMass() /GeV << endl;
// G4cout << "cms sqrt(s) (GeV) = " << sqrt(s) / GeV << endl;
// 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;
G4PomeronCrossSection theCrossSection(thePrimary.GetDefinition());
@@ -82,7 +82,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
G4double xyradius;
xyradius =theNucleus->GetOuterRadius() + deltaxy;
// G4cout <<" G4FTFParticipants::StartLoop: xyradius " << xyradius << endl;
// G4cout <<" G4FTFParticipants::StartLoop: xyradius " << xyradius << G4endl;
G4bool nucleusNeedsShift = true;
@@ -98,7 +98,7 @@ void G4FTFParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
G4double impactX=x*xyradius;
G4double impactY=y*xyradius;
// G4cout << " impctX, impctY " << impactX/fermi << " "<<impactY/fermi << " fm" << endl;
// G4cout << " impctX, impctY " << impactX/fermi << " "<<impactY/fermi << " fm" << G4endl;
theNucleus->StartLoop();
G4Nucleon * nucleon;
@@ -130,7 +130,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 <<endl;
// << "\t" << sqrt(sqr(impactX)+sqr(impactY))/fermi <<G4endl;
}
source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4TheoFSGenerator.hh,v 1.2 1999/04/12 15:45:28 hpw Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4TheoFSGenerator_h
#define G4TheoFSGenerator_h 1
source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4TheoFSGenerator.cc,v 1.3 1999/04/18 11:30:49 hpw Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4TheoFSGenerator
#include "G4DynamicParticle.hh"
source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
+3 -3
View File
@@ -9,9 +9,9 @@
G4VParticleChange* G4GeneratorPrecompoundInterface::
ApplyYourself(const G4Track& aTrack, G4Nucleus& theNucleus)
{
cout << "G4GeneratorPrecompoundInterface: ApplyYourself interface called stand-allone."<< endl;
cout << "This class is only a mediator between generator and precompound"<<endl;
cout << "Please remove from your physics list."<<endl;
G4std::cout << "G4GeneratorPrecompoundInterface: ApplyYourself interface called stand-allone."<< G4endl;
G4std::cout << "This class is only a mediator between generator and precompound"<<G4endl;
G4std::cout << "Please remove from your physics list."<<G4endl;
G4Exception("SEVERE: G4GeneratorPrecompoundInterface model interface called stand-allone.");
return new G4ParticleChange;
}
source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4V3DNucleus.hh,v 1.2.8.1 1999/12/07 20:51:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4V3DNucleus_h
#define G4V3DNucleus_h 1
source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VHighEnergyGenerator.hh,v 1.2.8.1 1999/12/07 20:51:44 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VHighEnergyGenerator_h
#define G4VHighEnergyGenerator_h 1
source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VIntraNuclearTransportModel.hh,v 1.3.8.1 1999/12/07 20:51:44 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id: G4IntraNuclearTransportMode.hh,v 1.0 1998/06/30
// -----------------------------------------------------------------------------
source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VKineticNucleon.hh,v 1.1.8.1 1999/12/07 20:51:44 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VKineticNucleon_h
#define G4VKineticNucleon_h 1
source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VNuclearDensity.hh,v 1.1.10.1 1999/12/07 20:51:44 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VNuclearDensity_h
#define G4VNuclearDensity_h 1
source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPreCompoundModel.hh,v 1.2.8.1 1999/12/07 20:51:44 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VPreCompoundModel_h
source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4V3DNucleus.cc,v 1.1.10.1 1999/12/07 20:51:45 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4V3DNucleus.hh"
source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VHighEnergyGenerator.cc,v 1.1.10.1 1999/12/07 20:51:46 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4VHighEnergyGenerator
#include "G4VHighEnergyGenerator.hh"
source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VIntraNuclearTransportModel.cc,v 1.2.8.1 1999/12/07 20:51:46 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30
// -----------------------------------------------------------------------------
source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VKineticNucleon.cc,v 1.1.8.1 1999/12/07 20:51:46 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4VKineticNucleon.hh"
source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VNuclearDensity.cc,v 1.1.10.1 1999/12/07 20:51:46 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4VNuclearDensity.hh"
source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPreCompoundModel.cc,v 1.1.10.1 1999/12/07 20:51:46 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4VPreCompoundModel.hh"
source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PreCompoundModel.hh,v 1.4.6.1.2.1 1999/12/07 20:51:47 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// by V. Lara
source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
+3 -3
View File
@@ -12,7 +12,7 @@
#define G4VPreCompoundFragment_h 1
#include "G4ios.hh"
#include <iomanip.h>
#include "g4std/iomanip"
#include "G4ParticleDefinition.hh"
#include "G4ParticleTable.hh"
#include "G4IonTable.hh"
@@ -44,8 +44,8 @@ public:
G4int operator!=(const G4VPreCompoundFragment &right) const;
friend ostream& operator<<(ostream&, const G4VPreCompoundFragment*);
friend ostream& operator<<(ostream&, const G4VPreCompoundFragment&);
friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment*);
friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment&);
// methods
source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PreCompoundModel.cc,v 1.7.4.1 1999/12/07 20:51:49 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PreCompoundModel.cc,v 1.7.4.1.2.1 1999/12/08 17:34:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// by V. Lara
@@ -240,7 +240,7 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(const G4Fragment & theInit
theChannels(aChannel)->GetKineticEnergy(aFragment);
// G4cout << "Kinetic energy of Emitted fragment " << KineticEnergyOfEmittedFragment << endl;
// G4cout << "Kinetic energy of Emitted fragment " << KineticEnergyOfEmittedFragment << G4endl;
// Sample Fermi momentum of emitted fragment
static const G4double FermiMaxMom = 250.0; // MeV
source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
+1 -1
View File
@@ -55,7 +55,7 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
aFragment.GetA()*aFragment.GetExcitationEnergy()/MeV;
// Transition probability for \Delta n = -2 (at F(p,h) = 0)
// TransitionProb2 = max(0, (TransitionProb1*P*H*(P+H+1.0)*(P+H-2.0))/(GE*GE));
// TransitionProb2 = G4std::max(0, (TransitionProb1*P*H*(P+H+1.0)*(P+H-2.0))/(GE*GE));
TransitionProb2 = (TransitionProb1*P*H*(P+H+1.0)*(P+H-2.0))/(GE*GE);
if (TransitionProb2 < 0.0) TransitionProb2 = 0.0;
source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
+8 -8
View File
@@ -77,24 +77,24 @@ G4int G4VPreCompoundFragment::operator!=(const G4VPreCompoundFragment & right) c
}
ostream& operator << (ostream &out, const G4VPreCompoundFragment &theFragment)
G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment &theFragment)
{
out << &theFragment;
return out;
}
ostream& operator << (ostream &out, const G4VPreCompoundFragment *theFragment)
G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment *theFragment)
{
long old_floatfield = out.setf(0,ios::floatfield);
long old_floatfield = out.setf(0,G4std::ios::floatfield);
out
<< "PreCompound Model Emitted Fragment: A = " << setprecision(3) << theFragment->theA
<< ", Z = " << setprecision(3) << theFragment->theZ;
out.setf(ios::scientific,ios::floatfield);
<< "PreCompound Model Emitted Fragment: A = " << G4std::setprecision(3) << theFragment->theA
<< ", Z = " << G4std::setprecision(3) << theFragment->theZ;
out.setf(G4std::ios::scientific,G4std::ios::floatfield);
// out
// << ", U = " << theFragment->theExcitationEnergy/MeV
// << " MeV" << endl
// << " MeV" << G4endl
// << " P = ("
// << theFragment->theMomentum.x()/MeV << ","
// << theFragment->theMomentum.y()/MeV << ","
@@ -102,7 +102,7 @@ ostream& operator << (ostream &out, const G4VPreCompoundFragment *theFragment)
// << ") MeV E = "
// << theFragment->theMomentum.t()/MeV << " MeV";
out.setf(old_floatfield,ios::floatfield);
out.setf(old_floatfield,G4std::ios::floatfield);
return out;
source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4InelasticSplitableHadron.hh,v 1.1.4.1 1999/12/07 20:51:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4InelasticSplitableHadron_h
source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PartonStringAnnihilator.hh,v 1.1.4.1 1999/12/07 20:51:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $Maxim Komogorov
// GEANT4 tag $Name: geant4-01-01 $Maxim Komogorov
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
//
source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
+1 -1
View File
@@ -71,7 +71,7 @@ void G4InelasticSplitableHadron::GetValenceQuarkFlavors(G4int PDGcode, G4int& aE
{
G4int heavy = absPDGcode/100;
G4int light = (absPDGcode%100)/10;
G4int anti = 1 - 2*(max(heavy, light)%2);
G4int anti = 1 - 2*(G4std::max(heavy, light)%2);
if (PDGcode < 0 ) anti = -anti;
heavy *= anti;
light *= -1 * anti;
source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
+1 -1
View File
@@ -7,7 +7,7 @@ G4bool G4MesonSplitter::SplitMeson(G4int PDGcode, G4int* aEnd, G4int* bEnd)
G4int heavy = absPDGcode/100;
G4int light = (absPDGcode%100)/10;
G4int anti = 1 - 2*(max(heavy, light)%2);
G4int anti = 1 - 2*(G4std::max(heavy, light)%2);
if (PDGcode < 0 ) anti = -anti;
heavy *= anti;
light *= -anti;
source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
+2 -2
View File
@@ -109,7 +109,7 @@ void G4QGSMSplitableHadron::DiffractiveSplitUp()
RightMom.setPy(HadronMom.py() - pt.y());
G4double Local1 = HadronMom.minus() + (RightMom.perp2() - LeftMom.perp2())/HadronMom.plus();
G4double Local2 = sqrt(max(0., sqr(Local1) - 4.*RightMom.perp2()*HadronMom.minus()/HadronMom.plus()));
G4double Local2 = sqrt(G4std::max(0., sqr(Local1) - 4.*RightMom.perp2()*HadronMom.minus()/HadronMom.plus()));
if (Direction) Local2 = -Local2;
G4double RightMinus = 0.5*(Local1 + Local2);
G4double LeftMinus = HadronMom.minus() - RightMinus;
@@ -229,7 +229,7 @@ void G4QGSMSplitableHadron::SoftSplitUp()
aParton = AntiColor.at(aSeaPair);
aParton->DefineMomentumInZ(lightCone, Direction);
}
//--DEBUG-- cout <<endl<<"XSAMPLE "<<HPWtest<<endl;
//--DEBUG-- cout <<G4endl<<"XSAMPLE "<<HPWtest<<G4endl;
return;
}
source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
+4 -4
View File
@@ -24,7 +24,7 @@ void G4QGSModel::Init(const G4Nucleus & aNucleus, const G4DynamicParticle & aPro
// this is an approximation, neglecting the motion of nucleons in the nucleus & p,n mass differences. @@@
G4double vz = aProjectile.Get4Momentum().pz()/
(aProjectile.Get4Momentum().e() + G4Proton::Proton()->GetPDGMass());
//--DEBUG-- cout << "IncomingMomentum "<<aProjectile.Get4Momentum()<<endl;
//--DEBUG-- cout << "IncomingMomentum "<<aProjectile.Get4Momentum()<<G4endl;
theCurrentVelocity.setZ(vz);
theParticipants.GetWoundedNucleus()->DoLorentzBoost(-theCurrentVelocity);
G4LorentzVector Mom = aProjectile.Get4Momentum();
@@ -33,7 +33,7 @@ void G4QGSModel::Init(const G4Nucleus & aNucleus, const G4DynamicParticle & aPro
theProjectile.SetDefinition(aProjectile.GetDefinition());
theProjectile.SetTotalEnergy(Mom.e());
theProjectile.SetMomentum(Mom);
//--DEBUG-- cout << "PreInteractionMomentum "<<Mom<<endl;
//--DEBUG-- cout << "PreInteractionMomentum "<<Mom<<G4endl;
theParticipants.BuildInteractions(theProjectile);
theParticipants.GetWoundedNucleus()->DoLorentzBoost(theCurrentVelocity);
}
@@ -59,10 +59,10 @@ G4ExcitedStringVector * G4QGSModel::GetStrings()
aString->Boost(theCurrentVelocity);
theStrings->insert(aString);
}
//--DEBUG-- cout << endl;
//--DEBUG-- cout << G4endl;
for(G4int i=0; i<theStrings->length(); i++)
{
//--DEBUG-- cout << "String = "<<theStrings->at(i)->Get4Momentum()<<endl;
//--DEBUG-- cout << "String = "<<theStrings->at(i)->Get4Momentum()<<G4endl;
}
return theStrings;
}
source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
+4 -4
View File
@@ -79,7 +79,7 @@ void G4QGSParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
// ModelMode = DIFFRACTIVE;
if (Probability > rndNumber)
{
//--DEBUG-- cout << "DEBUG p="<< Probability<<" r="<<rndNumber<<" d="<<sqrt(Distance2)<<endl;
//--DEBUG-- cout << "DEBUG p="<< Probability<<" r="<<rndNumber<<" d="<<sqrt(Distance2)<<G4endl;
G4QGSMSplitableHadron* aTarget = new G4QGSMSplitableHadron(*pNucleon);
theTargets.insert(aTarget);
pNucleon->Hit(aTarget);
@@ -130,10 +130,10 @@ void G4QGSParticipants::BuildInteractions(const G4ReactionProduct &thePrimary)
}
}
}
//--DEBUG-- cout << endl<<"NUCLEONCOUNT "<<nucleonCount<<endl;
//--DEBUG-- cout << G4endl<<"NUCLEONCOUNT "<<nucleonCount<<G4endl;
}
//--DEBUG-- cout << endl<<"CUTDEBUG "<< totalCuts <<endl;
//--DEBUG-- cout << "Impact Parameter used = "<<impactUsed<<endl;
//--DEBUG-- cout << G4endl<<"CUTDEBUG "<< totalCuts <<G4endl;
//--DEBUG-- cout << "Impact Parameter used = "<<impactUsed<<G4endl;
// now build the parton pairs. HPW
SplitHadrons();
source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EventGenerator.hh,v 1.1.10.1 1999/12/07 20:51:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4EventGenerator_h
#define G4EventGenerator_h 1
source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4InteractionCode.hh,v 1.1.10.1 1999/12/07 20:51:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4InteractionCode_h
#define G4InteractionCode_h 1
source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4InteractionContent.hh,v 1.1.10.1 1999/12/07 20:51:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4InteractionContent_h
source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
+1 -1
View File
@@ -8,7 +8,7 @@
// and all its terms.
//
// $Id: G4PomeronCrossSection.hh,v 1.2.8.1 1999/12/07 20:51:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4Proton.hh"
#include "G4Neutron.hh"
source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StringModel.hh,v 1.2.8.1 1999/12/07 20:51:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4StringModel_h
#define G4StringModel_h 1
source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VParticipants.hh,v 1.1.8.1 1999/12/07 20:51:52 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VParticipants_h
source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPartonStringModel.hh,v 1.2.8.1 1999/12/07 20:51:52 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VPartonStringModel_h
#define G4VPartonStringModel_h 1
source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VSplitableHadron.hh,v 1.1.6.1.2.1 1999/12/07 20:51:53 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VSplitableHadron_h
source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VStringFragmentation.hh,v 1.1.8.1 1999/12/07 20:51:53 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VStringFragmentation_h
#define G4VStringFragmentation_h 1
source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VertexCode.hh,v 1.1.10.1 1999/12/07 20:51:53 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4VertexCode_h
#define G4VertexCode_h 1
source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
+37 -37
View File
@@ -5,7 +5,7 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4DiffractiveExcitation.cc,v 1.5.4.1 1999/12/07 20:51:53 gunter Exp $
// $Id: G4DiffractiveExcitation.cc,v 1.5.4.1.2.3 1999/12/10 15:42:06 gunter Exp $
// ------------------------------------------------------------
// GEANT 4 class implemetation file
//
@@ -47,7 +47,7 @@ G4bool G4DiffractiveExcitation::
G4LorentzVector Ptarget=target->Get4Momentum();
G4double Mtarget2=sqr(target->GetDefinition()->GetPDGMass() + minExtraMass);
// G4cout << "E proj, target :" << Pprojectile.e() << ", " <<
// Ptarget.e() << endl;
// Ptarget.e() << G4endl;
// Transform momenta to cms and then rotate parallel to z axis;
@@ -61,15 +61,15 @@ G4bool G4DiffractiveExcitation::
if ( Ptmp.pz() <= 0. )
{
// "String" moving backwards in CMS, abort collision !!
// G4cout << " abort Collision!! " << endl;
// G4cout << " abort Collision!! " << G4endl;
return false;
}
toCms.rotateZ(-1*Ptmp.phi());
toCms.rotateY(-1*Ptmp.theta());
// G4cout << "Pprojectile be4 boost " << Pprojectile << endl;
// G4cout << "Ptarget be4 boost : " << Ptarget << endl;
// G4cout << "Pprojectile be4 boost " << Pprojectile << G4endl;
// G4cout << "Ptarget be4 boost : " << Ptarget << G4endl;
@@ -78,14 +78,14 @@ G4bool G4DiffractiveExcitation::
Pprojectile.transform(toCms);
Ptarget.transform(toCms);
// G4cout << "Pprojectile aft boost : " << Pprojectile << endl;
// G4cout << "Ptarget aft boost : " << Ptarget << endl;
// G4cout << "cms aft boost : " << (Pprojectile+ Ptarget) << endl;
// G4cout << "Pprojectile aft boost : " << Pprojectile << G4endl;
// G4cout << "Ptarget aft boost : " << Ptarget << G4endl;
// G4cout << "cms aft boost : " << (Pprojectile+ Ptarget) << G4endl;
// G4cout << " Projectile Xplus / Xminus : " <<
// Pprojectile.plus() << " / " << Pprojectile.minus() << endl;
// Pprojectile.plus() << " / " << Pprojectile.minus() << G4endl;
// G4cout << " Target Xplus / Xminus : " <<
// Ptarget.plus() << " / " << Ptarget.minus() << endl;
// Ptarget.plus() << " / " << Ptarget.minus() << G4endl;
G4LorentzVector Qmomentum;
G4int whilecount=0;
@@ -96,18 +96,18 @@ G4bool G4DiffractiveExcitation::
if (whilecount++ >= 500 && (whilecount%100)==0)
// G4cout << "G4DiffractiveExcitation::ExciteParticipants possibly looping"
// << ", loop count/ maxPtSquare : "
// << whilecount << " / " << maxPtSquare << endl;
// << whilecount << " / " << maxPtSquare << G4endl;
if (whilecount > 1000 )
{
Qmomentum=0;
// G4cout << "G4DiffractiveExcitation::ExciteParticipants: Aborting loop!" << endl;
// G4cout << "G4DiffractiveExcitation::ExciteParticipants: Aborting loop!" << G4endl;
return false; // Ignore this interaction
}
Qmomentum=G4LorentzVector(GaussianPt(widthOfPtSquare,maxPtSquare),0);
// G4cout << "generated Pt " << Qmomentum << endl;
// G4cout << "Pprojectile with pt : " << Pprojectile+Qmomentum << endl;
// G4cout << "Ptarget with pt : " << Ptarget-Qmomentum << endl;
// G4cout << "generated Pt " << Qmomentum << G4endl;
// G4cout << "Pprojectile with pt : " << Pprojectile+Qmomentum << G4endl;
// G4cout << "Ptarget with pt : " << Ptarget-Qmomentum << G4endl;
// Momentum transfer
G4double Xmin = minmass / ( Pprojectile.e() + Ptarget.e() );
@@ -115,8 +115,8 @@ G4bool G4DiffractiveExcitation::
G4double Xplus =ChooseX(Xmin,Xmax);
G4double Xminus=ChooseX(Xmin,Xmax);
// G4cout << " X-plus " << Xplus << endl;
// G4cout << " X-minus " << Xminus << endl;
// G4cout << " X-plus " << Xplus << G4endl;
// G4cout << " X-minus " << Xminus << G4endl;
G4double pt2=G4ThreeVector(Qmomentum).mag2();
G4double Qplus =-1 * pt2 / Xminus/Ptarget.minus();
@@ -125,11 +125,11 @@ G4bool G4DiffractiveExcitation::
Qmomentum.setPz( (Qplus-Qminus)/2 );
Qmomentum.setE( (Qplus+Qminus)/2 );
// G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<endl;
// G4cout << "pt2" << pt2 << endl;
// G4cout << "Qmomentum " << Qmomentum << endl;
// G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<G4endl;
// G4cout << "pt2" << pt2 << G4endl;
// G4cout << "Qmomentum " << Qmomentum << G4endl;
// G4cout << " Masses (P/T) : " << (Pprojectile+Qmomentum).mag() <<
// " / " << (Ptarget-Qmomentum).mag() << endl;
// " / " << (Ptarget-Qmomentum).mag() << G4endl;
} while ( (Pprojectile+Qmomentum).mag2() <= Mprojectile2 ||
(Ptarget-Qmomentum).mag2() <= Mtarget2 );
@@ -137,25 +137,25 @@ G4bool G4DiffractiveExcitation::
Pprojectile += Qmomentum;
Ptarget -= Qmomentum;
// G4cout << "Pprojectile with Q : " << Pprojectile << endl;
// G4cout << "Ptarget with Q : " << Ptarget << endl;
// G4cout << "Pprojectile with Q : " << Pprojectile << G4endl;
// G4cout << "Ptarget with Q : " << Ptarget << G4endl;
// G4cout << "Projectile back: " << toLab * Pprojectile << endl;
// G4cout << "Target back: " << toLab * Ptarget << endl;
// G4cout << "Projectile back: " << toLab * Pprojectile << G4endl;
// G4cout << "Target back: " << toLab * Ptarget << G4endl;
// Transform back and update SplitableHadron Participant.
Pprojectile.transform(toLab);
Ptarget.transform(toLab);
// G4cout << "Target mass " << Ptarget.mag() << endl;
// G4cout << "Target mass " << Ptarget.mag() << G4endl;
target->Set4Momentum(Ptarget);
//
// G4cout << "Projectile mass " << Pprojectile.mag() << endl;
// G4cout << "Projectile mass " << Pprojectile.mag() << G4endl;
projectile->Set4Momentum(Pprojectile);
@@ -170,12 +170,12 @@ G4ExcitedString * G4DiffractiveExcitation::
hadron->SplitUp();
G4Parton *start= hadron->GetNextParton();
if ( start==NULL)
{ cout << " G4FTFModel::String() Error:No start parton found"<< endl;
{ G4cout << " G4FTFModel::String() Error:No start parton found"<< G4endl;
return NULL;
}
G4Parton *end = hadron->GetNextParton();
if ( end==NULL)
{ cout << " G4FTFModel::String() Error:No end parton found"<< endl;
{ G4cout << " G4FTFModel::String() Error:No end parton found"<< G4endl;
return NULL;
}
@@ -208,7 +208,7 @@ G4ExcitedString * G4DiffractiveExcitation::
G4double tm1=hadron->Get4Momentum().minus() +
( Pend.perp2()-Pstart.perp2() ) / hadron->Get4Momentum().plus();
G4double tm2= sqrt( max(0., sqr(tm1) -
G4double tm2= sqrt( G4std::max(0., sqr(tm1) -
4. * Pend.perp2() * hadron->Get4Momentum().minus()
/ hadron->Get4Momentum().plus() ));
@@ -230,11 +230,11 @@ G4ExcitedString * G4DiffractiveExcitation::
end->Set4Momentum(Pend);
#ifdef G4_FTFDEBUG
G4cout << " generated string flavors " << start->GetPDGcode() << " / " << end->GetPDGcode() << endl;
G4cout << " generated string momenta: quark " << start->Get4Momentum() << "mass : " <<start->Get4Momentum().mag()<< endl;
G4cout << " generated string momenta: Diquark " << end ->Get4Momentum() << "mass : " <<end->Get4Momentum().mag()<< endl;
G4cout << " sum of ends " << Pstart+Pend << endl;
G4cout << " Original " << hadron->Get4Momentum() << endl;
G4cout << " generated string flavors " << start->GetPDGcode() << " / " << end->GetPDGcode() << G4endl;
G4cout << " generated string momenta: quark " << start->Get4Momentum() << "mass : " <<start->Get4Momentum().mag()<< G4endl;
G4cout << " generated string momenta: Diquark " << end ->Get4Momentum() << "mass : " <<end->Get4Momentum().mag()<< G4endl;
G4cout << " sum of ends " << Pstart+Pend << G4endl;
G4cout << " Original " << hadron->Get4Momentum() << G4endl;
#endif
return string;
@@ -253,7 +253,7 @@ G4double G4DiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) const
if ( Xmin <= 0. || range <=0. )
{
G4cout << " Xmin, range : " << Xmin << " , " << range << endl;
G4cout << " Xmin, range : " << Xmin << " , " << range << G4endl;
G4Exception("G4DiffractiveExcitation::ChooseX : Invalid arguments ");
}
@@ -262,7 +262,7 @@ G4double G4DiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) const
x=Xmin + G4UniformRand() * range;
} while ( Xmin/x < G4UniformRand() );
//debug-hpw cout << "DiffractiveX "<<x<<endl;
//debug-hpw G4cout << "DiffractiveX "<<x<<G4endl;
return x;
}
source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EventGenerator.cc,v 1.1.10.1 1999/12/07 20:51:53 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4EventGenerator
#include "G4EventGenerator.hh"
source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4InteractionContent.cc,v 1.1.10.1 1999/12/07 20:51:54 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PomeronCrossSection.cc,v 1.2.8.1 1999/12/07 20:51:54 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4PomeronCrossSection.hh"
source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
+24 -24
View File
@@ -5,7 +5,7 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SingleDiffractiveExcitation.cc,v 1.3.4.1 1999/12/07 20:51:54 gunter Exp $
// $Id: G4SingleDiffractiveExcitation.cc,v 1.3.4.1.2.1 1999/12/08 17:34:43 gunter Exp $
// ------------------------------------------------------------
// GEANT 4 class implemetation file
//
@@ -47,17 +47,17 @@ G4bool G4SingleDiffractiveExcitation::
G4LorentzVector Ptarget=target->Get4Momentum();
G4double Mtarget2=sqr(target->GetDefinition()->GetPDGMass() + minExtraMass);
// G4cout << "E proj, target :" << Pprojectile.e() << ", " <<
// Ptarget.e() << endl;
// Ptarget.e() << G4endl;
G4bool KeepProjectile= G4UniformRand() > 0.5;
// reset the min.mass of the non diffractive particle to its value, ( minus a bit for rounding...)
if ( KeepProjectile )
{
// cout << " Projectile fix" << endl;
// cout << " Projectile fix" << G4endl;
Mprojectile2 = sqr(projectile->GetDefinition()->GetPDGMass() * (1-perCent) );
} else {
// cout << " Target fix" << endl;
// cout << " Target fix" << G4endl;
Mtarget2=sqr(target->GetDefinition()->GetPDGMass() * (1-perCent) );
}
@@ -73,15 +73,15 @@ G4bool G4SingleDiffractiveExcitation::
if ( Ptmp.pz() <= 0. )
{
// "String" moving backwards in CMS, abort collision !!
// G4cout << " abort Collision!! " << endl;
// G4cout << " abort Collision!! " << G4endl;
return false;
}
toCms.rotateZ(-1*Ptmp.phi());
toCms.rotateY(-1*Ptmp.theta());
// G4cout << "Pprojectile be4 boost " << Pprojectile << endl;
// G4cout << "Ptarget be4 boost : " << Ptarget << endl;
// G4cout << "Pprojectile be4 boost " << Pprojectile << G4endl;
// G4cout << "Ptarget be4 boost : " << Ptarget << G4endl;
@@ -99,11 +99,11 @@ G4bool G4SingleDiffractiveExcitation::
if (whilecount++ >= 500 && (whilecount%100)==0)
// G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants possibly looping"
// << ", loop count/ maxPtSquare : "
// << whilecount << " / " << maxPtSquare << endl;
// << whilecount << " / " << maxPtSquare << G4endl;
if (whilecount > 1000 )
{
Qmomentum=0;
// G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants: Aborting loop!" << endl;
// G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants: Aborting loop!" << G4endl;
return false; // Ignore this interaction
}
Qmomentum=G4LorentzVector(GaussianPt(widthOfPtSquare,maxPtSquare),0);
@@ -134,11 +134,11 @@ G4bool G4SingleDiffractiveExcitation::
Qmomentum.setPz( (Qplus-Qminus)/2 );
Qmomentum.setE( (Qplus+Qminus)/2 );
// G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<endl;
// G4cout << "pt2 " << pt2 << endl;
// G4cout << "Qmomentum " << Qmomentum << endl;
// G4cout << "Qplus / Qminus " << Qplus << " / " << Qminus<<G4endl;
// G4cout << "pt2 " << pt2 << G4endl;
// G4cout << "Qmomentum " << Qmomentum << G4endl;
// G4cout << " Masses (P/T) : " << (Pprojectile+Qmomentum).mag() <<
// " / " << (Ptarget-Qmomentum).mag() << endl;
// " / " << (Ptarget-Qmomentum).mag() << G4endl;
} while ( (Ptarget-Qmomentum).mag2() <= Mtarget2
|| (Pprojectile+Qmomentum).mag2() <= Mprojectile2
@@ -152,24 +152,24 @@ G4bool G4SingleDiffractiveExcitation::
Ptarget -= Qmomentum;
// G4cout << "Pprojectile.e() : " << Pprojectile.e() << endl;
// G4cout << "Ptarget.e() : " << Ptarget.e() << endl;
// G4cout << "Pprojectile.e() : " << Pprojectile.e() << G4endl;
// G4cout << "Ptarget.e() : " << Ptarget.e() << G4endl;
// G4cout << "end event_______________________________________________"<<endl;
// G4cout << "end event_______________________________________________"<<G4endl;
//
// G4cout << "Pprojectile with Q : " << Pprojectile << endl;
// G4cout << "Ptarget with Q : " << Ptarget << endl;
// G4cout << "Projectile back: " << toLab * Pprojectile << endl;
// G4cout << "Target back: " << toLab * Ptarget << endl;
// G4cout << "Pprojectile with Q : " << Pprojectile << G4endl;
// G4cout << "Ptarget with Q : " << Ptarget << G4endl;
// G4cout << "Projectile back: " << toLab * Pprojectile << G4endl;
// G4cout << "Target back: " << toLab * Ptarget << G4endl;
// Transform back and update SplitableHadron Participant.
Pprojectile.transform(toLab);
Ptarget.transform(toLab);
// G4cout << "Target mass " << Ptarget.mag() << endl;
// G4cout << "Projectile mass " << Pprojectile.mag() << endl;
// G4cout << "Target mass " << Ptarget.mag() << G4endl;
// G4cout << "Projectile mass " << Pprojectile.mag() << G4endl;
target->Set4Momentum(Ptarget);
projectile->Set4Momentum(Pprojectile);
@@ -193,7 +193,7 @@ G4double G4SingleDiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) co
if ( Xmin <= 0. || range <=0. )
{
G4cout << " Xmin, range : " << Xmin << " , " << range << endl;
G4cout << " Xmin, range : " << Xmin << " , " << range << G4endl;
G4Exception("G4SingleDiffractiveExcitation::ChooseX : Invalid arguments ");
}
@@ -202,7 +202,7 @@ G4double G4SingleDiffractiveExcitation::ChooseX(G4double Xmin, G4double Xmax) co
x=Xmin + G4UniformRand() * range;
} while ( Xmin/x < G4UniformRand() );
// cout << "DiffractiveX "<<x<<endl;
// cout << "DiffractiveX "<<x<<G4endl;
return x;
}
source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StringModel.cc,v 1.1.10.1 1999/12/07 20:51:54 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4StringModel
#include "G4StringModel.hh"
source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VParticipants.cc,v 1.1.8.1 1999/12/07 20:51:54 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VParticipants.cc,v 1.1.8.1.2.1 1999/12/08 17:34:43 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -29,7 +29,7 @@ G4VParticipants::G4VParticipants() : theNucleus(NULL)
G4VParticipants::~G4VParticipants()
{
// G4cout << "G4VParticipants::~G4VParticipants()" << endl;
// G4cout << "G4VParticipants::~G4VParticipants()" << G4endl;
if ( theNucleus != NULL ) delete theNucleus;
}
source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
+27 -27
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VPartonStringModel.cc,v 1.4.4.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VPartonStringModel.cc,v 1.4.4.1.2.2 1999/12/09 17:37:01 gcosmo Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//// ------------------------------------------------------------
// GEANT 4 class implementation file
@@ -86,7 +86,7 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
strings = GetStrings();
}
// G4cout << "Number of strings " << strings->entries() << endl << endl;
// G4cout << "Number of strings " << strings->entries() << G4endl << G4endl;
G4KineticTrackVector * theResult = new G4KineticTrackVector;
@@ -101,13 +101,13 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
KTsum+= strings->at(astring)->Get4Momentum();
G4KineticTrackVector * generatedKineticTracks = NULL;
// G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << endl;
// G4cout << " strings["<<astring<<"] Mass " << strings->at(astring)->Get4Momentum().mag() << endl;
// G4cout << " strings["<<astring<<"] Position " << strings->at(astring)->GetPosition() << endl;
// G4cout << "Parton Left " << strings->at(astring)->GetLeftParton()->Get4Momentum() << endl;
// G4cout << " code " << strings->at(astring)->GetLeftParton()->GetPDGcode()<< endl;
// G4cout << "Parton Right " << strings->at(astring)->GetRightParton()->Get4Momentum() << endl;
// G4cout << " code " << strings->at(astring)->GetRightParton()->GetPDGcode()<< endl;
// G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << G4endl;
// G4cout << " strings["<<astring<<"] Mass " << strings->at(astring)->Get4Momentum().mag() << G4endl;
// G4cout << " strings["<<astring<<"] Position " << strings->at(astring)->GetPosition() << G4endl;
// G4cout << "Parton Left " << strings->at(astring)->GetLeftParton()->Get4Momentum() << G4endl;
// G4cout << " code " << strings->at(astring)->GetLeftParton()->GetPDGcode()<< G4endl;
// G4cout << "Parton Right " << strings->at(astring)->GetRightParton()->Get4Momentum() << G4endl;
// G4cout << " code " << strings->at(astring)->GetRightParton()->GetPDGcode()<< G4endl;
if ( strings->at(astring)->IsExcited() )
{
@@ -117,21 +117,21 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
generatedKineticTracks->insert(strings->at(astring)->GetKineticTrack());
}
// G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << endl;
// G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << G4endl;
if (generatedKineticTracks == NULL)
{
G4cout << "G4VPartonStringModel:No KineticTracks produced" << endl;
G4cout << "G4VPartonStringModel:No KineticTracks produced" << G4endl;
continue;
}
// if ( generatedKineticTracks->entries() == 1 )
// {
// G4cout << " Only one track created, mass "
// << generatedKineticTracks->at(0)->Get4Momentum().mag() << endl;
// << generatedKineticTracks->at(0)->Get4Momentum().mag() << G4endl;
//
// G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << endl;
// G4cout << " strings["<<astring<<"] Mass " << strings->at(astring)->Get4Momentum().mag() << endl;
// G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << G4endl;
// G4cout << " strings["<<astring<<"] Mass " << strings->at(astring)->Get4Momentum().mag() << G4endl;
//
// }
G4LorentzVector KTsum1;
@@ -143,34 +143,34 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
// G4cout << " Momentum/ Mass " <<
// (*generatedKineticTracks)[aTrack]->Get4Momentum() <<
// " / " << (*generatedKineticTracks)[aTrack]->Get4Momentum().mag()
// << endl;
// << G4endl;
// G4cout << " Position " <<
// (*generatedKineticTracks)[aTrack]->GetPosition()
// << endl;
// << G4endl;
}
// G4cout << " KTsum Momentum " << KTsum << endl;
// G4cout << " KTsum Mass " << KTsum.mag() << endl;
// G4cout << " KTsum Momentum " << KTsum << G4endl;
// G4cout << " KTsum Mass " << KTsum.mag() << G4endl;
if ( abs((KTsum1.e()-strings->at(astring)->Get4Momentum().e()) / KTsum1.e()) > perMillion )
{
NeedEnergyCorrector=true;
// G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << endl;
// G4cout << " strings["<<astring<<"] Mass " << strings->at(astring)->Get4Momentum().mag() << endl;
// G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << endl;
// G4cout << " strings["<<astring<<"] Momentum " << strings->at(astring)->Get4Momentum() << G4endl;
// G4cout << " strings["<<astring<<"] Mass " << strings->at(astring)->Get4Momentum().mag() << G4endl;
// G4cout <<" number of generated tracks : " << generatedKineticTracks->entries() << G4endl;
// for ( G4int bTrack=0; bTrack<generatedKineticTracks->entries();bTrack++)
// {
// G4cout << " Particle : " <<
// (*generatedKineticTracks)[bTrack]->GetDefinition()->GetParticleName()
// << endl;
// << G4endl;
// G4cout << " Momentum " <<
// (*generatedKineticTracks)[bTrack]->Get4Momentum()
// << endl;
// << G4endl;
// G4cout << " Mass " <<
// (*generatedKineticTracks)[bTrack]->Get4Momentum().mag()
// << endl;
// << G4endl;
// }
//
}
@@ -236,8 +236,8 @@ G4bool G4VPartonStringModel::EnergyAndMomentumCorrector(G4KineticTrackVector* Ou
if (Scale - 1 <= ErrLimit) goto LTRUE;
}
cout << "G4VPartonStringModel::EnergyAndMomentumCorrector"<<endl;
cout << " Increase number of attempts or increase ERRLIMIT"<<endl;
G4cout << "G4VPartonStringModel::EnergyAndMomentumCorrector"<<G4endl;
G4cout << " Increase number of attempts or increase ERRLIMIT"<<G4endl;
LTRUE:
// Compute c.m.s. interaction velocity and KTV back boost
source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VSplitableHadron.cc,v 1.1.8.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VStringFragmentation.cc,v 1.1.8.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4VStringFragmentation
#include "G4VStringFragmentation.hh"
source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ExcitedStringDecay.hh,v 1.1.10.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4ExcitedStringDecay_h
#define G4ExcitedStringDecay_h 1
source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LundStringFragmentation.hh,v 1.1.10.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $ Maxim Komogorov
// GEANT4 tag $Name: geant4-01-01 $ Maxim Komogorov
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4QGSMFragmentation.hh,v 1.2.8.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VKinkyStringDecay.hh,v 1.1.10.1 1999/12/07 20:51:55 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
// Maxim Komogorov
//
// -----------------------------------------------------------------------------
source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VLongitudinalStringDecay.hh,v 1.3.8.1 1999/12/07 20:51:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VLongitudinalStringDecay.hh,v 1.3.8.1.2.2 1999/12/09 16:59:03 gcosmo Exp $
// GEANT4 tag $Name: geant4-01-01 $
// Maxim Komogorov
//
// -----------------------------------------------------------------------------
@@ -105,7 +105,7 @@ public:
void update();
private:
SimpleString(){cout << " error calling bad ctor for class SimpleString"<< endl;};
SimpleString(){G4cout << " error calling bad ctor for class SimpleString"<< G4endl;}
SideOfString * left, * right;
SideOfString * decay, * stable;
source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ExcitedStringDecay.cc,v 1.1.10.1 1999/12/07 20:51:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4ExcitedStringDecay
source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LundStringFragmentation.cc,v 1.1.10.1 1999/12/07 20:51:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4QGSMFragmentation.cc,v 1.3.8.1 1999/12/07 20:51:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VKinkyStringDecay.cc,v 1.2.8.1 1999/12/07 20:51:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
// Maxim Komogorov
//
// -----------------------------------------------------------------------------
source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
+13 -13
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VLongitudinalStringDecay.cc,v 1.4.6.1 1999/12/07 20:51:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VLongitudinalStringDecay.cc,v 1.4.6.1.2.2 1999/12/10 15:42:07 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
// Maxim Komogorov
//
// -----------------------------------------------------------------------------
@@ -210,10 +210,10 @@ G4ParticleDefinition* G4VLongitudinalStringDecay::CreateHadron(G4int id1, G4int
G4int kflb = abs(ifl2);
G4int kflc = abs(ifl3);
G4int kfld = max(kfla,kflb);
kfld = max(kfld,kflc);
G4int kflf = min(kfla,kflb);
kflf = min(kflf,kflc);
G4int kfld = G4std::max(kfla,kflb);
kfld = G4std::max(kfld,kflc);
G4int kflf = G4std::min(kfla,kflb);
kflf = G4std::min(kflf,kflc);
G4int kfle = kfla + kflb + kflc - kfld - kflf;
//... barion with content uuu or ddd or sss has always spin = 4
@@ -286,8 +286,8 @@ G4ParticleDefinition * G4VLongitudinalStringDecay::SimpleString::Splitup(G4int &
//... sample quarks and Construct Diquark ifln
G4int i1 = theStringDecay->SampleQuarkFlavor();
G4int i2 = theStringDecay->SampleQuarkFlavor();
G4int i10 = max(i1,i2);
G4int i20 = min(i1,i2);
G4int i10 = G4std::max(i1,i2);
G4int i20 = G4std::min(i1,i2);
G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1 : 3;
QuarkEncoding = signdecayEncoding * (i10 * 1000 + i20 * 100 + spin);
NewDecayEncoding = -QuarkEncoding;
@@ -313,8 +313,8 @@ G4ParticleDefinition * G4VLongitudinalStringDecay::SimpleString::Splitup(G4int &
QuarkEncoding = -decayQuarkEncoding/abs(decayQuarkEncoding)*theStringDecay->SampleQuarkFlavor();
//... Build new Diquark
G4int i10 = max(abs(QuarkEncoding), abs(stableQuarkEncoding));
G4int i20 = min(abs(QuarkEncoding), abs(stableQuarkEncoding));
G4int i10 = G4std::max(abs(QuarkEncoding), abs(stableQuarkEncoding));
G4int i20 = G4std::min(abs(QuarkEncoding), abs(stableQuarkEncoding));
G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1 : 3;
NewDecayEncoding = -QuarkEncoding/abs(QuarkEncoding)*(i10 * 1000 + i20 * 100 + spin);
}
@@ -368,8 +368,8 @@ G4bool G4VLongitudinalStringDecay::SimpleString::SplitLast(G4KineticTrackVector
//... sample quarks and Construct Diquark ifln
G4int i1 = theStringDecay->SampleQuarkFlavor();
G4int i2 = theStringDecay->SampleQuarkFlavor();
G4int i10 = max(i1,i2);
G4int i20 = min(i1,i2);
G4int i10 = G4std::max(i1,i2);
G4int i20 = G4std::min(i1,i2);
G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1: 3;
QuarkEncoding = signLeftEncoding*(i10 * 1000 + i20 * 100 + spin);
}
@@ -660,7 +660,7 @@ G4ParticleDefinition* G4VLongitudinalStringDecay::FindParticle(G4int Encoding)
if (ptr == NULL) ptr = G4ParticleTable::GetParticleTable()->FindParticle(-Encoding);
if (ptr == NULL)
{
G4cout << "Particle with encoding "<<Encoding<<" does not exist!!!"<<endl;
G4cout << "Particle with encoding "<<Encoding<<" does not exist!!!"<<G4endl;
G4Exception("Check your particle table");
}
return ptr;
source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ExcitedString.hh,v 1.3.2.1.2.1 1999/12/07 20:51:57 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4ExcitedString_h

Some files were not shown because too many files have changed in this diff Show More