Import Geant4 10.5.0 source tree

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the G4TAtomicHitsCollection class
 //
 //
-// $Id: G4TAtomicHitsCollection.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// This is an implementation of G4THitsCollection<T> where the underlying

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the G4TAtomicHitsMap class
 //
 //
-// $Id: G4TAtomicHitsMap.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// This is an implementation of G4THitsMap<T> where the underlying
@@ -131,6 +130,8 @@ public:
     return theCollection->size();
   }
 
+  virtual size_t size() const { return theCollection->size(); }
+
 public:
   iterator begin() { return theCollection->begin(); }
   iterator end() { return theCollection->end(); }

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the G4atomic class
 //
 //
-// $Id: G4atomic.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// This is an friendly implementation of the STL atomic class.

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the G4atomic_defines class
 //
 //
-// $Id: G4atomic_defines.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// This is a functional class for G4atomic. The functions in this

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the TSActionInitialization class
 //
 //
-// $Id: TSActionInitialization.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// Standard ActionInitialization class creating a RunAction instance for the

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the TSDetectorConstruction class
 //
 //
-// $Id: TSDetectorConstruction.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// Construction of a target material (default = boron) surrounded by a
@@ -89,6 +88,8 @@ public:
     inline const ScoringVolumes_t& GetScoringVolumes() const
     { return fScoringVolumes; }
     inline const G4String& GetMFDName() const { return fMfdName; }
+    inline G4int GetTotalTargets() const 
+    { return fTargetSections.x() * fTargetSections.y() * fTargetSections.z(); }
 
 protected:
     virtual MaterialCollection_t ConstructMaterials();

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the TSPhysicsList class
 //
 //
-// $Id: TSPhysicsList.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// This is a very, very extensive physics list and step-limiters are applied

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the TSPrimaryGeneratorAction class
 //
 //
-// $Id: TSPrimaryGeneratorAction.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// Simple PrimaryGeneratorAction that produces a -Z surface flux of 1 MeV

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the TSRun class
 //
 //
-// $Id: TSRun.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 /// TSRun contains three collections of hits maps: a thread-local hits map,
@@ -62,11 +61,18 @@
 #include "G4Event.hh"
 #include "G4THitsMap.hh"
 #include "G4TAtomicHitsMap.hh"
+#include "G4THitsVector.hh"
+#include "G4StatAnalysis.hh"
+#include "G4ConvergenceTester.hh"
 
 #include <vector>
 
 class G4Event;
 
+//template <typename _Tp> using G4StatContainer = G4THitsMap<_Tp>;
+//template <typename _Tp> using G4StatContainer = G4THitsVector<_Tp>;
+template <typename _Tp> using G4StatContainer = G4THitsDeque<_Tp>;
+
 class TSRun : public G4Run
 {
 public:
@@ -85,6 +91,8 @@ public:
     G4THitsMap<G4double>* GetHitsMap(const G4String& collname) const;
     G4TAtomicHitsMap<G4double>* GetAtomicHitsMap(const G4String&) const;
     MutexHitsMap_t* GetMutexHitsMap(const G4String&) const;
+    G4StatContainer<G4StatAnalysis>* GetStatMap(const G4String& collname) const;
+    G4StatContainer<G4ConvergenceTester>* GetConvMap(const G4String&) const;
 
     void ConstructMFD(const G4String&);
 
@@ -94,8 +102,10 @@ private:
     std::vector<G4String> fCollNames;
     std::vector<G4int> fCollIDs;
     std::vector<G4THitsMap<G4double>*> fRunMaps;
+    std::vector<G4StatContainer<G4StatAnalysis>*> fStatMaps;
     static std::vector<G4TAtomicHitsMap<G4double>*> fAtomicRunMaps;
     static std::map<G4String, MutexHitsMap_t> fMutexRunMaps;
+    static std::vector<G4StatContainer<G4ConvergenceTester>*> fConvMaps;
 
 };
 

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

@@ -27,7 +27,6 @@
 /// \brief Definition of the TSRunAction class
 //
 //
-// $Id: TSRunAction.hh 93110 2015-11-05 08:37:42Z jmadsen $
 //
 //
 //