Import Geant4 10.6.0 source tree

examples/extended/exoticphysics/monopole/src/G4MonopoleTransportation.cc

@@ -85,13 +85,11 @@ G4MonopoleTransportation::G4MonopoleTransportation( const G4Monopole* mpl,
   SetProcessSubType(TRANSPORTATION);  
 
 
-#ifdef G4MULTITHREADED
   // Do not finalize the G4MonopoleTransportation class 
-  if (G4Threading::IsMasterThread())
+  if (G4Threading::IsMasterThread() && G4Threading::IsMultithreadedApplication() )
     {
       return;
     }
-#endif
 
   const DetectorConstruction* detector = 
     static_cast<const DetectorConstruction*>

examples/extended/exoticphysics/monopole/src/Run.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file electromagnetic/TestEm5/src/Run.cc
+/// \file exoticphysics/monopole/src/Run.cc
 /// \brief Implementation of the Run class
 //
 // 
@@ -77,9 +77,9 @@ void Run::Merge(const G4Run* run)
 void Run::EndOfRun(double binLength)
 {
 
-#ifndef G4MULTITHREADED
-  fNevt += this->GetNumberOfEvent();
-#endif
+  if ( ! G4Threading::IsMultithreadedApplication() ) {
+    fNevt += this->GetNumberOfEvent();
+  }
 
   G4int nEvents = fNevt;
   if (nEvents == 0) { return; }

examples/extended/exoticphysics/monopole/src/RunAction.cc

@@ -61,9 +61,8 @@ RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* kin)
 
 RunAction::~RunAction()
 {
-#ifdef G4MULTITHREADED
-  if(isMaster) delete fKinematic;
-#endif
+  if(isMaster && G4Threading::IsMultithreadedApplication()) delete fKinematic;
+
   delete fMessenger;
 }