Import Geant4 10.5.1 source tree

source/run/src/G4ExceptionHandler.cc

@@ -58,12 +58,12 @@ G4ExceptionHandler& G4ExceptionHandler::operator=(const G4ExceptionHandler &)
    return *this;
 }
 
-G4int G4ExceptionHandler::operator==(const G4ExceptionHandler &right) const
+G4bool G4ExceptionHandler::operator==(const G4ExceptionHandler &right) const
 {
    return (this == &right);
 }
 
-G4int G4ExceptionHandler::operator!=(const G4ExceptionHandler &right) const
+G4bool G4ExceptionHandler::operator!=(const G4ExceptionHandler &right) const
 {
    return (this != &right);
 }

source/run/src/G4MatScanMessenger.cc

@@ -110,7 +110,7 @@ G4MatScanMessenger::G4MatScanMessenger(G4MaterialScanner* p1)
   singleCmd->SetParameter(par);
 
   single2Cmd = new G4UIcmdWith3Vector("/control/matScan/singleTo",this);
-  single2Cmd->SetGuidance("Measure thicknesss for one direction defined by a unit vector.");
+  single2Cmd->SetGuidance("Measure thickness for one direction defined by a unit vector.");
   single2Cmd->SetParameterName("X","Y","Z",false);
 
   eyePosCmd = new G4UIcmdWith3VectorAndUnit("/control/matScan/eyePosition",this);

source/run/src/G4MultiRunAction.cc

@@ -49,7 +49,7 @@ G4Run* G4MultiRunAction::GenerateRun() {
               " of G4Run, not allowed.");
           return nullptr;
       }
-      aRun = anotherRun;
+      if( anotherRun != nullptr) aRun = anotherRun;
   }
   return aRun;
 }

source/run/src/G4RunMessenger.cc

@@ -141,21 +141,21 @@ G4RunMessenger::G4RunMessenger(G4RunManager * runMgr)
   evModCmd->SetGuidance("The value N may affect on the computing performance in particular");
   evModCmd->SetGuidance("if N is too small compared to the total number of events.");
   evModCmd->SetGuidance("The second parameter seedOnce specifies how frequently each worker");
-  evModCmd->SetGuidance("thread is seeded by the random number sequence contrally managed");
+  evModCmd->SetGuidance("thread is seeded by the random number sequence centrally managed");
   evModCmd->SetGuidance("by the master G4MTRunManager.");
   evModCmd->SetGuidance(" - If seedOnce is set to 0 (default), seeds that are centrally managed");
   evModCmd->SetGuidance("   by G4MTRunManager are set for every event of every worker thread.");
-  evModCmd->SetGuidance("   This option guarantees event reproducability regardless of number");
+  evModCmd->SetGuidance("   This option guarantees event reproducibility regardless of number");
   evModCmd->SetGuidance("   of threads.");
   evModCmd->SetGuidance(" - If seedOnce is set to 1, seeds are set only once for the first");
-  evModCmd->SetGuidance("   event of each run of each worker thread. Event reproducability is");
+  evModCmd->SetGuidance("   event of each run of each worker thread. Event reproducibility is");
   evModCmd->SetGuidance("   guaranteed only if the same number of worker threads are used.");
   evModCmd->SetGuidance("   On the other hand, this option offers better computing performance");
   evModCmd->SetGuidance("   in particular for applications with relatively small primary");
   evModCmd->SetGuidance("   particle energy and large number of events."); 
   evModCmd->SetGuidance(" - If seedOnce is set to 2, seeds are set only for the first event of");
   evModCmd->SetGuidance("   group of N events. This option is reserved for the future use when");
-  evModCmd->SetGuidance("   Geant4 allows number of threads to be dynatically changed during an");
+  evModCmd->SetGuidance("   Geant4 allows number of threads to be dynamically changed during an");
   evModCmd->SetGuidance("   event loop.");
   evModCmd->SetGuidance("This command is valid only for multi-threaded mode.");
   evModCmd->SetGuidance("This command is ignored if it is issued in sequential mode.");
@@ -237,7 +237,7 @@ G4RunMessenger::G4RunMessenger(G4RunManager * runMgr)
   physCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
 
   constScoreCmd = new G4UIcmdWithoutParameter("/run/constructScoringWorlds",this);
-  constScoreCmd->SetGuidance("Constrct scoring parallel world(s) if defined.");
+  constScoreCmd->SetGuidance("Construct scoring parallel world(s) if defined.");
   constScoreCmd->SetGuidance("This command is not mandatory, but automatically called when a run starts.");
   constScoreCmd->SetGuidance("But the user may use this to visualize the scoring world(s) before a run to start.");
   constScoreCmd->AvailableForStates(G4State_Idle);

source/run/src/G4UserPhysicsListMessenger.cc

@@ -49,6 +49,7 @@
 #include "G4UIcmdWithAnInteger.hh"
 #include "G4UIcmdWithADoubleAndUnit.hh"
 #include "G4UIcmdWithAString.hh"
+#include "G4UIparameter.hh"
 #include "G4ParticleTable.hh"
 #include "G4ios.hh"
 #include "G4Tokenizer.hh"           
@@ -91,7 +92,7 @@ G4UserPhysicsListMessenger::G4UserPhysicsListMessenger(G4VUserPhysicsList* pPart
   param->SetParameterRange("cut>=0.0") ;
   setCutForAGivenParticleCmd->SetParameter(param) ;
   param = new G4UIparameter("unit",'s',false) ;
-  param->SetDefaultValue("mm") ;
+  param->SetDefaultUnit("mm");
   setCutForAGivenParticleCmd->SetParameter(param) ;
   setCutForAGivenParticleCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
 
@@ -154,7 +155,7 @@ G4UserPhysicsListMessenger::G4UserPhysicsListMessenger(G4VUserPhysicsList* pPart
 
   //  /run/particle/setStoredInAscii command
   asciiCmd = new G4UIcmdWithAnInteger("/run/particle/setStoredInAscii",this);
-  asciiCmd->SetGuidance("Switch on/off ascii mode in store/retreive Physics Table");
+  asciiCmd->SetGuidance("Switch on/off ascii mode in store/retrieve Physics Table");
   asciiCmd->SetGuidance("  Enter 0(binary) or 1(ascii)");
   asciiCmd->SetParameterName("ascii",true);
   asciiCmd->SetDefaultValue(0);
@@ -191,7 +192,7 @@ G4UserPhysicsListMessenger::G4UserPhysicsListMessenger(G4VUserPhysicsList* pPart
   dumpCutValuesCmd->SetGuidance("Dumping a list takes place when you issue 'beamOn' and");
   dumpCutValuesCmd->SetGuidance("actual conversion tables from range to energy are available.");
   dumpCutValuesCmd->SetGuidance("If you want a list 'immediately', use '/run/dumpRegion' for threshold");
-  dumpCutValuesCmd->SetGuidance("list given in gange only. Also, '/run/dumpCouples' gives you the");
+  dumpCutValuesCmd->SetGuidance("list given in range only. Also, '/run/dumpCouples' gives you the");
   dumpCutValuesCmd->SetGuidance("current list if you have already issued 'run/beamOn' at least once.");
   dumpCutValuesCmd->SetParameterName("particle",true);
   dumpCutValuesCmd->SetDefaultValue("all");

source/run/src/G4VUserPhysicsList.cc

@@ -601,11 +601,11 @@ void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
   }
   if (fRetrievePhysicsTable) {
     if ( !fIsRestoredCutValues){
-      // fail to retreive cut tables
+      // fail to retrieve cut tables
 #ifdef G4VERBOSE
       if (verboseLevel>0){
 	G4cout << "G4VUserPhysicsList::BuildPhysicsTable  "
-	       << "Physics table can not be retreived and will be calculated "
+	       << "Physics table can not be retrieved and will be calculated "
 	       << G4endl;
       }
 #endif