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

Import Geant4 11.0.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4had_string
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string
#
# Intermediate level CMakeLists.txt - just process subdirectories
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
add_subdirectory(diffraction)
add_subdirectory(hadronization)
add_subdirectory(management)
add_subdirectory(qgsm)
source/processes/hadronic/models/parton_string/diffraction/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4had_string_diff
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4had_string_diff
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/processes/hadronic/models/parton_string/diffraction/GNUmakefile
-4
View File
@@ -22,10 +22,6 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/processes/hadronic/management/include/ \
-I$(G4BASE)/processes/hadronic/cross_sections/include/ \
-I$(G4BASE)/processes/hadronic/util/include \
-I$(G4BASE)/processes/hadronic/models/management/include \
-I$(G4BASE)/processes/hadronic/models/util/include \
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
source/processes/hadronic/models/parton_string/diffraction/History
+64 -54
View File
@@ -7,18 +7,28 @@
History file for hadronic/models/parton_string/diffraction directory
-------------------------------------------------------------
This file should be used to summarize modifications introduced in the
This file should be used to summarize modifications introduced in the
code and to keep track of all tags.
---------------------------------------------------------------
* Please list in reverse chronological order (last date on top)
---------------------------------------------------------------
16-Apr-2021 B, Morgan (hadr-string-diff-V10-07-01)
- Migrate build to modular CMake API
13-Apr-2021 A. Ribon (hadr-string-diff-V10-07-00)
- GNUmakefile, sources.cmake : removed the subdirectories
hadronic/models/management and hadronic/models/util
(that have been now deleted, with their classes moved to
hadronic/util and hadronic/management).
Clean-up of old directories no longer present.
14-Oct-2020 V. Ivanchenko (hadr-string-diff-V10-06-08)
- G4FTFModel - attempt to fix crash rarely observed in pion+proton
reaction: removed commented lines and unused variables; added
tolerance 1.e-10 for numerical computation; extended debug printout;
replace in all loops "i++" -> "++i"; cleaned-up sampling of Pt
replace in all loops "i++" -> "++i"; cleaned-up sampling of Pt
for residual nucleons - limit argument for G4Exp by 200 instead of 1e+9
29-Sep-2020 A. Ribon (hadr-string-diff-V10-06-07)
@@ -29,16 +39,16 @@ code and to keep track of all tags.
Vladimir Uzhinsky.
21-Sep-2020 J. Yarba (hadr-string-diff-V10-06-06)
- G4FTFParameters.cc : extend FTF configuration interface
to include parameters of quark exchange with and/or without
excitation, for baryon and pion projectiles
- G4FTFParameters.cc : extend FTF configuration interface
to include parameters of quark exchange with and/or without
excitation, for baryon and pion projectiles
16-Sep-2020 A. Ribon (hadr-string-diff-V10-06-05)
- G4FTFModel : quasi-elastic is not applied any longer when the target
nucleus has one nucleon and the projectile hadron is not an ion.
This avoids to double count elastic scattering (as reported by
This avoids to double count elastic scattering (as reported by
by Daria Prokhorova of NA61/SHINE in 158 GeV/c proton interactions
on liquid hydrogen: see bug report #2274).
on liquid hydrogen: see bug report #2274).
08-Sep-2020 A. Ribon (hadr-string-diff-V10-06-04)
- G4FTFAnnihilation : added initialization of 2-dimensional arrays as
@@ -89,7 +99,7 @@ code and to keep track of all tags.
taken in the method InitForInteraction.
15-Nov-2019 V. Ivanchenko (hadr-string-diff-V10-05-07)
- G4FTFParameters: fixed creation/destruction/use of Glauber-Gribov
- G4FTFParameters: fixed creation/destruction/use of Glauber-Gribov
cross section
14-Nov-2019 A. Ribon (hadr-string-diff-V10-05-06)
@@ -112,7 +122,7 @@ code and to keep track of all tags.
- G4ElasticHNScattering: improvement and simplification of the algorithm
of elastic scattering (before the masses of resonances were sampled,
now it is not needed any longer).
- G4FTFModel: improvement of the algorithm of string creation.
- G4FTFModel: improvement of the algorithm of string creation.
- Deleted G4DiffractiveHHScatterer : not used anywhere.
01-Aug-2019 A. Ribon (hadr-string-diff-V10-05-03)
@@ -162,13 +172,13 @@ code and to keep track of all tags.
12-Jun-2018 A. Ribon (hadr-string-diff-V10-04-08)
- G4FTFAnnihilation : code improvement of the Annihilate method
(no changes in physics output, but with possible differences
(no changes in physics output, but with possible differences
in the the random sequence, due to numerical effects caused by
re-ordering of operations).
05-Jun-2018 A. Ribon (hadr-string-diff-V10-04-07)
- G4FTFModel, G4DiffractiveExcitation : small code improvements
(no changes in physics output, but with possible differences
(no changes in physics output, but with possible differences
in the the random sequence, due to numerical effects caused by
re-ordering of operations).
@@ -186,10 +196,10 @@ code and to keep track of all tags.
"NumberOfTries" counter, which was increased twice).
22-Mar-2018 J. Yarba (hadr-string-diff-V10-04-03)
- Turn to false switches for A-dep in nuclear destruction for baryon projectile
- Turn to false switches for A-dep in nuclear destruction for baryon projectile
(lines 136 and 138 in G4FTFParameters.cc)
- Uncomment checks for these switches in the code (lines 1158-1161 & 1172-1175
in G4FTFParameters.cc)
- Uncomment checks for these switches in the code (lines 1158-1161 & 1172-1175
in G4FTFParameters.cc)
19-Dec-2017 V. Uzhinsky (hadr-string-diff-V10-04-02)
- Correct calculation of nuclear residual excitation energy is implemented.
@@ -199,7 +209,7 @@ code and to keep track of all tags.
- Cleaned and merged version of FTF (merged "stable" and developer versions).
07-Dec-2017 A. Ribon (hadr-string-diff-V10-04-00)
- Brought back the development version of FTF
- Brought back the development version of FTF
(as it was in hadr-string-diff-V10-03-05).
20-Nov-2017 A. Ribon (hadr-string-diff-V10-03-10)
@@ -209,9 +219,9 @@ code and to keep track of all tags.
- Minor clean-up and indentation: no changes in the random sequence.
1-Nov-2017 J. Yarba (hadr-string-diff-V10-03-08)
- Backported FTF/diffraction configuration interface
- Backported FTF/diffraction configuration interface
- for now, only baryon projectile
- Affected classes: G4FTFParameters, G4FTFModel
- Affected classes: G4FTFParameters, G4FTFModel
27-Oct-2017 A. Ribon (hadr-string-diff-V10-03-07)
- G4FTFAnnihilation : fixed unphysical neutrons at rest seen in annihilation.
@@ -255,7 +265,7 @@ code and to keep track of all tags.
27-June-2016 V. Uzhinsky (hadr-string-diff-V10-02-06)
Fine tuning of G4FTFParameters.cc.
13-June-2016 V. Uzhinsky (hadr-string-diff-V10-02-05)
Cleaned version of G4DiffractiveExcitation.cc
@@ -269,9 +279,9 @@ code and to keep track of all tags.
23-May-2016 V. Uzhinsky (hadr-string-diff-V10-02-02)
- Tunning of FTF model parameters has been done.
17-May-2016 V. Uzhinsky (hadr-string-diff-V10-02-01)
- FTF model was essential improved:
- FTF model was essential improved:
Smearing of Delta-isobar mass was introduced;
Delta-isobars are now treated as a kinetic track;
Parameterisation the quark exchange process with excitation is improved also.
@@ -281,7 +291,7 @@ code and to keep track of all tags.
5-May-2016 V. Uzhinsky (hadr-string-diff-V10-02-00)
- A bug was fixed in G4FTFModel for nucleus-nucleus interactions
if ( G4UniformRand() <
if ( G4UniformRand() <
( 1.0 - target->GetSoftCollisionCount() / MaxNumOfInelCollisions ) * // Uzhi March 2015
( 1.0 - projectile->GetSoftCollisionCount() / MaxNumOfInelCollisions ) ) {
@@ -306,13 +316,13 @@ code and to keep track of all tags.
13-Jul-2015 A. Dotti (hadr-string-diff-V10-01-11)
- Fixing coverity issues #14434, 20328
25-Jun-2015 A. Ribon (hadr-string-diff-V10-01-10)
25-Jun-2015 A. Ribon (hadr-string-diff-V10-01-10)
- G4FTFParameters : fixed Valgrind error of uninitialized variables.
29-May-2015 V. Uzhinsky (hadr-string-diff-V10-01-09)
29-May-2015 V. Uzhinsky (hadr-string-diff-V10-01-09)
- G4FTFModel : Elastic hN scattering is protected.
28-May-2015 A. Ribon (hadr-string-diff-V10-01-08)
28-May-2015 A. Ribon (hadr-string-diff-V10-01-08)
- G4FTFModel : fixed energy non-conservation in nucleus-nucleus interactions
in the method SamplingNucleonKinematics.
@@ -334,7 +344,7 @@ code and to keep track of all tags.
G4FTFModel.cc
LowEnergyLimit = 2000.0*MeV -> LowEnergyLimit = 1000.0*MeV;
G4FTFParameters.cc
G4FTFParameters.cc
A bug at Xnn calculations found by Alberto is fixed. The bug gives Xin=0 for projectile
nucleons in Nucl-Nucl interactions.
New methods - Set/Get CofNuclearDestructionPr(), for projectile nucleus were introduced,
@@ -349,10 +359,10 @@ code and to keep track of all tags.
G4FTFModel.cc
LowEnergyLimit = 2000.0*MeV -> LowEnergyLimit = 1000.0*MeV;
A smearing of the excitation energy associated with an involved nucleon is introduced.
A smearing of the excitation energy associated with an involved nucleon is introduced.
Look for // Uzhi April 2015
G4FTFParameters.cc
G4FTFParameters.cc
Evarage e* per wounded nucleon was to set 40 MeV for all interactions after analysis of
ITEP and Leray exp. data.
@@ -380,7 +390,7 @@ code and to keep track of all tags.
A problem of energy/momentum non-conservation in Xi- nucleus interactions is partly solved.
Energy/momentum is now conserved, but an acurate treatment of minimal difractive masses of
strange particles is needed.
strange particles is needed.
19-Nov-2014 V. Uzhinsky (hadr-string-diff-V10-00-10)
- 2 bugs are fixed. The first one was connected with multiple quark exchanges in hA interactions
@@ -427,7 +437,7 @@ connected with annihilations of anti-delta isobars is erased. Now
12-Aug-2014 A. Ribon (hadr-string-diff-V10-00-03)
- Postponed the previous, internal tag made by V. Uzhinsky.
- G4FTFModel : factorized the longest method, PutOnMassShell,
- G4FTFModel : factorized the longest method, PutOnMassShell,
without changing the results for hadron-nucleus, nucleus-nucleus,
anti_baryon-nucleus, and light anti_ion-nucleus interactions.
@@ -454,7 +464,7 @@ connected with annihilations of anti-delta isobars is erased. Now
16-Oct-2013 A. Ribon (hadr-string-diff-V09-06-17)
- First, minor improvement of the code: clean-up, indentation,
removal of tabs and consistent use of spaces.
removal of tabs and consistent use of spaces.
Neither changes of the algorithms nor of the physics.
31-Aug-2013 V. Uzhinsky (hadr-string-diff-V09-06-16)
@@ -475,7 +485,7 @@ connected with annihilations of anti-delta isobars is erased. Now
Results of FTF become close to QGSM, especially for heavy targets.
02-May-2013 A. Ribon (hadr-string-diff-V09-06-12)
- For thread safety, replaced CLHEP::RandFlat with G4RandFlat in
- For thread safety, replaced CLHEP::RandFlat with G4RandFlat in
G4DiffractiveExcitation.cc and G4FTFAnnihilation.cc.
21-Mar-2013 A. Ribon (hadr-string-diff-V09-06-11)
@@ -512,13 +522,13 @@ connected with annihilations of anti-delta isobars is erased. Now
19-Dec-2012 V. Uzhinsky (hadr-string-diff-V09-06-01)
- Unneeded print-out was closed. Stopping of particles in AA-interaction
below 2 GeV/N was blocked. Energy-momentum conservation in
below 2 GeV/N was blocked. Energy-momentum conservation in
AA-interactions was recovered.
18-Dec-2012 V. Uzhinsky (hadr-string-diff-V09-06-00)
- An interface for a manipulation with nucleus-nucleus interactions was
improved. A low energy limit of FTF model is lowered. Adjust method was
essential extended. It is expected that there will not be problem with
essential extended. It is expected that there will not be problem with
high energy interactions. Problem can be with anti-nuclei.
21-Nov-2012 V. Uzhinsky (hadr-string-diff-V09-05-19)
@@ -567,7 +577,7 @@ connected with annihilations of anti-delta isobars is erased. Now
-------------------------------------------------------------
12 June 2012, G.Folger (hadr-string-diff-V09-05-08)
- Fix sahdowing of variables,
- Fix sahdowing of variables,
affected files:G4FTFParameters.{hh,cc},G4FTFModel.cc,G4DiffractiveExcitation.cc
--------------------------------------------------------------------
@@ -584,7 +594,7 @@ connected with annihilations of anti-delta isobars is erased. Now
--------------------------------------------------------------------
31 May 2012, W.Pokorski (hadr-string-diff-V09-05-06)
---------------------------------------------------------------------
- slight change in the implementation of the static pointer for the
- slight change in the implementation of the static pointer for the
cross sections (to make it safer)
30 May 2012, W.Pokorski (hadr-string-diff-V09-05-05)
@@ -606,7 +616,7 @@ connected with annihilations of anti-delta isobars is erased. Now
11 May 2012, W.Pokorski (hadr-string-diff-V09-05-01)
---------------------------------------------------------------------
- G4FTFParameters uses the new G4ChipsComponentXS from
- G4FTFParameters uses the new G4ChipsComponentXS from
hadronic/cross_sections
May 5, 2012, Gunter Folger ( ..trunk.. )
@@ -619,7 +629,7 @@ May 5, 2012, Gunter Folger ( ..trunk.. )
Fix memory leak in G4FTFParticipants.cc
1 November 2011, V. Uzhinsky (hadr-string-diff-V09-04-09)
AjustNucleusFor Annih was closed in Get String. It is need to think
AjustNucleusFor Annih was closed in Get String. It is need to think
a little bit.
27 October 2011, V. Uzhinsky (hadr-string-diff-V09-04-08)
@@ -638,10 +648,10 @@ May 5, 2012, Gunter Folger ( ..trunk.. )
17 June 2011, G.Folger (hadr-string-diff-V09-04-05)
---------------------------------------------------------------------
In G4DiffractiveExcitation, fix warning from gcc 4.6 on "unused"
variable TestParticle from line 514 onwards; this is only assigned,
In G4DiffractiveExcitation, fix warning from gcc 4.6 on "unused"
variable TestParticle from line 514 onwards; this is only assigned,
but never used
10 June 2011, V. Uzhinsky (hadr-string-diff-V09-04-04)
Low energy limit of FTF is decreased.
---------------------------------------------------------------------
@@ -662,7 +672,7 @@ May 5, 2012, Gunter Folger ( ..trunk.. )
19 February 2011, V. Uzhinsky (hadr-string-diff-V09-04-00)
Energy-momentum conservation is improved in FTF annihilation.
A new method - "void G4FTFModel::AjustTargetNucleonForAnnihilation(
G4VSplitableHadron *SelectedTargetNucleon)
G4VSplitableHadron *SelectedTargetNucleon)
has been addded.
-------------------------------------------------------
15 Nov. 2010, V. Uzhinsky (hadr-string-diff-V09-03-04)
@@ -679,11 +689,11 @@ They will be re-tuned for heavy nuclei a little bit.
----------------------------------------------------
8 Sept 2010 G.Folger (hadr-string-diff-V09-03-02)
G4FTFModel.cc: use integer interace of G4Nucleus
G4FTFModel.cc: use integer interace of G4Nucleus
14 Jun 2010 G.Cosmo (hadr-string-diff-V09-03-01)
Added missing virtual destructor to G4DiffractiveHHScatterer.
15 Dec 2009 V.Uzhinsky (hadr-string-diff-V09-02-23)
Bug was fixed for Kaon + A interactions in G4DiffractiveExcitation.cc
@@ -705,16 +715,16 @@ They will be re-tuned for heavy nuclei a little bit.
9 Dec. 2009 V. Uzhinsky (hadr-string-diff-V09-03-00)
Crush found by Alberto with AveragePt2=0 is erased in FTF.
--------------------------------------------------------
6 Dec. 2009 V.Uzhinsky (hadr-string-diff-V09-02-19)
6 Dec. 2009 V.Uzhinsky (hadr-string-diff-V09-02-19)
Sampling of kinky string momentum is improved
25 November 2009, V. Uzhinsky (hadr-string-diff-V09-02-18)
Memory leak is erased in FTF at the end.
29 October 2009, V. Uzhinsky (hadr-string-diff-V09-02-17)
Warning meassage is erased for using slc5 compilator in FTFModel.cc
25 October 2009, V. Uzhinsky (hadr-string-diff-V09-02-16)
25 October 2009, V. Uzhinsky (hadr-string-diff-V09-02-16)
Excitation energy calculation of nuclear residuals is implemenred.
The interface to the G4PrecompoundModelInterface is improved.
----------------------------------------------------------
@@ -778,9 +788,9 @@ They will be re-tuned for heavy nuclei a little bit.
Bug was fixed in G4FTFModel.cc thank to A. Ribon
---------------------------------------------------------
9 July 2009 V. Uzhinsky (hadr-string-diff-V09-02-02)
- Charge-exchange was implemented for pn->np
- Charge-exchange was implemented for pn->np
elastic and inelastic interactions.
- Pion absorption by a nucleon was implemented.
- Pion absorption by a nucleon was implemented.
See comments marked by Uzhi 07.07.09
---------------------------------------------------------
19 December 08 V. Uzhinsky (hadr-string-diff-V09-02-01)
@@ -791,14 +801,14 @@ Bug was fixed in G4FTFModel.cc thank to A. Ribon
- Improvement of delete operators in FTF
5 December 08, V. Uzhinsky (hadr-string-diff-V09-01-03)
- Some objects did not erase in FTFModel desructor. These lead to memory
- Some objects did not erase in FTFModel desructor. These lead to memory
leak.
2 June 08, G.Folger (hadr-string-diff-V09-01-02)
- on branch geant4-09-01-patches_branch, fix compilation warning for unused
- on branch geant4-09-01-patches_branch, fix compilation warning for unused
variables in G4FTFModel.cc
?????????????????????????????? (hadr-string-diff-V09-01-01)
@@ -806,12 +816,12 @@ Bug was fixed in G4FTFModel.cc thank to A. Ribon
31 March 2008 V. Uzhinsky Tag : hadr-string-diff-V09-01-00
- G4FTFParameters.cc and G4FTFParameters.hh were copied from G4FTFCrossSection
corresponding files.
- New files - G4ElasticHNScattering have been added. They implement elastic
- New files - G4ElasticHNScattering have been added. They implement elastic
scattering of hadron in intra-nuclear collisions in FTF model.
- The corresponding changes have been done in G4FTFModel.cc and
- The corresponding changes have been done in G4FTFModel.cc and
G4FTFParticipants.cc
24 Apr 2007 Gunter Folger (hadr-string-diff-V08-02-00)
- merge in change done by ftf development.
- Created History file.
source/processes/hadronic/models/parton_string/diffraction/sources.cmake
+31 -66
View File
@@ -1,69 +1,34 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4had_string_diff
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4had_string_diff
#
# Sources description for a library.
# Lists the sources and headers of the code explicitly.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# - G4had_string_diff module build definition
#
# Define the Geant4 Module.
#
GEANT4_DEFINE_MODULE(NAME G4had_string_diff
HEADERS
G4DiffractiveExcitation.hh
G4DiffractiveSplitableHadron.hh
G4ElasticHNScattering.hh
G4FTFAnnihilation.hh
G4FTFModel.hh
G4FTFParameters.hh
G4FTFParticipants.hh
SOURCES
G4DiffractiveExcitation.cc
G4DiffractiveSplitableHadron.cc
G4ElasticHNScattering.cc
G4FTFAnnihilation.cc
G4FTFModel.cc
G4FTFParameters.cc
G4FTFParticipants.cc
GRANULAR_DEPENDENCIES
G4baryons
G4bosons
G4geometrymng
G4globman
G4had_mod_man
G4had_mod_util
G4had_string_diff
G4had_string_frag
G4had_string_man
G4hadronic_mgt
G4hadronic_util
G4hepnumerics
G4ions
G4leptons
G4materials
G4mesons
G4partman
G4procman
G4shortlived
G4track
G4volumes
GLOBAL_DEPENDENCIES
G4geometry
G4global
G4materials
G4particles
G4track
LINK_LIBRARIES
)
# List any source specific properties here
geant4_add_module(G4had_string_diff
PUBLIC_HEADERS
G4DiffractiveExcitation.hh
G4DiffractiveSplitableHadron.hh
G4ElasticHNScattering.hh
G4FTFAnnihilation.hh
G4FTFModel.hh
G4FTFParameters.hh
G4FTFParticipants.hh
SOURCES
G4DiffractiveExcitation.cc
G4DiffractiveSplitableHadron.cc
G4ElasticHNScattering.cc
G4FTFAnnihilation.cc
G4FTFModel.cc
G4FTFParameters.cc
G4FTFParticipants.cc)
geant4_module_link_libraries(G4had_string_diff
PUBLIC
G4baryons
G4globman
G4had_string_man
G4hadronic_util
G4hepgeometry
PRIVATE
G4had_string_frag
G4hadronic_xsect
G4heprandom
G4mesons
G4partman)
source/processes/hadronic/models/parton_string/hadronization/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4had_string_frag
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4had_string_frag
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/processes/hadronic/models/parton_string/hadronization/GNUmakefile
-3
View File
@@ -21,10 +21,7 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/processes/management/include \
-I$(G4BASE)/processes/hadronic/management/include/ \
-I$(G4BASE)/processes/hadronic/util/include \
-I$(G4BASE)/processes/hadronic/processes/include \
-I$(G4BASE)/processes/hadronic/cross_sections/include \
-I$(G4BASE)/processes/hadronic/models/management/include \
-I$(G4BASE)/processes/hadronic/models/util/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
-I$(G4BASE)/particles/management/include \
-I$(G4BASE)/particles/leptons/include \
source/processes/hadronic/models/parton_string/hadronization/History
+52 -42
View File
@@ -7,13 +7,23 @@
History file for hadronic/models/parton_string/hadronization directory
-------------------------------------------------------------
This file should be used to summarize modifications introduced in the
This file should be used to summarize modifications introduced in the
code and to keep track of all tags.
---------------------------------------------------------------
* Please list in reverse chronological order (last date on top)
---------------------------------------------------------------
16-Apr-2021 B. Morgan (had-hadronization-V10-07-01)
- Migrate build to modular CMake API
13-Apr-2021 A. Ribon (had-hadronization-V10-07-00)
- GNUmakefile, sources.cmake : removed the subdirectories
hadronic/models/management and hadronic/models/util
(that have been now deleted, with their classes moved to
hadronic/util and hadronic/management).
Removed also the useless dependency to hadronic/process.
19-Oct-2020 A. Ribon (had-hadronization-V10-06-08)
- G4VLongitudinalStringDecay : fix by Vladimir Uzhinsky in the method
ProduceOneHadron to remove an inconsistency in the treatment of
@@ -42,7 +52,7 @@ for various particles produced in pp interactions at 158 GeV/c):
rest frame) when the string direction is -1.
- G4FragmentingString : erased some inconsistencies.
- G4VLongitudinalStringDecay : clean-up.
08-Sep-2020 A. Ribon (had-hadronization-V10-06-05)
- G4VLongitudinalStringDecay : made the logic clearer for Coverity,
but without any effect on the results.
@@ -91,12 +101,12 @@ for various particles produced in pp interactions at 158 GeV/c):
23-Apr-2020 V. Ivanchenko (had-hadronization-V10-06-01)
- G4VLongitudinalStringDecay, G4QGSMFragmentation
G4LundStringFragmentation - fixed Coverity warnings - if fragmentation
G4LundStringFragmentation - fixed Coverity warnings - if fragmentation
at low energy is not possible always return flag "false"; initialise
with nullptr and not NULL
24-Feb-2020 V. Ivanchenko (had-hadronization-V10-06-00)
- G4VLongitudinalStringDecay, G4ExcitedStringDecay,
- G4VLongitudinalStringDecay, G4ExcitedStringDecay,
G4LundStringFragmentation - inherit from G4HadronicInteraction
destruction of these models end of run by hadron model store;
removed implementations of private operators.
@@ -105,12 +115,12 @@ for various particles produced in pp interactions at 158 GeV/c):
- G4ExcitedStringDecay : protection in the sampling of resonance masses
against values below threshold.
- G4LundStringFragmentation, G4QGSMFragmentation : in the method SplitEandP,
added a check that a string can be converted to an existing hadron
added a check that a string can be converted to an existing hadron
(else a null momentum is returned).
14-Nov-2019 A. Ribon (had-hadronization-V10-05-03)
- G4VLongitudinalStringDecay : forgotten initialization of c-cbar and b-bbar
pair production for kinks or gluons.
pair production for kinks or gluons.
07-Nov-2019 A. Ribon (had-hadronization-V10-05-02)
- Implementation, made by Vladimir Uzhinsky, of the fragmentation functions
@@ -150,8 +160,8 @@ for various particles produced in pp interactions at 158 GeV/c):
26-Oct-2018 V. Uzhinsky (had-hadronization-V10-04-05)
- G4LundStringFragmentation : tuning of strange - anti-strange probability
production as a function of energy to describe NA61/SHINE 31 GeV/c p-C
data on K+ / K- production. Decreased also the Lambda0 production for
production as a function of energy to describe NA61/SHINE 31 GeV/c p-C
data on K+ / K- production. Decreased also the Lambda0 production for
NA61/SHINE 158 GeV/c and 31 GeV/c p-C : for the former good agreement,
while for the latter the simulation underestimates the data.
- G4QGSMFragmentation : new algorithm for last string decay a-la Lund
@@ -174,7 +184,7 @@ for various particles produced in pp interactions at 158 GeV/c):
- Improved versions of LUND and QGS fragmentations.
07-Dec-2017 A. Ribon (had-hadronization-V10-04-00)
- Brought back the development version of hadronization
- Brought back the development version of hadronization
(as it was in had-hadronization-V10-03-07).
27-Oct-2017 A. Ribon (had-hadronization-V10-03-09)
@@ -212,7 +222,7 @@ for various particles produced in pp interactions at 158 GeV/c):
13-Jan-2017 V. Uzhinsky (had-hadronization-V10-03-03)
- Re-organized and cleaned G4LUNDStringFragmentatio.
The variant is tuned using NA49 exp. data on pp->p/pi/K +X.
The variant is tuned using NA49 exp. data on pp->p/pi/K +X.
14-Dec-2016 A. Ribon (had-hadronization-V10-03-02)
- After the release G4 10.3, with "stable" version, this tag brings back
@@ -267,13 +277,13 @@ for various particles produced in pp interactions at 158 GeV/c):
13-June-2016 V. Uzhinsky (had-hadronization-V10-02-06)
G4LundStringFragmentation::Sample4Momentum() was improved.
Average transvers momentum is set to 475 MeV for mesons and baryons,
and <Pt> for barion 3/2 production - 800 MeV/c.
and <Pt> for barion 3/2 production - 800 MeV/c.
G4LundStringFragmentation::GetLightConeZ - alund=0.233 GeV^2 for strange
meson produced by a quark, and alund=0.175 GeV^2 for q->baryon.
di-quark fragmentation function into baryon (1/2) z^1.5, and z^(-0.25)
for baryon (3/2).
for baryon (3/2).
Note: the tag was made accidentally in the wrong directory (src/).
6-June-2016 V. Uzhinsky (had-hadronization-V10-02-05)
@@ -285,7 +295,7 @@ for various particles produced in pp interactions at 158 GeV/c):
and <Pt> for barion 3/2 production - 900 MeV/c.
1-June-2016 V. Uzhinsky (had-hadronization-V10-02-03)
Fine tuning of G4LundStringFragmentation.cc. <Pt> of mesons created at
Fine tuning of G4LundStringFragmentation.cc. <Pt> of mesons created at
quark fragmentation is decreased. <Pt> of baryons created at quark and
diquark is increased. Fragmentation functions of qq-> B(1/2) and B(3/2)
are implemented correctly.
@@ -313,7 +323,7 @@ for various particles produced in pp interactions at 158 GeV/c):
5-Aug-2015 A. Ribon (had-hadronization-V10-01-07)
- G4VLongitudinalStringDecay, G4LundStringFragmentation, G4QGSMFragmentation:
replaced std::exp, std::log and std::pow with the faster
replaced std::exp, std::log and std::pow with the faster
G4Exp, G4Log and G4Pow, respectively.
This changes the random number sequence.
@@ -324,9 +334,9 @@ for various particles produced in pp interactions at 158 GeV/c):
4-June-2015 V. Uzhinsky (had-hadronization-V10-01-05)
- G4QGSMFragmentation::SplitEandP a bug is fixed which led to energy-momentum
non-conservation quite rare.
non-conservation quite rare.
FragmentationMass(NewString,&G4HadronBuilder::BuildHighSpin);
was changed into
was changed into
FragmentationMass(NewString,&G4HadronBuilder::BuildLowSpin);
See Uzhi 03.06.2014
@@ -337,8 +347,8 @@ for various particles produced in pp interactions at 158 GeV/c):
29-May-2015 V. Uzhinsky (had-hadronization-V10-01-03)
- G4LundStringFragmentation - a bug led to FPE is erased. It was in
G4LundStringFragmentation::FragmentString --
if(!IsFragmentable(&aString)) // produce 1 hadron
G4LundStringFragmentation::FragmentString --
if(!IsFragmentable(&aString)) // produce 1 hadron
was applied to qq- anti_qq string with mass 1951 MeV, and there was an attempt
to produce 2 baryons without of a checking baryon masses. I am afraid
that it was presented before.
@@ -357,7 +367,7 @@ for various particles produced in pp interactions at 158 GeV/c):
28-Nov-2014 V. Uzhinsky (had-hadronization-V10-00-13)
- G4LundStringFragmentation - charged baryon number conservation is fixed
for K-nucleus interactions
for K-nucleus interactions
6-Nov-2014 V. Uzhinsky (had-hadronization-V10-00-12)
- Warning message is erased.
@@ -367,16 +377,16 @@ for various particles produced in pp interactions at 158 GeV/c):
instead of top directory - hadronization.
3-Nov-2014 V. Uzhinsky (had-hadronization-V10-00-10)
- G4ExcitedStringDecay.cc Restoration of the initial string system is addded
- G4ExcitedStringDecay.cc Restoration of the initial string system is addded
for a correct repeatition of calculations in the case when hadronization is fault.
- G4LundStringFragmentation.cc Fragmentation functions for qq -> B are set as
- G4LundStringFragmentation.cc Fragmentation functions for qq -> B are set as
f(z)~ Const for all baryons.
20-Oct-2014 A.Ribon (had-hadronization-V10-00-09)
20-Oct-2014 A.Ribon (had-hadronization-V10-00-09)
- G4VLongitudinalStringDecay.cc : mixing between the vector mesons
rho0 and omega have been changed from 50% (rho0) - 50% (omega) to
100% (rho0) - 0% (omega), in order to reduce the pi0 production.
100% (rho0) - 0% (omega), in order to reduce the pi0 production.
Expected little effects in thin-target, and significant effects
in hadronic showers in calorimeters.
@@ -387,12 +397,12 @@ for various particles produced in pp interactions at 158 GeV/c):
re-written. Ionk algorithm is inserted for sampling light-cone momentum
fraction, z. Parameters of the fragmentation were tuned. They will be
improved after a revision of the QGSM string creation algorithm.
- The algorith of G4QGSMFragmentation::SplitEandP was improved. It is
- The algorith of G4QGSMFragmentation::SplitEandP was improved. It is
faster now.
29-Sep-2014, V.Uzhinsky (had-hadronization-V10-00-07)
- Essential improvement of hadronization.
- Parameters and string fragmentation functions of
- Parameters and string fragmentation functions of
G4LundStringFragmentation.cc were tuned, assuming that the weight of
uu-diquarks in protons is 1/6.
- Threatment of string decay direction was improved in G4FragmentingString.cc
@@ -415,7 +425,7 @@ for various particles produced in pp interactions at 158 GeV/c):
- Bug is fixed in G4LundStringFragmentation.cc for anti-diquark-diquark strings.
- Anisotropic decay is only left in G4LundStringFragmentation::Sample4Momentum for
a sampling of momenta of 2 last produced hadrons for all strings. Before this,
quark-diquark strings were decayed isotropically. It is improve a little bit
quark-diquark strings were decayed isotropically. It is improve a little bit
proton spectra.
25-May-2014, V. Uzhinsky (had-hadronization-V10-00-03)
@@ -440,7 +450,7 @@ for various particles produced in pp interactions at 158 GeV/c):
4-dimensional vector in G4LundStringFragmentation.cc .
29-July-2013, H.Kurashige (had-hadronization-V09-06-01)
- Remove inclusion of G4ShortLivedTable.hh (G4VLongitudinalStringDecay.cc)
- Remove inclusion of G4ShortLivedTable.hh (G4VLongitudinalStringDecay.cc)
02-May-2013, A.Ribon (had-hadronization-V09-06-00)
- For thread safety, replaced CLHEP::RandFlat with G4RandFlat in
@@ -464,12 +474,12 @@ for various particles produced in pp interactions at 158 GeV/c):
- fix warnings on shadowed variables, affected G4LundStringFragmentation.cc
25-May-2012, G.Folger (had-hadronization-V09-05-02)
- make copy ctor, =, == , and != operators private without implementation,
- make copy ctor, =, == , and != operators private without implementation,
fixing coverity warnings
21 May 2012, Vladimir Uzhinsky (had-hadronization-V09-05-01)
- Probabilities of s-sbar quark pairs and qq-qqbar diquark pairs
are changed in G4LundStringFragmentation for a description of
are changed in G4LundStringFragmentation for a description of
the NA49 collaboration data.
12-Apr-2012, G.Folger (had-hadronization-V09-05-00)
@@ -490,14 +500,14 @@ for various particles produced in pp interactions at 158 GeV/c):
to make the code easier to understand and maintain.
02 Nov 2011, Alberto Ribon, svn rev 53955
- Made public the virtual method G4LundStringFragmentation::FragmentString.
- Made public the virtual method G4LundStringFragmentation::FragmentString.
Clean up also old commented lines in two G4LundStringFragmentation
methods: StopFragmenting and FragmentString.
1 Nov 2011, Gunter Folger, svn rev 53895
- G4LundStringFragmentation: simplify GetLightConeZ()
29 Sep 2011, Gunter Folger, svn rev 52604
29 Sep 2011, Gunter Folger, svn rev 52604
- G4LundStringFragmentation: Cleanup indentation
19 Jul 2011, Gunter Folger (had-hadronization-V09-04-02)
@@ -508,7 +518,7 @@ for various particles produced in pp interactions at 158 GeV/c):
One outstanding warning in G4LundStringFragmentation::Splitlast().
3 Nov 2010, Gunter Folger (had-hadronization-V09-03-02)
- fix minor coverity warnings in G4HadronBuilder
- fix minor coverity warnings in G4HadronBuilder
22-September-2010 V. Uzhinsky (had-hadronization-V09-03-01)
--------------------------------------------------------------
@@ -516,7 +526,7 @@ for various particles produced in pp interactions at 158 GeV/c):
20-September-2010 V. Uzhinsky
------------------------------
- Phase space restrictions are introduced at small mass string
- Phase space restrictions are introduced at small mass string
fragmentation.
5-August-2010 V. Uzhinsky
@@ -524,7 +534,7 @@ for various particles produced in pp interactions at 158 GeV/c):
- Small re-organization is done in G4ExcitedStringDecay.hh. Inline
methods were moved to G4ExcitedStringDecay.cc.
- An action is introduced in FragmentStrings. It acts when
- An action is introduced in FragmentStrings. It acts when
EnergyAndMomentumCorrector can not be done due to large sum masses
of produced hadrons. This led to energy-momentum violation. Now
string fragmentation is repeted 100 times in a bad case.
@@ -555,20 +565,20 @@ for various particles produced in pp interactions at 158 GeV/c):
- remove temporary workaround - fix is now in QGS
- change pt sampling in G4LundStringFragmentation to avoid near endless
loop; this should improve overall performance slightly.
Affected G4VLongitudinalStringDecay, where SampleQuarkPt() is
implemented; affected .hh and .cc for new optional argument of max Pt
Affected G4VLongitudinalStringDecay, where SampleQuarkPt() is
implemented; affected .hh and .cc for new optional argument of max Pt
to SampleQuarkPt()
18-May-2009 Gunter Folger (had-hadronization-V09-02-00)
---------------------------------------------------------------------
- reset formatting changes by MK with tags hadr-prtn-hadr-V09-02-xx
- temporary workaround for wrong PDG codes created on wrong input from QGS
- temporary workaround for wrong PDG codes created on wrong input from QGS
when used for e.g. antiproton.
2-May 2007 Gunter Folger (had-hadronization-V08-02-03)
---------------------------------------------------------------------
- G4ExcitedStringDecay.hh: protect againt divide by 0 when KTsum1.e() is 0.
- G4ExcitedStringDecay.hh: protect againt divide by 0 when KTsum1.e() is 0.
24-April 2007 Gunter Folger (had-hadronization-V08-02-02)
---------------------------------------------------------------------
- Seperate FTF and QGS fragmentation dir methods where V.Uzhinsky
@@ -576,9 +586,9 @@ for various particles produced in pp interactions at 158 GeV/c):
2-March 2007 Gunter Folger (had-hadronization-V08-02-01)
---------------------------------------------------------------------
- G4ExcitedStringDecay::EnergyAndMomentumCorrector no longer causes Exception
- G4ExcitedStringDecay::EnergyAndMomentumCorrector no longer causes Exception
when no converging. Add more info when failing. Return correct status.
24-Jan 2007 Gunter Folger (had-hadronization-V08-02-00)
--------------------------------------------------------------
- G4ExcitedStringDecay::EnergyAndMomentumCorrector :
source/processes/hadronic/models/parton_string/hadronization/sources.cmake
+29 -64
View File
@@ -1,67 +1,32 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4had_string_frag
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4had_string_frag
#
# Sources description for a library.
# Lists the sources and headers of the code explicitly.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# - G4had_string_frag module build definition
#
# Define the Geant4 Module.
#
GEANT4_DEFINE_MODULE(NAME G4had_string_frag
HEADERS
G4ExcitedStringDecay.hh
G4FragmentingString.hh
G4HadronBuilder.hh
G4LundStringFragmentation.hh
G4QGSMFragmentation.hh
G4VLongitudinalStringDecay.hh
SOURCES
G4ExcitedStringDecay.cc
G4FragmentingString.cc
G4HadronBuilder.cc
G4LundStringFragmentation.cc
G4QGSMFragmentation.cc
G4VLongitudinalStringDecay.cc
GRANULAR_DEPENDENCIES
G4baryons
G4bosons
G4geometrymng
G4globman
G4had_mod_man
G4had_mod_util
G4had_string_man
G4hadronic_mgt
G4hadronic_proc
G4hadronic_util
G4hadronic_xsect
G4hepnumerics
G4ions
G4leptons
G4materials
G4mesons
G4partman
G4procman
G4shortlived
G4track
G4volumes
GLOBAL_DEPENDENCIES
G4geometry
G4global
G4materials
G4particles
G4track
LINK_LIBRARIES
)
# List any source specific properties here
geant4_add_module(G4had_string_frag
PUBLIC_HEADERS
G4ExcitedStringDecay.hh
G4FragmentingString.hh
G4HadronBuilder.hh
G4LundStringFragmentation.hh
G4QGSMFragmentation.hh
G4VLongitudinalStringDecay.hh
SOURCES
G4ExcitedStringDecay.cc
G4FragmentingString.cc
G4HadronBuilder.cc
G4LundStringFragmentation.cc
G4QGSMFragmentation.cc
G4VLongitudinalStringDecay.cc)
geant4_module_link_libraries(G4had_string_frag
PUBLIC
G4globman
G4had_string_man
G4hadronic_mgt
G4hadronic_util
G4hepgeometry
G4partman
PRIVATE
G4heprandom
G4procman
G4shortlived
G4track)
source/processes/hadronic/models/parton_string/management/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4had_string_man
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4had_string_man
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/processes/hadronic/models/parton_string/management/GNUmakefile
-2
View File
@@ -21,8 +21,6 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/processes/management/include \
-I$(G4BASE)/processes/hadronic/management/include/ \
-I$(G4BASE)/processes/hadronic/util/include \
-I$(G4BASE)/processes/hadronic/models/management/include \
-I$(G4BASE)/processes/hadronic/models/util/include \
-I$(G4BASE)/particles/management/include \
-I$(G4BASE)/particles/leptons/include \
-I$(G4BASE)/particles/bosons/include \
source/processes/hadronic/models/parton_string/management/History
+9
View File
@@ -14,6 +14,15 @@ code and to keep track of all tags.
* Please list in reverse chronological order (last date on top)
---------------------------------------------------------------
16-Apr-2021 Ben Morgan hadr-partonstring-mgt-V10-07-01
- Migrate build to modular CMake API
13-Apr-2021 A. Ribon hadr-partonstring-mgt-V10-07-00
- GNUmakefile, sources.cmake : removed the subdirectories
hadronic/models/management and hadronic/models/util
(that have been now deleted, with their classes moved to
hadronic/util and hadronic/management).
29-Oct-2020 B. Morgan hadr-partonstring-mgt-V10-06-03
- Remove inclusion of obsolete CMake module
source/processes/hadronic/models/parton_string/management/sources.cmake
+25 -61
View File
@@ -1,64 +1,28 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4had_string_man
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4had_string_man
#
# Sources description for a library.
# Lists the sources and headers of the code explicitly.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# - G4had_string_man module build definition
#
# Define the Geant4 Module.
#
GEANT4_DEFINE_MODULE(NAME G4had_string_man
HEADERS
G4InteractionContent.hh
G4StringModel.hh
G4VParticipants.hh
G4VPartonStringModel.hh
G4VSplitableHadron.hh
G4VStringFragmentation.hh
SOURCES
G4InteractionContent.cc
G4StringModel.cc
G4VParticipants.cc
G4VPartonStringModel.cc
G4VSplitableHadron.cc
G4VStringFragmentation.cc
GRANULAR_DEPENDENCIES
G4baryons
G4bosons
G4geometrymng
G4globman
G4had_mod_man
G4had_mod_util
G4hadronic_mgt
G4hadronic_util
G4hepnumerics
G4ions
G4leptons
G4materials
G4mesons
G4partman
G4procman
G4shortlived
G4track
G4volumes
GLOBAL_DEPENDENCIES
G4geometry
G4global
G4materials
G4particles
G4track
LINK_LIBRARIES
)
# List any source specific properties here
geant4_add_module(G4had_string_man
PUBLIC_HEADERS
G4InteractionContent.hh
G4StringModel.hh
G4VParticipants.hh
G4VPartonStringModel.hh
G4VSplitableHadron.hh
G4VStringFragmentation.hh
SOURCES
G4InteractionContent.cc
G4StringModel.cc
G4VParticipants.cc
G4VPartonStringModel.cc
G4VSplitableHadron.cc
G4VStringFragmentation.cc)
geant4_module_link_libraries(G4had_string_man
PUBLIC
G4globman
G4hadronic_mgt
G4hadronic_util
G4hepgeometry
G4partman
PRIVATE
G4shortlived)
source/processes/hadronic/models/parton_string/qgsm/CMakeLists.txt
-17
View File
@@ -1,17 +0,0 @@
#------------------------------------------------------------------------------
# CMakeLists.txt
# Module : G4hadronic_qgstring
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4hadronic_qgstring
#
# CMakeLists.txt for building a single granular library.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
if(GEANT4_BUILD_GRANULAR_LIBS)
include(Geant4MacroLibraryTargets)
GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
endif()
source/processes/hadronic/models/parton_string/qgsm/GNUmakefile
-3
View File
@@ -21,11 +21,8 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/processes/management/include \
-I$(G4BASE)/processes/hadronic/management/include \
-I$(G4BASE)/processes/hadronic/util/include \
-I$(G4BASE)/processes/hadronic/processes/include \
-I$(G4BASE)/processes/hadronic/cross_sections/include \
-I$(G4BASE)/processes/hadronic/models/management/include \
-I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
-I$(G4BASE)/processes/hadronic/models/util/include \
-I$(G4BASE)/particles/management/include \
-I$(G4BASE)/particles/leptons/include \
-I$(G4BASE)/particles/bosons/include \
source/processes/hadronic/models/parton_string/qgsm/History
+30 -20
View File
@@ -7,13 +7,23 @@
History file for hadronic/models/parton_string/qgsm directory
-------------------------------------------------------------
This file should be used to summarize modifications introduced in the
This file should be used to summarize modifications introduced in the
code and to keep track of all tags.
---------------------------------------------------------------
* Please list in reverse chronological order (last date on top)
---------------------------------------------------------------
16-Apr-2021 Ben Morgan (hadr-qgsm-V10-07-01)
- Migrate build to modular CMake API
13-Apr-2021 A. Ribon (hadr-qgsm-V10-07-00)
- GNUmakefile, sources.cmake : removed the subdirectories
hadronic/models/management and hadronic/models/util
(that have been now deleted, with their classes moved to
hadronic/util and hadronic/management).
Removed also the useless dependency to hadronic/process.
17-Oct-2020 V.Ivanchenko (hadr-qgsm-V10-06-06)
- G4QGSParticipants - added protection for G4Exp (fixing outstanding
precision lost in gamma+proton interactions)
@@ -60,18 +70,18 @@ Two, unrelated changes made by Vladimir Uzhinsky :
'double' to 'size_t' (to avoid warnings seen on Windows).
19-Nov-2019 A. Ribon (hadr-qgsm-V10-05-02)
- G4VAnnihilationCrossSection, G4AnnihilationCrossSection,
- G4VAnnihilationCrossSection, G4AnnihilationCrossSection,
G4GammaAnnCrossSection, G4ASCCrossSection, G4QGSMParameters :
deleted unused classes.
24-Oct-2019 A. Ribon (hadr-qgsm-V10-05-01)
- G4Reggeons: Vladimir Uzhinsky extension of the class for charmed and
bottom hadrons following ideas of Grichine's implementation of
bottom hadrons following ideas of Grichine's implementation of
Glauber-Gribov heavy hadron - nucleon cross sections.
02-Apr-2019 A. Ribon (hadr-qgsm-V10-05-00)
- G4QGSParticipants : bug-fix (made by Vladimir Uzhinsky) in the
computation of the transverse mass in the method
- G4QGSParticipants : bug-fix (made by Vladimir Uzhinsky) in the
computation of the transverse mass in the method
G4QGSParticipants::DeterminePartonMomenta() .
20-Nov-2018 A. Ribon (hadr-qgsm-V10-04-08)
@@ -83,7 +93,7 @@ Two, unrelated changes made by Vladimir Uzhinsky :
25-Oct-2018 V. Uzhinsky (hadr-qgsm-V10-04-06)
- G4Reggeons.cc : Cross sections of K-meson - nucleon interactions are
improved. Pomeron and 2 non-vacuum exchanges are accounted. Initial
improved. Pomeron and 2 non-vacuum exchanges are accounted. Initial
parameters for Kaons are taken from Kaidalov's paper (1976).
Gamma-nucleon cross sections are improved due to simple tunning of
@@ -94,7 +104,7 @@ Two, unrelated changes made by Vladimir Uzhinsky :
05-Feb-2018 A. Ribon (hadr-qgsm-V10-04-04)
- G4QGSParticipants : introduced protection against negative squared mass
in method PutOnMassShell(), which was causing some rare crashes.
in method PutOnMassShell(), which was causing some rare crashes.
If a negative squared mass occurs, a "JustWarning" exception is thrown
and the squared mass is set to 0, before calling the square root (which
is now computed only once).
@@ -112,7 +122,7 @@ Two, unrelated changes made by Vladimir Uzhinsky :
Thanks to Raphael Isemann for reporting this.
07-Dec-2017 A. Ribon (hadr-qgsm-V10-04-00)
- Brought back the development version of QGS
- Brought back the development version of QGS
(as it was in hadr-qgsm-V10-03-04).
26-Oct-2017 A. Ribon (hadr-qgsm-V10-03-05)
@@ -160,7 +170,7 @@ Two, unrelated changes made by Vladimir Uzhinsky :
RRR diagram of Reggeon phenomenology. For implementation of the processes, a new class -
G4QuarkExchange, was created.
Main changes are in G4QGSParticipants.cc.
Main changes are in G4QGSParticipants.cc.
10-20 Implementation of Quark exchange simulation.
7-9 Oct. Creation and testing G4Reggeons.
@@ -212,7 +222,7 @@ Two, unrelated changes made by Vladimir Uzhinsky :
checking of 'while' loops.
05 August 2015 Alberto Ribon (hadr-qgsm-V10-01-12)
G4ASCCrossSection, G4QGSMSplitableHadron, G4QGSParticipants,
G4ASCCrossSection, G4QGSMSplitableHadron, G4QGSParticipants,
G4SingleDiffractiveExcitation and G4QGSDiffractiveExcitation:
replaced std::exp, std::log and std::pow with the faster
G4Exp, G4Log and G4Pow, respectively.
@@ -244,7 +254,7 @@ Two, unrelated changes made by Vladimir Uzhinsky :
theNucleus->StartLoop();
G4Nucleon * pNucleon =0; // theNucleus->GetNextNucleon(); // Uzhi 27.05.2015
while( (pNucleon = theNucleus->GetNextNucleon()) )
while( (pNucleon = theNucleus->GetNextNucleon()) )
....
22 May 2015 Vladimir Uzhinsky (hadr-qgsm-V10-01-06)
@@ -258,8 +268,8 @@ Two, unrelated changes made by Vladimir Uzhinsky :
A bug is fixed in G4QGSParticipants for gamma projectile.
19 May 2015 Vladimir Uzhinsky (hadr-qgsm-V10-01-03)
To avoid double deletion erasing of TheInvolvedNucleonsOfTarget and
TheInvolvedNucleonsOfProjectile was closed in G4QGSParticipants::~G4QGSParticipants().
To avoid double deletion erasing of TheInvolvedNucleonsOfTarget and
TheInvolvedNucleonsOfProjectile was closed in G4QGSParticipants::~G4QGSParticipants().
15 May 2015 Vladimir Uzhinsky (hadr-qgsm-V10-01-02)
A bug was erased in G4SPBaryon.cc: setting of Delta0 isobar splitting
@@ -335,27 +345,27 @@ Two, unrelated changes made by Vladimir Uzhinsky :
- G4QGSParticipants: reduce energy of participant nucleons by binding energy.
This increases excitation energy, as calculated by initial-final. Without
this, excitation E often is close to 0, or negative.
01 Jun 2011, G.Folger (hadr-qgsm-V09-04-01)
-----------------------------------------------------
- Fix compilation warnings, gcc4.6, on alost unused variables. Move
- Fix compilation warnings, gcc4.6, on alost unused variables. Move
"debug" variables into #ifdef
17 Mar 2011, G.Folger (hadr-qgsm-V09-04-00)
-----------------------------------------------------
- set limits for E/p checking
8 Sep 2010, G.Folger (hadr-qgsm-V09-03-01)
-----------------------------------------------------
- G4QGSModel.icc: use integer (A,Z) interface of nucleus
- G4QGSModel.icc: use integer (A,Z) interface of nucleus
12-Mar-2010, G.Folger (hadr-qgsm-V09-03-00)
- remove G4PartonStringAnnihilator.{hh,cc} not used anywhere
19 May 2009, G.Folger (hadr-qgsm-V09-02-02)
-----------------------------------------------------
- fix in G4SPBaryon: for antibaryon, a diquark & quark was given instead of
anti-diquark & antiquark; note the reverse order, too.
- fix in G4SPBaryon: for antibaryon, a diquark & quark was given instead of
anti-diquark & antiquark; note the reverse order, too.
Fixes problems with incident anti baryons, e.g. antiproton, manifesting
in problems with forming hadrons.
@@ -365,7 +375,7 @@ Very important bug fix in G4QGSParticipants.cc to let QGSC working from E=0
Added by GF (19-May-09):
- this very important "bug" fix modifies G4G4QGSParticipants.cc and
G4GammaParticipants.cc:
changing the value of Threshold from 0.45 GeV to 0.GeV,
changing the value of Threshold from 0.45 GeV to 0.GeV,
and disables an Exception if s < sqr(total mass + Threshold)
15 Sep 2008 G.Folger (hadr-qgsm-V09-01-01)
source/processes/hadronic/models/parton_string/qgsm/sources.cmake
+45 -82
View File
@@ -1,85 +1,48 @@
#------------------------------------------------------------------------------
# sources.cmake
# Module : G4hadronic_qgstring
# Package: Geant4.src.G4processes.G4hadronic.G4hadronic_models.G4had_string.G4hadronic_qgstring
#
# Sources description for a library.
# Lists the sources and headers of the code explicitly.
# Lists include paths needed.
# Lists the internal granular and global dependencies of the library.
# Source specific properties should be added at the end.
#
# Generated on : 24/9/2010
#
#
#------------------------------------------------------------------------------
# - G4hadronic_qgstring module build definition
#
# Define the Geant4 Module.
#
GEANT4_DEFINE_MODULE(NAME G4hadronic_qgstring
HEADERS
G4BaryonSplitter.hh
G4DiffractiveStringBuilder.hh
G4GammaParticipants.hh
G4MesonSplitter.hh
G4PartonPair.hh
G4QGSDiffractiveExcitation.hh
G4QGSMSplitableHadron.hh
G4QGSModel.hh
G4QGSModel.icc
G4QGSParticipants.hh
G4QuarkExchange.hh
G4Reggeons.hh
G4SPBaryon.hh
G4SPBaryonTable.hh
G4SingleDiffractiveExcitation.hh
G4SoftStringBuilder.hh
G4SPPartonInfo.hh
SOURCES
G4BaryonSplitter.cc
G4DiffractiveStringBuilder.cc
G4GammaParticipants.cc
G4MesonSplitter.cc
G4PartonPair.cc
G4QGSDiffractiveExcitation.cc
G4QGSMSplitableHadron.cc
G4QGSParticipants.cc
G4QuarkExchange.cc
G4Reggeons.cc
G4SingleDiffractiveExcitation.cc
G4SoftStringBuilder.cc
G4SPBaryon.cc
GRANULAR_DEPENDENCIES
G4baryons
G4bosons
G4geometrymng
G4globman
G4had_mod_man
G4had_mod_util
G4had_string_man
G4hadronic_mgt
G4hadronic_proc
G4hadronic_util
G4hadronic_xsect
G4hepnumerics
G4ions
G4leptons
G4materials
G4mesons
G4partman
G4procman
G4shortlived
G4track
G4volumes
GLOBAL_DEPENDENCIES
G4geometry
G4global
G4materials
G4particles
G4track
LINK_LIBRARIES
)
# List any source specific properties here
geant4_add_module(G4hadronic_qgstring
PUBLIC_HEADERS
G4BaryonSplitter.hh
G4DiffractiveStringBuilder.hh
G4GammaParticipants.hh
G4MesonSplitter.hh
G4PartonPair.hh
G4QGSDiffractiveExcitation.hh
G4QGSMSplitableHadron.hh
G4QGSModel.hh
G4QGSModel.icc
G4QGSParticipants.hh
G4QuarkExchange.hh
G4Reggeons.hh
G4SPBaryon.hh
G4SPBaryonTable.hh
G4SingleDiffractiveExcitation.hh
G4SoftStringBuilder.hh
G4SPPartonInfo.hh
SOURCES
G4BaryonSplitter.cc
G4DiffractiveStringBuilder.cc
G4GammaParticipants.cc
G4MesonSplitter.cc
G4PartonPair.cc
G4QGSDiffractiveExcitation.cc
G4QGSMSplitableHadron.cc
G4QGSParticipants.cc
G4QuarkExchange.cc
G4Reggeons.cc
G4SingleDiffractiveExcitation.cc
G4SoftStringBuilder.cc
G4SPBaryon.cc)
geant4_module_link_libraries(G4hadronic_qgstring
PUBLIC
G4baryons
G4bosons
G4globman
G4had_string_man
G4hadronic_util
G4hepgeometry
G4heprandom
G4mesons
G4partman)