Import Geant4 11.1.0.beta source tree

examples/extended/parallel/MPI/source/CMakeLists.txt

@@ -147,7 +147,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 endif()
 #If this is built as part of G4 CMAKE_INSTALL_LIBDIR is defined, we need to
 #so force check of what we should use
-include(Geant4MacroLibraryTargets OPTIONAL RESULT_VARIABLE _internal_build)
+include(G4DeveloperAPI OPTIONAL RESULT_VARIABLE _internal_build)
 if(_internal_build)
   set(_dolib64 TRUE)
 endif()

examples/extended/parallel/MPI/source/analysis/include/G4RootMpiPNtupleDescription.hh

@@ -41,12 +41,12 @@
 #include "tools/ntuple_booking"
 #include "tools/impi"
 #include "tools/wroot/impi_ntuple"
+#include "tools/wroot/ntuple"
 
 namespace tools {
 namespace wroot {
 class branch;
 class base_pntuple;
-class ntuple;
 }
 }
 

examples/extended/parallel/MPI/source/include/G4MPIntupleMerger.hh

@@ -33,7 +33,7 @@
 #include "G4MPImanager.hh"
 #include "G4VMPIextraWorker.hh"
 
-namespace tools {
+namespace toolx {
 namespace mpi {
 class wrmpi;    
 }
@@ -49,7 +49,7 @@ public:
   ~G4MPIntupleMerger();
 
 private:
-  tools::mpi::wrmpi* fWrmpi;
+  toolx::mpi::wrmpi* fWrmpi;
 };
 
 #endif //G4MPINTUPLEMERGER_HH

examples/extended/parallel/MPI/source/src/G4MPIhistoMerger.cc

@@ -31,7 +31,7 @@
 #include "G4MPIhistoMerger.hh"
 #include "G4MPImanager.hh"
 #include "G4ios.hh"
-#include "tools/mpi/hmpi"
+#include "toolx/mpi/hmpi"
 #include <mpi.h>
 #include "G4VAnalysisManager.hh"
 
@@ -54,8 +54,8 @@ void G4MPIhistoMerger::Merge()
   G4bool verbose = ( verboseLevel > 1 );
   G4int tag = G4MPImanager::kTAG_HISTO;
   //const MPI::Intracomm* comm = &COMM_G4COMMAND_;
-  tools::mpi::hmpi* hmpi 
-    = new tools::mpi::hmpi(G4cout, destination, tag, comm, verbose);
+  toolx::mpi::hmpi* hmpi 
+    = new toolx::mpi::hmpi(G4cout, destination, tag, comm, verbose);
   if ( ! manager->Merge(hmpi) ) {
       G4cout<<" Merge FAILED"<<G4endl;
   }

examples/extended/parallel/MPI/source/src/G4MPIntupleMerger.cc

@@ -31,7 +31,7 @@
 #include "G4RootMpiAnalysisManager.hh"
 #include "G4ios.hh"
 
-#include "tools/mpi/wrmpi"
+#include "toolx/mpi/wrmpi"
 
 #include <mpi.h>
 
@@ -57,7 +57,7 @@ G4MPIntupleMerger::G4MPIntupleMerger(G4int nofReducedNtupleFiles,
   auto comm  = mpiManager->GetAllComm();
 
   // G4int tag = G4MPImanager::kTAG_NTUPLE;
-  fWrmpi = new tools::mpi::wrmpi(G4cout, *comm);
+  fWrmpi = new toolx::mpi::wrmpi(G4cout, *comm);
 
   analysisManager->SetMpiNtupleMerging(
     fWrmpi, mpiRank, mpiSize, nofReducedNtupleFiles);