Import Geant4 10.3.0 source tree

2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
@@ -15,6 +15,15 @@ track of all tags.
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+19/11/16 Andrea Dotti		      (ThreadsafeScorers-V10-02-05)
+- Explicit set of SD to manager
+
+14/10/16 Gunter Folger                (ThreadsafeScorers-V10-02-04)
+- remove direct use of theParticleIterator, use GetParticleTableIterator().
+
+04/07/16 Ivana Hrivnacova             (ThreadsafeScorers-V10-02-03)
+- Fixes for Doxygen documentation
+
 15/06/16 Gunter Folger                (ThreadsafeScorers-V10-02-02)
 - Correct GNUmakefile, remove setting of WORKDIR=.

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file parallel/ThreadsafeScorers/atomics/G4TAtomicHitsCollection.hh
+/// \file parallel/ThreadsafeScorers/include/G4TAtomicHitsCollection.hh
 /// \brief Definition of the G4TAtomicHitsCollection class
 //
 //
@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file parallel/ThreadsafeScorers/atomics/G4TAtomicHitsMap.hh
+/// \file parallel/ThreadsafeScorers/include/G4TAtomicHitsMap.hh
 /// \brief Definition of the G4TAtomicHitsMap class
 //
 //
@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file parallel/ThreadsafeScorers/atomics/G4atomic.hh
+/// \file parallel/ThreadsafeScorers/include/G4atomic.hh
 /// \brief Definition of the G4atomic class
 //
 //
@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file parallel/ThreadsafeScorers/atomics/G4atomic_defines.hh
+/// \file parallel/ThreadsafeScorers/include/G4atomic_defines.hh
 /// \brief Definition of the G4atomic_defines class
 //
 //
@@ -69,6 +69,7 @@
 #include "G4UnitsTable.hh"
 #include "G4UserLimits.hh"

+#include "G4SDManager.hh"
 #include "G4MultiFunctionalDetector.hh"
 #include "G4PSEnergyDeposit.hh"
 #include "G4PSNofStep.hh"
@@ -280,7 +281,7 @@ void TSDetectorConstruction::ConstructSDandField()
    //------------------------------------------------//
    // Define MultiFunctionalDetector with name.
    G4MultiFunctionalDetector* MFDet = new G4MultiFunctionalDetector(fMfdName);
-
+    G4SDManager::GetSDMpointer()->AddNewDetector(MFDet);
    G4VPrimitiveScorer* edep = new G4PSEnergyDeposit("EnergyDeposit");
    MFDet->RegisterPrimitive(edep);
    G4VPrimitiveScorer* nstep = new G4PSNofStep("NumberOfSteps");
@@ -157,13 +157,14 @@ void TSPhysicsList::ConstructProcess()
    step_limit_particles.insert("mu+");
    step_limit_particles.insert("mu-");

-    theParticleIterator->reset();
+    auto particleIterator=GetParticleIterator();
+    particleIterator->reset();

    G4PhysicsListHelper* ph = G4PhysicsListHelper::GetPhysicsListHelper();

-    while( (*theParticleIterator)() )
+    while( (*particleIterator)() )
    {
-        G4ParticleDefinition* particle = theParticleIterator->value();
+        G4ParticleDefinition* particle = particleIterator->value();
        G4String pname = particle->GetParticleName();

        if(step_limit_particles.find(pname) != step_limit_particles.end() ||