Import Geant4 1.1.0 source tree
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
//
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+2
-2
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+4
-4
@@ -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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user