Import Geant4 10.7.0.beta source tree
This commit is contained in:
Gabriele Cosmo
@@ -15,6 +15,7 @@ CPPFLAGS += -DG4HADRONIC_ALLOC_EXPORT
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include \
|
||||
-I$(G4BASE)/global/HEPRandom/include \
|
||||
-I$(G4BASE)/global/HEPGeometry/include \
|
||||
-I$(G4BASE)/intercoms/include \
|
||||
-I$(G4BASE)/track/include \
|
||||
-I$(G4BASE)/geometry/volumes/include \
|
||||
-I$(G4BASE)/geometry/management/include \
|
||||
|
||||
@@ -14,8 +14,29 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
06 August 2019 Alberto Ribon (hadr-util-V10-05-02)
|
||||
13 May 2020 Vladimir Ivanchenko (hadr-util-V10-06-03)
|
||||
--------------------------------------------------------
|
||||
- G4HadronicParameters : added Get/Set methods to enable b-, c- particles
|
||||
|
||||
12 May 2020 Alberto Ribon (hadr-util-V10-06-02)
|
||||
-----------------------------------------------
|
||||
- G4HadronicParametersMessenger : created new messenger class for
|
||||
G4HadronicParameters. For the time being it has only the global
|
||||
verbosity level for hadronics.
|
||||
- G4HadronicParameters : added Set methods; creates the new messenger.
|
||||
|
||||
21 January 2020 Vladimir Ivanchenko (hadr-util-V10-06-01)
|
||||
--------------------------------------------------------
|
||||
- G4HadronicParameters : added Set methods for Cascade-FTF transition
|
||||
due to CMS request
|
||||
|
||||
16 January 2020 Alberto Ribon (hadr-util-V10-06-00)
|
||||
---------------------------------------------------
|
||||
- G4HadFinalState : fixed warning (seen on Windows) regarding the conversion
|
||||
from 'size_t' to 'G4int'.
|
||||
|
||||
06 August 2019 Alberto Ribon (hadr-util-V10-05-02)
|
||||
--------------------------------------------------
|
||||
- G4HadronicParameters : extended to the recommended (default) energy
|
||||
transition regions between FTF and cascade models (BERT and/or BIC)
|
||||
and between strings models (QGS and FTF).
|
||||
|
||||
@@ -48,7 +48,7 @@ public:
|
||||
G4HadFinalState();
|
||||
|
||||
inline
|
||||
G4int GetNumberOfSecondaries() const { return theSecs.size(); }
|
||||
std::size_t GetNumberOfSecondaries() const { return theSecs.size(); }
|
||||
void SetEnergyChange(G4double anEnergy);
|
||||
inline
|
||||
G4double GetEnergyChange() const { return theEnergy; }
|
||||
|
||||
@@ -32,10 +32,6 @@
|
||||
//
|
||||
// Description: Singleton to keep global hadronic parameters.
|
||||
//
|
||||
// For the time being, at least, offers only "getters" but
|
||||
// not "setters", i.e. a recompilation is needed to change
|
||||
// the default parameters.
|
||||
//
|
||||
// Modified:
|
||||
//
|
||||
//----------------------------------------------------------------------------
|
||||
@@ -44,6 +40,9 @@
|
||||
#define G4HadronicParameters_h 1
|
||||
|
||||
#include "globals.hh"
|
||||
#include "G4Threading.hh"
|
||||
|
||||
class G4HadronicParametersMessenger;
|
||||
|
||||
|
||||
class G4HadronicParameters {
|
||||
@@ -53,7 +52,8 @@ class G4HadronicParameters {
|
||||
~G4HadronicParameters();
|
||||
|
||||
G4double GetMaxEnergy() const;
|
||||
// Upper limit for Geant4 hadronic physics, for any application.
|
||||
void SetMaxEnergy( const G4double val );
|
||||
// Getter/Setter for the upper limit for Geant4 hadronic physics, for any application.
|
||||
// Any hadronic model, physics list builder and constructor should use this method
|
||||
// instead of putting an arbitrary value in the code.
|
||||
// Any application which tries to use hadronic physics for an energy higher than this limit
|
||||
@@ -61,28 +61,49 @@ class G4HadronicParameters {
|
||||
|
||||
G4double GetMinEnergyTransitionFTF_Cascade() const;
|
||||
G4double GetMaxEnergyTransitionFTF_Cascade() const;
|
||||
// Recommended energy limits, for physics lists, of the transition region
|
||||
// between the Fritiof (FTF) string model and the intranuclear cascade model,
|
||||
// either Bertini (BERT) or Binary (BIC).
|
||||
void SetMinEnergyTransitionFTF_Cascade( const G4double val );
|
||||
void SetMaxEnergyTransitionFTF_Cascade( const G4double val );
|
||||
// Getter/Setter of the recommended energy limits, for physics lists, of the
|
||||
// transition region between the Fritiof (FTF) string model and the
|
||||
// intranuclear cascade model, either Bertini (BERT) or Binary (BIC).
|
||||
|
||||
G4double GetMinEnergyTransitionQGS_FTF() const;
|
||||
G4double GetMaxEnergyTransitionQGS_FTF() const;
|
||||
// Recommended energy limits, for physics lists, of the transition region
|
||||
// between the two strings models - the Quark Gluon String (QGS) model and
|
||||
// the Fritiof (FTF) model.
|
||||
void SetMinEnergyTransitionQGS_FTF( const G4double val );
|
||||
void SetMaxEnergyTransitionQGS_FTF( const G4double val );
|
||||
// Getter/Setter of the recommended energy limits, for physics lists, of the
|
||||
// transition region between the two strings models - the Quark Gluon String (QGS)
|
||||
// model and the Fritiof (FTF) model.
|
||||
|
||||
G4bool EnableBCParticles() const;
|
||||
void SetEnableBCParticles( G4bool val );
|
||||
// Baryons and mesons with c- and b- quarks may be enabled/disabled
|
||||
// This flag is used both by EM and hadronic physics constructors
|
||||
|
||||
G4int GetVerboseLevel() const;
|
||||
void SetVerboseLevel( const G4int val );
|
||||
// Getter/Setter of the general verbosity level for hadronics.
|
||||
|
||||
private:
|
||||
G4HadronicParameters();
|
||||
G4bool IsLocked() const;
|
||||
|
||||
static G4HadronicParameters* sInstance;
|
||||
#ifdef G4MULTITHREADED
|
||||
static G4Mutex paramMutex;
|
||||
#endif
|
||||
|
||||
G4HadronicParametersMessenger* fMessenger;
|
||||
|
||||
G4double fMaxEnergy;
|
||||
G4double fMinEnergyTransitionFTF_Cascade;
|
||||
G4double fMaxEnergyTransitionFTF_Cascade;
|
||||
G4double fMinEnergyTransitionQGS_FTF;
|
||||
G4double fMaxEnergyTransitionQGS_FTF;
|
||||
G4int fVerboseLevel;
|
||||
G4bool fEnableBC;
|
||||
};
|
||||
|
||||
|
||||
inline G4double G4HadronicParameters::GetMaxEnergy() const {
|
||||
return fMaxEnergy;
|
||||
}
|
||||
@@ -97,9 +118,17 @@ inline G4double G4HadronicParameters::GetMaxEnergyTransitionFTF_Cascade() const
|
||||
inline G4double G4HadronicParameters::GetMinEnergyTransitionQGS_FTF() const {
|
||||
return fMinEnergyTransitionQGS_FTF;
|
||||
}
|
||||
|
||||
inline G4double G4HadronicParameters::GetMaxEnergyTransitionQGS_FTF() const {
|
||||
return fMaxEnergyTransitionQGS_FTF;
|
||||
}
|
||||
|
||||
#endif
|
||||
inline G4int G4HadronicParameters::GetVerboseLevel() const {
|
||||
return fVerboseLevel;
|
||||
}
|
||||
|
||||
inline G4bool G4HadronicParameters::EnableBCParticles() const {
|
||||
return fEnableBC;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * License and Disclaimer *
|
||||
// * *
|
||||
// * The Geant4 software is copyright of the Copyright Holders of *
|
||||
// * the Geant4 Collaboration. It is provided under the terms and *
|
||||
// * conditions of the Geant4 Software License, included in the file *
|
||||
// * LICENSE and available at http://cern.ch/geant4/license . These *
|
||||
// * include a list of copyright holders. *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. Please see the license in the file LICENSE and URL above *
|
||||
// * for the full disclaimer and the limitation of liability. *
|
||||
// * *
|
||||
// * This code implementation is the result of the scientific and *
|
||||
// * technical work of the GEANT4 collaboration. *
|
||||
// * By using, copying, modifying or distributing the software (or *
|
||||
// * any work based on the software) you agree to acknowledge its *
|
||||
// * use in resulting scientific publications, and indicate your *
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
// ClassName: G4HadronicParametersMessenger
|
||||
// Author: Alberto Ribon
|
||||
// Date: May 2020
|
||||
// Description: messenger class for the class G4HadronicParameters
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#ifndef G4HadronicParametersMessenger_h
|
||||
#define G4HadronicParametersMessenger_h 1
|
||||
|
||||
#include "G4UImessenger.hh"
|
||||
#include "globals.hh"
|
||||
|
||||
class G4UIdirectory;
|
||||
class G4UIcommand;
|
||||
class G4UIcmdWithAnInteger;
|
||||
class G4HadronicParameters;
|
||||
|
||||
|
||||
class G4HadronicParametersMessenger : public G4UImessenger {
|
||||
public:
|
||||
explicit G4HadronicParametersMessenger( G4HadronicParameters* inputHadParam );
|
||||
~G4HadronicParametersMessenger();
|
||||
void SetNewValue ( G4UIcommand *command, G4String newValues ) override;
|
||||
private:
|
||||
G4HadronicParameters* theHadronicParameters;
|
||||
G4UIdirectory* theDirectory;
|
||||
G4UIcmdWithAnInteger* theVerboseCmd;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -55,6 +55,7 @@ GEANT4_DEFINE_MODULE(NAME G4hadronic_util
|
||||
G4HadronicDeveloperParameters.hh
|
||||
G4HadronicException.hh
|
||||
G4HadronicParameters.hh
|
||||
G4HadronicParametersMessenger.hh
|
||||
G4IsoResult.hh
|
||||
G4LightMedia.hh
|
||||
G4NuclearPolarization.hh
|
||||
@@ -74,6 +75,7 @@ GEANT4_DEFINE_MODULE(NAME G4hadronic_util
|
||||
G4HadronicDeveloperParameters.cc
|
||||
G4HadronicException.cc
|
||||
G4HadronicParameters.cc
|
||||
G4HadronicParametersMessenger.cc
|
||||
G4IsoResult.cc
|
||||
G4LightMedia.cc
|
||||
G4NuclearPolarization.cc
|
||||
|
||||
@@ -32,31 +32,43 @@
|
||||
//
|
||||
// Description: Singleton to keep global hadronic parameters.
|
||||
//
|
||||
// For the time being, at least, offers only "getters" but
|
||||
// not "setters", i.e. a recompilation is needed to change
|
||||
// the default parameters.
|
||||
//
|
||||
// Modified:
|
||||
//
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
#include "G4HadronicParameters.hh"
|
||||
#include <CLHEP/Units/PhysicalConstants.h>
|
||||
#include "G4ApplicationState.hh"
|
||||
#include "G4StateManager.hh"
|
||||
#include "G4HadronicParametersMessenger.hh"
|
||||
|
||||
|
||||
G4HadronicParameters* G4HadronicParameters::sInstance = nullptr;
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
G4Mutex G4HadronicParameters::paramMutex = G4MUTEX_INITIALIZER;
|
||||
#endif
|
||||
|
||||
G4HadronicParameters* G4HadronicParameters::Instance() {
|
||||
if ( sInstance == nullptr ) {
|
||||
static G4HadronicParameters theHadronicParametersObject;
|
||||
sInstance = &theHadronicParametersObject;
|
||||
#ifdef G4MULTITHREADED
|
||||
G4MUTEXLOCK( ¶mMutex );
|
||||
if ( sInstance == nullptr ) {
|
||||
#endif
|
||||
static G4HadronicParameters theHadronicParametersObject;
|
||||
sInstance = &theHadronicParametersObject;
|
||||
#ifdef G4MULTITHREADED
|
||||
}
|
||||
G4MUTEXUNLOCK(¶mMutex);
|
||||
#endif
|
||||
}
|
||||
return sInstance;
|
||||
}
|
||||
|
||||
|
||||
G4HadronicParameters::~G4HadronicParameters() {}
|
||||
G4HadronicParameters::~G4HadronicParameters() {
|
||||
delete fMessenger;
|
||||
}
|
||||
|
||||
|
||||
G4HadronicParameters::G4HadronicParameters() {
|
||||
@@ -65,5 +77,56 @@ G4HadronicParameters::G4HadronicParameters() {
|
||||
fMaxEnergyTransitionFTF_Cascade = 6.0*CLHEP::GeV;
|
||||
fMinEnergyTransitionQGS_FTF = 12.0*CLHEP::GeV;
|
||||
fMaxEnergyTransitionQGS_FTF = 25.0*CLHEP::GeV;
|
||||
fVerboseLevel = 1;
|
||||
fEnableBC = false;
|
||||
fMessenger = new G4HadronicParametersMessenger( this );
|
||||
}
|
||||
|
||||
|
||||
G4bool G4HadronicParameters::IsLocked() const {
|
||||
return ( ! G4Threading::IsMasterThread() ||
|
||||
G4StateManager::GetStateManager()->GetCurrentState() != G4State_PreInit );
|
||||
}
|
||||
|
||||
|
||||
void G4HadronicParameters::SetMaxEnergy( const G4double val ) {
|
||||
if ( ! IsLocked() && val > 0.0 ) {
|
||||
fMaxEnergy = val;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void G4HadronicParameters::SetMinEnergyTransitionFTF_Cascade( const G4double val ) {
|
||||
if ( ! IsLocked() && val > 0.0 ) {
|
||||
fMinEnergyTransitionFTF_Cascade = val;
|
||||
}
|
||||
}
|
||||
|
||||
void G4HadronicParameters::SetMaxEnergyTransitionFTF_Cascade( const G4double val ) {
|
||||
if ( ! IsLocked() && val > fMinEnergyTransitionFTF_Cascade ) {
|
||||
fMaxEnergyTransitionFTF_Cascade = val;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void G4HadronicParameters::SetMinEnergyTransitionQGS_FTF( const G4double val ) {
|
||||
if ( ! IsLocked() && val > 0.0 ) {
|
||||
fMinEnergyTransitionQGS_FTF = val;
|
||||
}
|
||||
}
|
||||
|
||||
void G4HadronicParameters::SetMaxEnergyTransitionQGS_FTF( const G4double val ) {
|
||||
if ( ! IsLocked() && val > fMinEnergyTransitionQGS_FTF ) {
|
||||
fMaxEnergyTransitionQGS_FTF = val;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void G4HadronicParameters::SetEnableBCParticles( G4bool val ) {
|
||||
if ( ! IsLocked() ) fEnableBC = val;
|
||||
}
|
||||
|
||||
|
||||
void G4HadronicParameters::SetVerboseLevel( const G4int val ) {
|
||||
if ( ! IsLocked() && val >= 0 ) fVerboseLevel = val;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * License and Disclaimer *
|
||||
// * *
|
||||
// * The Geant4 software is copyright of the Copyright Holders of *
|
||||
// * the Geant4 Collaboration. It is provided under the terms and *
|
||||
// * conditions of the Geant4 Software License, included in the file *
|
||||
// * LICENSE and available at http://cern.ch/geant4/license . These *
|
||||
// * include a list of copyright holders. *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. Please see the license in the file LICENSE and URL above *
|
||||
// * for the full disclaimer and the limitation of liability. *
|
||||
// * *
|
||||
// * This code implementation is the result of the scientific and *
|
||||
// * technical work of the GEANT4 collaboration. *
|
||||
// * By using, copying, modifying or distributing the software (or *
|
||||
// * any work based on the software) you agree to acknowledge its *
|
||||
// * use in resulting scientific publications, and indicate your *
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
// ClassName: G4HadronicParametersMessenger
|
||||
// Author: Alberto Ribon
|
||||
// Date: May 2020
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#include "G4HadronicParametersMessenger.hh"
|
||||
#include "G4UIdirectory.hh"
|
||||
#include "G4UIcommand.hh"
|
||||
#include "G4UIcmdWithAnInteger.hh"
|
||||
#include "G4HadronicParameters.hh"
|
||||
|
||||
|
||||
G4HadronicParametersMessenger::G4HadronicParametersMessenger( G4HadronicParameters* inputHadParam ) :
|
||||
theHadronicParameters( inputHadParam )
|
||||
{
|
||||
// Main directory for the whole hadronic
|
||||
theDirectory = new G4UIdirectory( "/process/had/" );
|
||||
theDirectory->SetGuidance( "Control of general hadronic physics parameters and choices." );
|
||||
|
||||
// This command setup the overall verbose level for hadronics.
|
||||
// It is the responsibility of all hadronic models, cross sections and processes to check
|
||||
// this verbose level and behave consistently: in particular, if the level is "0" there
|
||||
// should be no print out regardless of their eventual internal (local) verbosity level.
|
||||
theVerboseCmd = new G4UIcmdWithAnInteger( "/process/had/verbose", this );
|
||||
theVerboseCmd->SetGuidance( "Set verbose level: 0 (minimum), 1 (default), 2 (higher), ... (even higher)" );
|
||||
theVerboseCmd->SetParameterName( "VerboseLevel", true );
|
||||
theVerboseCmd->SetDefaultValue( 1 );
|
||||
theVerboseCmd->SetRange( "VerboseLevel>=0" );
|
||||
}
|
||||
|
||||
|
||||
G4HadronicParametersMessenger::~G4HadronicParametersMessenger() {
|
||||
delete theDirectory;
|
||||
delete theVerboseCmd;
|
||||
}
|
||||
|
||||
|
||||
void G4HadronicParametersMessenger::SetNewValue( G4UIcommand *command, G4String newValues ) {
|
||||
if ( command == theVerboseCmd ) {
|
||||
// Note that the messenger updates only the verbose level of the class G4HadronicParameters:
|
||||
// it is the responsibility of each hadronic model, cross section and process to check
|
||||
// this verbose level and behave accordingly.
|
||||
theHadronicParameters->SetVerboseLevel( theVerboseCmd->GetNewIntValue( newValues ) );
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user