Import Geant4 9.5.0 source tree
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: CMakeLists.txt,v 1.1 2010/09/29 19:06:05 bmorgan Exp $
|
||||
# $Id: CMakeLists.txt,v 1.1 2010-09-29 19:06:05 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -14,37 +14,67 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
31-October 2011 V.Ivanchenko hadr-pre-V09-04-06
|
||||
20-October 2011 V.Ivanchenko hadr-pre-V09-04-05
|
||||
----------------------------------------------
|
||||
G4PreCompoundModel - set low limit for excitation 1 MeV;
|
||||
set maxZ = 3 and maxA = 5 allowing pre-compound emission
|
||||
for light fragments (old formulation of the model)
|
||||
|
||||
30-August-2011 M. Kelsey hadr-pre-V09-04-04
|
||||
----------------------------------------------
|
||||
G4PreCompoundTransitions.cc: Return zero probability if no excitons.
|
||||
|
||||
08-July 2011 V.Ivanchenko hadr-pre-V09-04-03
|
||||
----------------------------------------------
|
||||
G4PreCompoundModel - restore soft-cutoff option and use "go_ahead"
|
||||
|
||||
16-June-2011 D.H. Wright hadr-pre-V09-04-02
|
||||
----------------------------------------------
|
||||
G4PrecompoundModel.cc - fix unused variable warning for "go_ahead"
|
||||
|
||||
06-June 2011 V.Ivanchenko hadr-pre-V09-04-01
|
||||
----------------------------------------------
|
||||
G4PreCompoundModel - add limit on nucleon number maxZ=9, maxA=17,
|
||||
low fragments with lower Z and A directly call equilibrium emission
|
||||
G4VPreCompoundFragment - fixed Coverty warning
|
||||
|
||||
20-May 2011 V.Ivanchenko hadr-pre-V09-04-00
|
||||
---------------------------------------------
|
||||
G4PreCompoundProton, G4PreCompoundNeutron - fixed compillation
|
||||
warnings for gcc-4.6.0
|
||||
|
||||
23-November 2010 V.Ivanchenko hadr-pre-V09-03-17
|
||||
---------------------------------------------------
|
||||
--------------------------------------------------
|
||||
G4PreCompoundFragment, G4PreCompoundEmission, G4PreCompoundModel -
|
||||
return back ref-09 computations
|
||||
|
||||
18-November 2010 V.Ivanchenko hadr-pre-V09-03-16
|
||||
---------------------------------------------------
|
||||
--------------------------------------------------
|
||||
G4PreCompoundModel - change number of excitons to be as in 9.3
|
||||
affects tail of neutron stectrum for low-energy projectile
|
||||
|
||||
17-November 2010 V.Ivanchenko hadr-pre-V09-03-15
|
||||
---------------------------------------------------
|
||||
--------------------------------------------------
|
||||
G4PreCompoundProton, G4PreCompoundNeutron, G4PreCompoundHe3 - fixed
|
||||
usage of integer Z and A
|
||||
|
||||
02-November 2010 V.Ivanchenko hadr-pre-V09-03-14
|
||||
---------------------------------------------------
|
||||
--------------------------------------------------
|
||||
- Fixed Coverity warnings - pedantic initialisation in constructors
|
||||
|
||||
28-October 2010 V.Ivanchenko hadr-pre-V09-03-13
|
||||
---------------------------------------------------
|
||||
-------------------------------------------------
|
||||
G4PreCompoundModel - use more safe constructor of G4DynamicParticle
|
||||
G4LowEIonFragmentation - complete transition to integar Z and A,
|
||||
use of updated methods for G4Fragment
|
||||
|
||||
20-October 2010 V.Ivanchenko hadr-pre-V09-03-12
|
||||
---------------------------------------------------
|
||||
-------------------------------------------------
|
||||
G4PreCompoundTransitions - fixed compillation warning introduced in previous tag
|
||||
|
||||
11-October 2010 V.Ivanchenko hadr-pre-V09-03-11
|
||||
---------------------------------------------------
|
||||
-------------------------------------------------
|
||||
G4PreCompoundTransitions - JMQ fixed bug in the PerformTransition method
|
||||
(use number of particles instead of number of excitons)
|
||||
G4PreCompoundModel - disabled upper limit on excitation energy
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: CMakeLists.txt,v 1.1 2010/09/29 19:06:13 bmorgan Exp $
|
||||
# $Id: CMakeLists.txt,v 1.1 2010-09-29 19:06:13 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.4 2003/10/08 16:42:21 hpw Exp $
|
||||
# $Id: GNUmakefile,v 1.4 2003-10-08 16:42:21 hpw Exp $
|
||||
# -----------------------------------------------------------
|
||||
# GNUmakefile for hadronic library. Gabriele Cosmo, 18/9/96.
|
||||
# -----------------------------------------------------------
|
||||
@@ -15,6 +15,7 @@ ifdef PRECOMPOUND_TEST
|
||||
CPPFLAGS += -DPRECOMPOUND_TEST
|
||||
endif
|
||||
|
||||
CPPFLAGS += -DG4HADRONIC_ALLOC_EXPORT
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include \
|
||||
-I$(G4BASE)/global/HEPRandom/include \
|
||||
-I$(G4BASE)/global/HEPNumerics/include \
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4GNASHTransitions.hh,v 1.4 2010/08/20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4GNASHTransitions.hh,v 1.4 2010-08-20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
#ifndef G4GNASHTransitions_hh
|
||||
#define G4GNASHTransitions_hh 1
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCAlpha.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCAlpha.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCChargedFragment.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCChargedFragment.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCDeuteron.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCDeuteron.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCEmissionFactory.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCEmissionFactory.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCFragment.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCFragment.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCFragment.icc,v 1.4 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCFragment.icc,v 1.4 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCHe3.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCHe3.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCNeutron.hh,v 1.4 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCNeutron.hh,v 1.4 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCProton.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCProton.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCTriton.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCTriton.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+4
-4
@@ -23,13 +23,13 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4LowEIonFragmentation.hh,v 1.7 2010/10/28 17:34:33 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4LowEIonFragmentation.hh,v 1.7 2010-10-28 17:34:33 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
// $Id: G4LowEIonFragmentation.hh,v 1.7 2010/10/28 17:34:33 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4LowEIonFragmentation.hh,v 1.7 2010-10-28 17:34:33 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// ClassName: G4LowEIonFragmentation
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundAlpha.hh,v 1.12 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundAlpha.hh,v 1.12 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundDeuteron.hh,v 1.13 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundDeuteron.hh,v 1.13 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundEmission.hh,v 1.9 2010/09/01 14:51:21 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundEmission.hh,v 1.9 2010-09-01 14:51:21 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// Hadronic Process: Nuclear Preequilibrium
|
||||
// by V. Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundEmission.icc,v 1.6 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundEmission.icc,v 1.6 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
//
|
||||
// Author: V.Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundEmissionFactory.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundEmissionFactory.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundFragment.hh,v 1.6 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundFragment.hh,v 1.6 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (August 2008).
|
||||
// Based on previous work by V. Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundFragmentVector.hh,v 1.7 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundFragmentVector.hh,v 1.7 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// Hadronic Process: Nuclear Preequilibrium
|
||||
// by V. Lara
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PreCompoundFragmentVector.icc,v 1.5 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundFragmentVector.icc,v 1.5 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// Hadronic Process: Nuclear Preequilibrium
|
||||
// by V. Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundHe3.hh,v 1.11 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundHe3.hh,v 1.11 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundIon.hh,v 1.8 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundIon.hh,v 1.8 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (August 2008).
|
||||
// Based on previous work by V. Lara
|
||||
|
||||
+5
-19
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundModel.hh,v 1.9 2010/08/20 07:41:48 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundModel.hh,v 1.9 2010-08-20 07:41:48 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
@@ -87,13 +87,6 @@ public:
|
||||
void UseSCO();
|
||||
void UseCEMtr();
|
||||
|
||||
#ifdef PRECOMPOUND_TEST
|
||||
static G4Fragment GetInitialFragmentForTest()
|
||||
{ return G4PreCompoundModel::theInitialFragmentForTest; }
|
||||
static std::vector<G4String*> * GetCreatorModels()
|
||||
{ return &G4PreCompoundModel::theCreatorModels; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
|
||||
inline
|
||||
@@ -106,12 +99,6 @@ private:
|
||||
G4bool operator==(const G4PreCompoundModel &right) const;
|
||||
G4bool operator!=(const G4PreCompoundModel &right) const;
|
||||
|
||||
#ifdef debug
|
||||
void CheckConservation(const G4Fragment & theInitialState,
|
||||
const G4Fragment & aFragment,
|
||||
G4ReactionProductVector * Result) const;
|
||||
#endif
|
||||
|
||||
//==============
|
||||
// Data Members
|
||||
//==============
|
||||
@@ -135,12 +122,11 @@ private:
|
||||
G4bool useSCO;
|
||||
G4bool useCEMtr;
|
||||
|
||||
G4int maxZ;
|
||||
G4int maxA;
|
||||
|
||||
G4HadFinalState theResult;
|
||||
|
||||
#ifdef PRECOMPOUND_TEST
|
||||
static G4Fragment theInitialFragmentForTest;
|
||||
static std::vector<G4String*> theCreatorModels;
|
||||
#endif
|
||||
};
|
||||
|
||||
inline void
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundNeutron.hh,v 1.13 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundNeutron.hh,v 1.13 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundNucleon.hh,v 1.7 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundNucleon.hh,v 1.7 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (August 2008).
|
||||
// Based on previous work by V. Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundParameters.hh,v 1.6 2010/08/18 14:07:24 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundParameters.hh,v 1.6 2010-08-18 14:07:24 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundProton.hh,v 1.13 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundProton.hh,v 1.13 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundTransitions.hh,v 1.8 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundTransitions.hh,v 1.8 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
// 01.05.2008 J. M. Quesada . New methods for accessing to individual transition
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundTriton.hh,v 1.12 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundTriton.hh,v 1.12 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VPreCompoundEmissionFactory.hh,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundEmissionFactory.hh,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VPreCompoundFragment.hh,v 1.11 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundFragment.hh,v 1.11 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (August 2008).
|
||||
// Based on previous work by V. Lara
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VPreCompoundFragment.icc,v 1.8 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundFragment.icc,v 1.8 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VPreCompoundTransitions.hh,v 1.6 2010/08/20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundTransitions.hh,v 1.6 2010-08-20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (May 08). New virtual classes have been added Prob1,2,3
|
||||
// JMQ (06 September 2008) Also external choices have been added for:
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: sources.cmake,v 1.2 2010/09/29 20:27:59 bmorgan Exp $
|
||||
# $Id: sources.cmake,v 1.2 2010-09-29 20:27:59 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4GNASHTransitions.cc,v 1.6 2010/08/20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4GNASHTransitions.cc,v 1.6 2010-08-20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// 20.08.2010 V.Ivanchenko move constructor and destructor to the source
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCAlpha.cc,v 1.4 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCAlpha.cc,v 1.4 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCChargedFragment.cc,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCChargedFragment.cc,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCDeuteron.cc,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCDeuteron.cc,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCEmissionFactory.cc,v 1.5 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCEmissionFactory.cc,v 1.5 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCFragment.cc,v 1.4 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCFragment.cc,v 1.4 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCHe3.cc,v 1.4 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCHe3.cc,v 1.4 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCNeutron.cc,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCNeutron.cc,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCProton.cc,v 1.3 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCProton.cc,v 1.3 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4HETCTriton.cc,v 1.4 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4HETCTriton.cc,v 1.4 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4LowEIonFragmentation.cc,v 1.8 2010/10/28 17:34:33 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4LowEIonFragmentation.cc,v 1.8 2010-10-28 17:34:33 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundAlpha.cc,v 1.8 2010/11/02 11:27:27 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundAlpha.cc,v 1.8 2010-11-02 11:27:27 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundDeuteron.cc,v 1.9 2010/11/02 17:33:28 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundDeuteron.cc,v 1.9 2010-11-02 17:33:28 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundEmission.cc,v 1.34 2010/11/23 17:59:47 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundEmission.cc,v 1.34 2010-11-23 17:59:47 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundEmissionFactory.cc,v 1.5 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundEmissionFactory.cc,v 1.5 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
|
||||
#include "G4PreCompoundEmissionFactory.hh"
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundFragment.cc,v 1.11 2010/11/24 11:55:40 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundFragment.cc,v 1.11 2010-11-24 11:55:40 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (August 2008).
|
||||
// Based on previous work by V. Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundFragmentVector.cc,v 1.12 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundFragmentVector.cc,v 1.12 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// Hadronic Process: Nuclear Preequilibrium
|
||||
// by V. Lara
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundHe3.cc,v 1.9 2010/11/17 11:06:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundHe3.cc,v 1.9 2010-11-17 11:06:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundIon.cc,v 1.17 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundIon.cc,v 1.17 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+24
-86
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundModel.cc,v 1.30 2010/11/24 11:55:40 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundModel.cc,v 1.30 2010-11-24 11:55:40 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
@@ -62,7 +62,9 @@
|
||||
|
||||
G4PreCompoundModel::G4PreCompoundModel(G4ExcitationHandler * const value)
|
||||
: G4VPreCompoundModel(value), useHETCEmission(false), useGNASHTransition(false),
|
||||
OPTxs(3), useSICB(false), useNGB(false), useSCO(false), useCEMtr(true)
|
||||
OPTxs(3), useSICB(false), useNGB(false), useSCO(false), useCEMtr(true),
|
||||
maxZ(3), maxA(5)
|
||||
//maxZ(9), maxA(17)
|
||||
{
|
||||
theParameters = G4PreCompoundParameters::GetAddress();
|
||||
|
||||
@@ -156,13 +158,14 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(G4Fragment& aFragment)
|
||||
{
|
||||
G4ReactionProductVector * Result = new G4ReactionProductVector;
|
||||
G4double Eex = aFragment.GetExcitationEnergy();
|
||||
G4int Z = aFragment.GetZ_asInt();
|
||||
G4int A = aFragment.GetA_asInt();
|
||||
|
||||
//G4cout << "### G4PreCompoundModel::DeExcite" << G4endl;
|
||||
//G4cout << aFragment << G4endl;
|
||||
|
||||
// Perform Equilibrium Emission
|
||||
if (A < 5 || Eex < keV /*|| Eex > 3.*MeV*A*/) {
|
||||
if ((Z < maxZ && A < maxA) || Eex < MeV /*|| Eex > 3.*MeV*A*/) {
|
||||
PerformEquilibriumEmission(aFragment, Result);
|
||||
return Result;
|
||||
}
|
||||
@@ -206,24 +209,15 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(G4Fragment& aFragment)
|
||||
//G4cout<<" n ="<<aFragment.GetNumberOfExcitons()<<G4endl;
|
||||
G4bool go_ahead = false;
|
||||
// soft cutoff criterium as an "ad-hoc" solution to force increase in evaporation
|
||||
// G4double test = static_cast<G4double>(aFragment.GetNumberOfHoles());
|
||||
G4int test = aFragment.GetNumberOfExcitons();
|
||||
if (test < EquilibriumExcitonNumber) { go_ahead=true; }
|
||||
if (test <= EquilibriumExcitonNumber) { go_ahead=true; }
|
||||
|
||||
//J. M. Quesada (Apr. 08): soft-cutoff switched off by default
|
||||
if (useSCO) {
|
||||
if (test < EquilibriumExcitonNumber)
|
||||
{
|
||||
G4double x = G4double(test)/G4double(EquilibriumExcitonNumber) - 1;
|
||||
if( G4UniformRand() < 1.0 - std::exp(-x*x/0.32) ) { go_ahead = true; }
|
||||
/*
|
||||
test = test*test;
|
||||
test /= 0.32;
|
||||
test = 1.0 - std::exp(-test);
|
||||
go_ahead = (G4UniformRand() < test);
|
||||
*/
|
||||
}
|
||||
}
|
||||
if (useSCO && !go_ahead)
|
||||
{
|
||||
G4double x = G4double(test)/G4double(EquilibriumExcitonNumber) - 1;
|
||||
if( G4UniformRand() < 1.0 - std::exp(-x*x/0.32) ) { go_ahead = true; }
|
||||
}
|
||||
|
||||
// JMQ: WARNING: CalculateProbability MUST be called prior to Get methods !!
|
||||
// (O values would be returned otherwise)
|
||||
@@ -234,13 +228,19 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(G4Fragment& aFragment)
|
||||
G4double P3 = theTransition->GetTransitionProb3();
|
||||
//G4cout<<"#0 P1="<<P1<<" P2="<<P2<<" P3="<<P3<<G4endl;
|
||||
|
||||
//J.M. Quesada (May. 08). Physical criterium (lamdas) PREVAILS over
|
||||
//J.M. Quesada (May 2008) Physical criterium (lamdas) PREVAILS over
|
||||
// approximation (critical exciton number)
|
||||
if(P1 <= P2+P3) { go_ahead = false; }
|
||||
|
||||
if (go_ahead && aFragment.GetA_asInt() > 4)
|
||||
//V.Ivanchenko (May 2011) added check on number of nucleons
|
||||
// to send a fragment to FermiBreakUp
|
||||
if(!go_ahead || P1 <= P2+P3 ||
|
||||
(aFragment.GetZ_asInt() < maxZ && aFragment.GetA_asInt() < maxA) )
|
||||
{
|
||||
//G4cout<<"#4 EquilibriumEmission"<<G4endl;
|
||||
PerformEquilibriumEmission(aFragment,Result);
|
||||
return Result;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
G4double TotalEmissionProbability =
|
||||
theEmission->GetTotalProbability(aFragment);
|
||||
//
|
||||
@@ -277,12 +277,6 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(G4Fragment& aFragment)
|
||||
ThereIsTransition = false;
|
||||
Result->push_back(theEmission->PerformEmission(aFragment));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//G4cout<<"#4 EquilibriumEmission"<<G4endl;
|
||||
PerformEquilibriumEmission(aFragment,Result);
|
||||
return Result;
|
||||
}
|
||||
} while (ThereIsTransition); // end of do loop
|
||||
} // end of for (;;) loop
|
||||
@@ -350,62 +344,6 @@ void G4PreCompoundModel::UseCEMtr()
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef debug
|
||||
void G4PreCompoundModel::CheckConservation(const G4Fragment & theInitialState,
|
||||
const G4Fragment & aFragment,
|
||||
G4ReactionProductVector * Result) const
|
||||
{
|
||||
G4double ProductsEnergy = aFragment.GetMomentum().e();
|
||||
G4ThreeVector ProductsMomentum = aFragment.GetMomentum();
|
||||
G4int ProductsA = static_cast<G4int>(aFragment.GetA());
|
||||
G4int ProductsZ = static_cast<G4int>(aFragment.GetZ());
|
||||
for (G4ReactionProductVector::iterator h = Result->begin();
|
||||
h != Result->end(); ++h)
|
||||
{
|
||||
ProductsEnergy += (*h)->GetTotalEnergy();
|
||||
ProductsMomentum += (*h)->GetMomentum();
|
||||
ProductsA += static_cast<G4int>((*h)->GetDefinition()->GetBaryonNumber());
|
||||
ProductsZ += static_cast<G4int>((*h)->GetDefinition()->GetPDGCharge());
|
||||
}
|
||||
|
||||
if (ProductsA != theInitialState.GetA())
|
||||
{
|
||||
G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!\n"
|
||||
<< "G4PreCompoundModel.cc: Barionic Number Conservation test for just preequilibrium fragments\n"
|
||||
<< "Initial A = " << theInitialState.GetA()
|
||||
<< " Fragments A = " << ProductsA << " Diference --> "
|
||||
<< theInitialState.GetA() - ProductsA << '\n';
|
||||
}
|
||||
if (ProductsZ != theInitialState.GetZ())
|
||||
{
|
||||
G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!\n"
|
||||
<< "G4PreCompoundModel.cc: Charge Conservation test for just preequilibrium fragments\n"
|
||||
<< "Initial Z = " << theInitialState.GetZ()
|
||||
<< " Fragments Z = " << ProductsZ << " Diference --> "
|
||||
<< theInitialState.GetZ() - ProductsZ << '\n';
|
||||
}
|
||||
if (std::abs(ProductsEnergy-theInitialState.GetMomentum().e()) > 1.0*keV)
|
||||
{
|
||||
G4cout << "!!!!!!!!!! Energy Conservation Violation !!!!!!!!!!\n"
|
||||
<< "G4PreCompoundModel.cc: Energy Conservation test for just preequilibrium fragments\n"
|
||||
<< "Initial E = " << theInitialState.GetMomentum().e()/MeV << " MeV"
|
||||
<< " Fragments E = " << ProductsEnergy/MeV << " MeV Diference --> "
|
||||
<< (theInitialState.GetMomentum().e() - ProductsEnergy)/MeV << " MeV\n";
|
||||
}
|
||||
if (std::abs(ProductsMomentum.x()-theInitialState.GetMomentum().x()) > 1.0*keV ||
|
||||
std::abs(ProductsMomentum.y()-theInitialState.GetMomentum().y()) > 1.0*keV ||
|
||||
std::abs(ProductsMomentum.z()-theInitialState.GetMomentum().z()) > 1.0*keV)
|
||||
{
|
||||
G4cout << "!!!!!!!!!! Momentum Conservation Violation !!!!!!!!!!\n"
|
||||
<< "G4PreCompoundModel.cc: Momentum Conservation test for just preequilibrium fragments\n"
|
||||
<< "Initial P = " << theInitialState.GetMomentum().vect() << " MeV"
|
||||
<< " Fragments P = " << ProductsMomentum << " MeV Diference --> "
|
||||
<< theInitialState.GetMomentum().vect() - ProductsMomentum << " MeV\n";
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
+4
-19
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundNeutron.cc,v 1.7 2010/11/17 11:06:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundNeutron.cc,v 1.7 2010-11-17 11:06:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -147,29 +147,14 @@ G4double G4PreCompoundNeutron::GetOpt12(G4double K)
|
||||
G4double G4PreCompoundNeutron::GetOpt34(G4double K)
|
||||
{
|
||||
G4double landa, landa0, landa1, mu, mu0, mu1,nu, nu0, nu1, nu2;
|
||||
G4double p, p0, p1, p2;
|
||||
G4double flow,spill,ec,ecsq,xnulam,etest(0.),ra(0.),a,signor(1.),sig;
|
||||
G4double p, p0;
|
||||
G4double flow,ec,ecsq,xnulam,etest(0.),ra(0.),a,signor(1.),sig;
|
||||
G4double b,ecut,cut,ecut2,geom,elab;
|
||||
|
||||
//safety initialization
|
||||
landa0=0;
|
||||
landa1=0;
|
||||
mu0=0.;
|
||||
mu1=0.;
|
||||
nu0=0.;
|
||||
nu1=0.;
|
||||
nu2=0.;
|
||||
p0=0.;
|
||||
p1=0.;
|
||||
p2=0.;
|
||||
|
||||
flow = 1.e-18;
|
||||
spill= 1.0e+18;
|
||||
|
||||
// PRECO xs for neutrons is choosen
|
||||
p0 = -312.;
|
||||
p1= 0.;
|
||||
p2 = 0.;
|
||||
landa0 = 12.10;
|
||||
landa1= -11.27;
|
||||
mu0 = 234.1;
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundNucleon.cc,v 1.14 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundNucleon.cc,v 1.14 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundParameters.cc,v 1.4 2010/08/18 14:07:24 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundParameters.cc,v 1.4 2010-08-18 14:07:24 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
//
|
||||
|
||||
+5
-3
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundProton.cc,v 1.8 2010/11/17 11:06:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundProton.cc,v 1.8 2010-11-17 11:06:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -226,12 +226,14 @@ G4double G4PreCompoundProton::GetOpt3(const G4double K)
|
||||
nu2 = -1.872;
|
||||
|
||||
// parameters for proton cross section refinement
|
||||
/*
|
||||
G4double afit,bfit,a2,b2;
|
||||
afit=-0.0785656;
|
||||
bfit=5.10789;
|
||||
a2= -0.00089076;
|
||||
b2= 0.0231597;
|
||||
|
||||
*/
|
||||
|
||||
G4double ec,ecsq,xnulam,etest(0.),ra(0.),a,w,c,signor(1.),signor2,sig;
|
||||
G4double b,ecut,cut,ecut2,geom,elab;
|
||||
|
||||
|
||||
+5
-5
@@ -23,15 +23,15 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundTransitions.cc,v 1.27 2010/10/20 00:47:46 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundTransitions.cc,v 1.27 2010-10-20 00:47:46 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
// GEANT4 Class file
|
||||
//
|
||||
//
|
||||
// File name: G4PreCompoundIon
|
||||
// File name: G4PreCompoundTransitions
|
||||
//
|
||||
// Author: V.Lara
|
||||
//
|
||||
@@ -44,7 +44,7 @@
|
||||
// (IAEA benchmark)
|
||||
// 20.08.2010 V.Ivanchenko move constructor and destructor to the source and
|
||||
// optimise the code
|
||||
//
|
||||
// 30.08.2011 M.Kelsey - Skip CalculateProbability if no excitons
|
||||
|
||||
#include "G4PreCompoundTransitions.hh"
|
||||
#include "G4HadronicException.hh"
|
||||
@@ -83,7 +83,7 @@ CalculateProbability(const G4Fragment & aFragment)
|
||||
|
||||
//G4cout << aFragment << G4endl;
|
||||
|
||||
if(U < 10*eV) { return 0.0; }
|
||||
if(U < 10*eV || 0==N) { return 0.0; }
|
||||
|
||||
//J. M. Quesada (Feb. 08) new physics
|
||||
// OPT=1 Transitions are calculated according to Gudima's paper
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4PreCompoundTriton.cc,v 1.8 2010/11/02 11:27:27 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4PreCompoundTriton.cc,v 1.8 2010-11-02 11:27:27 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VPreCompoundEmissionFactory.cc,v 1.5 2010/08/28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundEmissionFactory.cc,v 1.5 2010-08-28 15:16:55 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// by V. Lara
|
||||
|
||||
|
||||
+6
-12
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VPreCompoundFragment.cc,v 1.15 2010/11/02 17:33:28 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundFragment.cc,v 1.15 2010-11-02 17:33:28 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// J. M. Quesada (August 2008). Based on previous work by V. Lara
|
||||
//
|
||||
@@ -66,17 +66,11 @@ operator << (std::ostream &out, const G4VPreCompoundFragment &theFragment)
|
||||
std::ostream&
|
||||
operator << (std::ostream &out, const G4VPreCompoundFragment *theFragment)
|
||||
{
|
||||
std::ios::fmtflags old_floatfield = out.flags();
|
||||
out.setf(std::ios::floatfield);
|
||||
|
||||
out
|
||||
<< "PreCompoundModel Emitted Fragment: A = "
|
||||
<< std::setprecision(3) << theFragment->theA
|
||||
<< ", Z = " << std::setprecision(3) << theFragment->theZ
|
||||
<< " Mass(GeV)= " << theFragment->theMass/CLHEP::GeV;
|
||||
|
||||
out.setf(old_floatfield,std::ios::floatfield);
|
||||
return out;
|
||||
<< "PreCompoundModel Emitted Fragment: Z= " << theFragment->GetZ()
|
||||
<< " A= " << theFragment->GetA()
|
||||
<< " Mass(GeV)= " << theFragment->GetNuclearMass()/CLHEP::GeV;
|
||||
return out;
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VPreCompoundTransitions.cc,v 1.1 2010/08/20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4VPreCompoundTransitions.cc,v 1.1 2010-08-20 07:42:19 vnivanch Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
// V.Ivanchenko 20.08.2010
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user