Import Geant4 10.7.0 source tree

source/event/src/G4EventManager.cc

@@ -40,6 +40,8 @@
 #include "G4TransportationManager.hh"
 #include "G4Navigator.hh"
 #include "Randomize.hh"
+#include "G4Profiler.hh"
+#include "G4TiMemory.hh"
 
 G4ThreadLocal G4EventManager* G4EventManager::fpEventManager = nullptr;
 
@@ -128,6 +130,10 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
 
   if(userEventAction) userEventAction->BeginOfEventAction(currentEvent);
 
+#if defined(GEANT4_USE_TIMEMORY)
+  eventProfiler.reset(new ProfilerConfig(currentEvent));
+#endif
+
 #ifdef G4VERBOSE
   if ( verboseLevel > 1 )
   {
@@ -247,6 +253,10 @@ void G4EventManager::DoProcessing(G4Event* anEvent)
     sdManager->TerminateCurrentEvent(currentEvent->GetHCofThisEvent());
   }
 
+#if defined(GEANT4_USE_TIMEMORY)
+  eventProfiler.reset();
+#endif
+
   if(userEventAction)
   {
     userEventAction->EndOfEventAction(currentEvent);

source/event/src/G4PrimaryTransformer.cc

@@ -144,7 +144,7 @@ GenerateSingleTrack( G4PrimaryParticle* primaryParticle,
     if(verboseLevel>1)
     {
       G4cout << "Primary particle (" << partDef->GetParticleName()
-             << ") --- Transfered with momentum "
+             << ") --- Transferred with momentum "
              << primaryParticle->GetMomentum()
              << G4endl;
     }

source/event/src/G4SPSPosDistribution.cc

@@ -267,6 +267,14 @@ void G4SPSPosDistribution::ConfineSourceToVolume(const G4String& Vname)
   VolName = Vname;
   if(verbosityLevel == 2) { G4cout << VolName << G4endl; }
 
+  if(VolName=="NULL")
+  {
+    if(verbosityLevel >= 1)
+    { G4cout << "Volume confinement is set off." << G4endl; }
+    Confine = false;
+    return;
+  }
+
   G4VPhysicalVolume* tempPV = nullptr;
   G4PhysicalVolumeStore* PVStore = nullptr;
   G4String theRequiredVolumeName = VolName;
@@ -299,7 +307,7 @@ void G4SPSPosDistribution::ConfineSourceToVolume(const G4String& Vname)
   }
   else
   {
-    G4cout << " **** Error: Volume does not exist **** " << G4endl;
+    G4cout << " **** Error: Volume <" << VolName << "> does not exist **** " << G4endl;
     G4cout << " Ignoring confine condition" << G4endl;
     Confine = false;
     VolName = "NULL";
@@ -1165,7 +1173,7 @@ void G4SPSPosDistribution::GeneratePointsInVolume(G4ThreeVector& pos)
   }
   else
   {
-    G4cout << "Error: Volume Shape Doesnt Exist" << G4endl;
+    G4cout << "Error: Volume Shape does not exist" << G4endl;
   }
 
   RandPos.setX(x);