Import Geant4 10.5.0 source tree
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
|
||||
# -----------------------------------------------------------
|
||||
# GNUmakefile for hadronic library. JPW 2003.
|
||||
# -----------------------------------------------------------
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
$Id: History 108062 2017-12-19 15:18:27Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
==========================================================
|
||||
@@ -15,6 +14,16 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
20-Nov2018 A. Ribon hadr-partonstring-mgt-V10-04-03
|
||||
- Minor clean-up: no changes in the random sequence.
|
||||
|
||||
05-Nov-2018 G. V. Uzhinsky hadr-partonstring-mgt-V10-04-02
|
||||
- If something is bad in QGSM, G4VPartonStringModel.cc will return initial
|
||||
particle/nucleus. See line 150:
|
||||
if(strings->size() == 0) {Success=false; continue;}
|
||||
FTF instead of vector "strings" returns 0! Thus, a corresponding changes
|
||||
are introduced in FTF.
|
||||
|
||||
19-Dec-2017 G. Cosmo hadr-partonstring-mgt-V10-04-01
|
||||
- Fixed self-consistency in G4VertexCode header (missing #include).
|
||||
Thanks to Raphael Isemann for reporting this.
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4EventGenerator.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
#ifndef G4EventGenerator_h
|
||||
#define G4EventGenerator_h 1
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4InteractionCode.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
#ifndef G4InteractionCode_h
|
||||
#define G4InteractionCode_h 1
|
||||
|
||||
-46
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4InteractionContent.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
|
||||
#ifndef G4InteractionContent_h
|
||||
@@ -39,18 +38,9 @@
|
||||
// ------------------------------------------------------------
|
||||
|
||||
#include "globals.hh"
|
||||
|
||||
//#include "G4PhysicalConstants.hh" // Uzhi 8.09.2014
|
||||
//#include "G4SystemOfUnits.hh" // Uzhi 8.09.2014
|
||||
|
||||
#include "G4VSplitableHadron.hh"
|
||||
#include "G4Nucleon.hh"
|
||||
|
||||
//#define debug_QGSM
|
||||
#ifdef debug_QGSM
|
||||
#include "../../qgsm/include/G4QGSMSplitableHadron.hh"
|
||||
#include <deque>
|
||||
#endif
|
||||
|
||||
class G4InteractionContent
|
||||
{
|
||||
@@ -207,24 +197,6 @@ inline void G4InteractionContent::Dump()
|
||||
G4cout << theProjectile->GetDefinition()->GetPDGEncoding()
|
||||
<< " " << theProjectile->Get4Momentum()<< G4endl;
|
||||
mom+=theProjectile->Get4Momentum();
|
||||
#ifdef debug_QGSM
|
||||
G4QGSMSplitableHadron * at =(G4QGSMSplitableHadron*)theProjectile;
|
||||
std::deque<G4Parton *>color=at->GetColorPartons();
|
||||
std::deque<G4Parton *>anticolor=at->GetAntiColorPartons();
|
||||
G4cout << " proj. color/anti size " << color.size() << " / " << anticolor.size() << G4endl;
|
||||
std::deque<G4Parton *>::iterator p_iter;
|
||||
G4LorentzVector colmom(0.,0.,0.,0.);
|
||||
for ( p_iter=color.begin(); p_iter!= color.end(); ++p_iter){
|
||||
G4cout << "proj color : "<<(*p_iter)->GetPDGcode() << ", mom= "<< (*p_iter)->Get4Momentum()<<G4endl;
|
||||
colmom+=(*p_iter)->Get4Momentum();
|
||||
}
|
||||
G4LorentzVector anticolmom(0.,0.,0.,0.);
|
||||
for ( p_iter=anticolor.begin(); p_iter!= anticolor.end(); ++p_iter){
|
||||
G4cout << "proj antic : "<<(*p_iter)->GetPDGcode() << ", mom= "<< (*p_iter)->Get4Momentum()<<G4endl;
|
||||
anticolmom+=(*p_iter)->Get4Momentum();
|
||||
}
|
||||
G4cout << " proj. color/anti mom " << colmom << " / " << anticolmom << " Sum: " << colmom+anticolmom <<G4endl;
|
||||
#endif
|
||||
} else {
|
||||
G4cout << " none " << G4endl;
|
||||
}
|
||||
@@ -233,24 +205,6 @@ inline void G4InteractionContent::Dump()
|
||||
G4cout << "Target " << theTarget->GetDefinition()->GetPDGEncoding()
|
||||
<< " " << theTarget->Get4Momentum()<< G4endl;
|
||||
mom+=theTarget->Get4Momentum();
|
||||
#ifdef debug_QGSM
|
||||
G4QGSMSplitableHadron * at =(G4QGSMSplitableHadron*)theTarget;
|
||||
std::deque<G4Parton *>color=at->GetColorPartons();
|
||||
std::deque<G4Parton *>anticolor=at->GetAntiColorPartons();
|
||||
G4cout << " target color/anti size " << color.size() << " / " << anticolor.size() << G4endl;
|
||||
std::deque<G4Parton *>::iterator p_iter;
|
||||
G4LorentzVector colmom(0.,0.,0.,0.);
|
||||
for ( p_iter=color.begin(); p_iter!= color.end(); ++p_iter){
|
||||
G4cout << "target color : "<<(*p_iter)->GetPDGcode() << ", mom= "<< (*p_iter)->Get4Momentum()<<G4endl;
|
||||
colmom+=(*p_iter)->Get4Momentum();
|
||||
}
|
||||
G4LorentzVector anticolmom(0.,0.,0.,0.);
|
||||
for ( p_iter=anticolor.begin(); p_iter!= anticolor.end(); ++p_iter){
|
||||
G4cout << "target antic : "<<(*p_iter)->GetPDGcode() << ", mom= "<< (*p_iter)->Get4Momentum()<<G4endl;
|
||||
anticolmom+=(*p_iter)->Get4Momentum();
|
||||
}
|
||||
G4cout << " target color/anti mom " << colmom << " / " << anticolmom << " Sum: " << colmom+anticolmom <<G4endl;
|
||||
#endif
|
||||
} else {
|
||||
G4cout << " none " << G4endl;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4StringModel.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
#ifndef G4StringModel_h
|
||||
#define G4StringModel_h 1
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VParticipants.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
|
||||
#ifndef G4VParticipants_h
|
||||
|
||||
-1
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VPartonStringModel.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
#ifndef G4VPartonStringModel_h
|
||||
#define G4VPartonStringModel_h 1
|
||||
|
||||
-1
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VSplitableHadron.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
|
||||
#ifndef G4VSplitableHadron_h
|
||||
|
||||
-1
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VStringFragmentation.hh 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
#ifndef G4VStringFragmentation_h
|
||||
#define G4VStringFragmentation_h 1
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VertexCode.hh 108062 2017-12-19 15:18:27Z gcosmo $
|
||||
//
|
||||
#ifndef G4VertexCode_h
|
||||
#define G4VertexCode_h 1
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: sources.cmake 107870 2017-12-07 14:47:59Z gcosmo $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4EventGenerator.cc 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
// G4EventGenerator
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4InteractionContent.cc 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4StringModel.cc 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
// G4StringModel
|
||||
#include "G4StringModel.hh"
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VParticipants.cc 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
+1
-2
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VPartonStringModel.cc 107318 2017-11-08 16:27:32Z gcosmo $
|
||||
//
|
||||
//// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
@@ -147,7 +146,7 @@ G4KineticTrackVector * G4VPartonStringModel::Scatter(const G4Nucleus &theNucleus
|
||||
|
||||
strings = GetStrings();
|
||||
|
||||
if(strings == 0) {Success=false; continue;}
|
||||
if (strings->size() == 0) { Success=false; continue; }
|
||||
|
||||
G4double stringEnergy(0);
|
||||
SumStringMom=G4LorentzVector(0.,0.,0.,0.);
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VSplitableHadron.cc 107318 2017-11-08 16:27:32Z gcosmo $
|
||||
//
|
||||
|
||||
// ------------------------------------------------------------
|
||||
|
||||
-1
@@ -24,7 +24,6 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VStringFragmentation.cc 100828 2016-11-02 15:25:59Z gcosmo $
|
||||
//
|
||||
// G4VStringFragmentation
|
||||
#include "G4VStringFragmentation.hh"
|
||||
|
||||
Reference in New Issue
Block a user