Import Geant4 10.7.0.beta source tree

source/processes/hadronic/util/include/G4HadFinalState.hh

@@ -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; }

source/processes/hadronic/util/include/G4HadronicParameters.hh

@@ -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

source/processes/hadronic/util/include/G4HadronicParametersMessenger.hh

@@ -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