Import Geant4 9.3.0 source tree
This commit is contained in:
+11
-3
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VPartonStringModel.cc,v 1.5 2007/01/24 10:29:30 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4VPartonStringModel.cc,v 1.6 2009/10/05 12:52:48 vuzhinsk Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -98,13 +98,13 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
|
||||
{
|
||||
throw G4HadronicException(__FILE__, __LINE__, "G4VPartonStringModel::Scatter(): fails to generate strings");
|
||||
}
|
||||
|
||||
theThis->Init(theNucleus,thePrimary);
|
||||
strings = GetStrings();
|
||||
}
|
||||
|
||||
G4KineticTrackVector * theResult = 0;
|
||||
G4double stringEnergy(0);
|
||||
|
||||
for ( unsigned int astring=0; astring < strings->size(); astring++)
|
||||
{
|
||||
// rotate string to lab frame, models have it aligned to z
|
||||
@@ -136,6 +136,14 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
|
||||
#endif
|
||||
|
||||
theResult = stringFragmentationModel->FragmentStrings(strings);
|
||||
/*
|
||||
G4cout<<"Size "<<theResult->size()<<G4endl;
|
||||
for ( unsigned int i=0; i < theResult->size(); i++)
|
||||
{
|
||||
|
||||
G4cout<<(*theResult)[i]->Get4Momentum()<<" "<<(*theResult)[i]->Get4Momentum().mag()<<G4endl;;
|
||||
}
|
||||
*/
|
||||
std::for_each(strings->begin(), strings->end(), DeleteString() );
|
||||
delete strings;
|
||||
|
||||
|
||||
+10
-5
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VSplitableHadron.cc,v 1.5 2008/05/19 13:03:20 vuzhinsk Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4VSplitableHadron.cc,v 1.7 2009/07/17 12:36:41 vuzhinsk Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
|
||||
// ------------------------------------------------------------
|
||||
@@ -41,12 +41,14 @@
|
||||
#include "G4VKineticNucleon.hh"
|
||||
|
||||
G4VSplitableHadron::G4VSplitableHadron()
|
||||
: theDefinition(NULL), TimeOfCreation(0.), theCollisionCount(0), isSplit(false) // Uzhi 8.05.08
|
||||
: theDefinition(NULL), TimeOfCreation(0.), theCollisionCount(0), // Uzhi 8.05.08
|
||||
Status(0), isSplit(false) // Uzhi 17.07.09
|
||||
{
|
||||
}
|
||||
|
||||
G4VSplitableHadron::G4VSplitableHadron(const G4ReactionProduct & aPrimary)
|
||||
: TimeOfCreation(0.), theCollisionCount(0), isSplit(false) // Uzhi 8.05.08
|
||||
: TimeOfCreation(0.), theCollisionCount(0), // Uzhi 8.05.08
|
||||
Status(0), isSplit(false) // Uzhi 17.07.09
|
||||
{
|
||||
theDefinition=aPrimary.GetDefinition();
|
||||
the4Momentum.setVect(aPrimary.GetMomentum());
|
||||
@@ -55,12 +57,13 @@ G4VSplitableHadron::G4VSplitableHadron(const G4ReactionProduct & aPrimary)
|
||||
|
||||
G4VSplitableHadron::G4VSplitableHadron(const G4Nucleon & aNucleon)
|
||||
{
|
||||
TimeOfCreation = 0.; // Uzhi 8.05.08
|
||||
TimeOfCreation = 0.; // Uzhi 8.05.08
|
||||
theCollisionCount= 0;
|
||||
isSplit = false;
|
||||
theDefinition =aNucleon.GetParticleType();
|
||||
the4Momentum =aNucleon.GetMomentum();
|
||||
thePosition =aNucleon.GetPosition();
|
||||
Status = 0; // Uzhi 17.07.09
|
||||
}
|
||||
|
||||
G4VSplitableHadron::G4VSplitableHadron(const G4VKineticNucleon * aNucleon)
|
||||
@@ -71,6 +74,7 @@ G4VSplitableHadron::G4VSplitableHadron(const G4VKineticNucleon * aNucleon)
|
||||
theDefinition =aNucleon->GetDefinition();
|
||||
the4Momentum =aNucleon->Get4Momentum();
|
||||
thePosition =aNucleon->GetPosition();
|
||||
Status = 0; // Uzhi 17.07.09
|
||||
}
|
||||
|
||||
G4VSplitableHadron::G4VSplitableHadron(const G4VSplitableHadron &right)
|
||||
@@ -81,6 +85,7 @@ G4VSplitableHadron::G4VSplitableHadron(const G4VSplitableHadron &right)
|
||||
theDefinition = right.GetDefinition();
|
||||
the4Momentum = right.Get4Momentum();
|
||||
thePosition = right.GetPosition();
|
||||
Status = 0; // Uzhi 17.07.09
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user