Import Geant4 11.0.0.beta source tree

examples/extended/parallel/ThreadsafeScorers/CMakeLists.txt

@@ -1,7 +1,4 @@
-cmake_minimum_required(VERSION 3.8...3.18)
-if(${CMAKE_VERSION} VERSION_LESS 3.12)
-  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-endif()
+cmake_minimum_required(VERSION 3.12...3.20)
 
 set(name ts_scorers)
 project(ThreadsafeScorers C CXX)

examples/extended/parallel/ThreadsafeScorers/History

@@ -14,7 +14,12 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-12/11/20202 Jonathan Madsen (ThreadsafeScorers-V10-06-03)
+13/02/2021 V. Ivantchenko (ThreadsafeScorers-V10-07-00)
+- TSPhysicsList - removed obsolete header G4EmProcessOptions; removed
+  method SetCuts(..) to avoid data race - use the one from the base class; 
+  removed singletone pattern from this class - it is not used and not needed. 
+
+12/11/2020 Jonathan Madsen (ThreadsafeScorers-V10-06-03)
 - Replaced TIMEMORY_AUTO_TIMER usage with G4USER_SCOPED_PROFILE usage
 
 23/6/2020 Jonathan Madsen (ThreadsafeScores-V10-06-02)

examples/extended/parallel/ThreadsafeScorers/include/TSPhysicsList.hh

@@ -57,15 +57,11 @@ class TSPhysicsList : public G4VUserPhysicsList
   virtual ~TSPhysicsList();
 
  public:
-  static TSPhysicsList* Instance();
-  void ConstructParticle();
-  void ConstructProcess();
-  void SetCuts();
+  void ConstructParticle() override;
+  void ConstructProcess() override;
 
  private:
-  static TSPhysicsList* fgInstance;
   PhysicsSet_t fConstructors;
-  G4double fDefaultCutValue;
 };
 
 #endif

examples/extended/parallel/ThreadsafeScorers/src/TSPhysicsList.cc

@@ -62,7 +62,6 @@
 
 // Process options
 #include "G4LossTableManager.hh"
-#include "G4EmProcessOptions.hh"
 
 // Physics List Helper
 #include "G4PhysicsListHelper.hh"
@@ -85,18 +84,9 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-TSPhysicsList* TSPhysicsList::fgInstance = 0;
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-TSPhysicsList* TSPhysicsList::Instance() { return fgInstance; }
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
 TSPhysicsList::TSPhysicsList()
-  : fDefaultCutValue(1. * CLHEP::mm)
 {
-  fgInstance = this;
+  defaultCutValue = 1. * CLHEP::mm;
 
   fConstructors.push_back(new G4EmStandardPhysics_option4);
   fConstructors.push_back(new G4DecayPhysics);
@@ -113,8 +103,6 @@ TSPhysicsList::~TSPhysicsList()
 {
   for(auto ite : fConstructors)
     delete ite;
-
-  fgInstance = 0;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -174,13 +162,3 @@ void TSPhysicsList::ConstructProcess()
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-void TSPhysicsList::SetCuts()
-{
-  SetCutValue(fDefaultCutValue, "e-");
-  SetCutValue(fDefaultCutValue, "e+");
-  SetCutValue(fDefaultCutValue, "gamma");
-  SetCutValue(fDefaultCutValue, "proton");
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......