Import Geant4 11.0.0.beta source tree

source/intercoms/CMakeLists.txt

@@ -1,9 +1,6 @@
-#------------------------------------------------------------------------------
-# Module : G4intercoms
-# Package: Geant4.src.G4intercoms
-#------------------------------------------------------------------------------
+# - G4intercoms category build(s)
 
 # Add allocation export symbol for the intercoms category
 add_definitions(-DG4ICOMS_ALLOC_EXPORT)
 
-geant4_global_library_target(COMPONENTS sources.cmake)
+geant4_global_library_target(NAME G4intercoms COMPONENTS sources.cmake)

source/intercoms/History

@@ -16,10 +16,21 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-06 May, 2021  G. Cosmo (intercoms-V10-06-08)
+06 May, 2021  G. Cosmo (intercoms-V10-07-05)
 - Fixed shadowing compilation warning in G4UImanager reported with gcc-11.
 
-16 January 2020  John Allison (intercoms-V10-06-07)
+12 April, 2021  G. Cosmo (intercoms-V10-07-04)
+- Fixed leak in G4ProfilerMessenger.
+
+12 March 2021 Ben Morgan (intercoms-V10-07-03)
+- Modernize CMake build
+
+10 February 2020  John Allison (intercoms-V10-07-02)
+- G4UImanager:
+  o Set LastCommandOutputTreated=false only for master thread.
+    Avoids inadvertent "highlighting" in G4UIQt on worker threads.
+
+16 January 2020  John Allison (intercoms-V10-07-01)
 - G4UImanager:
   o Introduce flag and access functions for LastCommandOutputTreated.
   o This flag is set to false at the point in ApplyCommand where, if
@@ -28,7 +39,7 @@ committal in the CVS repository !
   o Of course, the UI may simply ignore it.
 
 12 November, 2020  J. Madsen (intercoms-V10-06-06)
-- Added G4ProfilerMessenger
+- Added G4ProfilerMessenger.
 - See examples/extended/parallel/ThreadsafeScorers/run.mac for example usage
 
 30 September, 2020  M. Asai (intercoms-V10-06-05)

source/intercoms/include/G4ProfilerMessenger.hh

@@ -23,18 +23,18 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
+// G4ProfilerMessenger
 //
-//
-// class description
+// Class description
 //
 // This class is the messenger of the class which maintain the profiling
 // controls (located in global/management/include/G4Profiler.hh).
-// In general, it forwards to the argument parser provided by timemory
+// In general, it forwards to the argument parser provided by timemory.
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-#ifndef G4ProfilerMessenger_h
-#define G4ProfilerMessenger_h 1
+// Author: J.Madsen, 12 November 2020
+// --------------------------------------------------------------------
+#ifndef G4ProfilerMessenger_hh
+#define G4ProfilerMessenger_hh 1
 
 #include "globals.hh"
 #include "G4UImessenger.hh"
@@ -44,7 +44,7 @@ class G4UIdirectory;
 class G4UIcmdWithAString;
 class G4UIcmdWithABool;
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// --------------------------------------------------------------------
 
 class G4ProfilerMessenger : public G4UImessenger
 {

source/intercoms/sources.cmake

@@ -1,13 +1,7 @@
-#------------------------------------------------------------------------------
-# Module : G4intercoms
-# Package: Geant4.src.G4intercoms
-#------------------------------------------------------------------------------
+# - G4intercoms module build definition
 
-#
-# Define the Geant4 Module.
-#
-geant4_define_module(NAME G4intercoms
-  HEADERS
+geant4_add_module(G4intercoms
+  PUBLIC_HEADERS
     G4AnyMethod.hh
     G4AnyType.hh
     G4GenericMessenger.hh
@@ -64,13 +58,6 @@ geant4_define_module(NAME G4intercoms
     G4UIparameter.cc
     G4UIsession.cc
     G4UnitsMessenger.cc
-    G4VGlobalFastSimulationManager.cc
-  GRANULAR_DEPENDENCIES
-    G4globman
-  GLOBAL_DEPENDENCIES
-    G4global
-  LINK_LIBRARIES
-    ${timemory_LIBRARIES}
-)
+    G4VGlobalFastSimulationManager.cc)
 
-# List any source specific properties here
+geant4_module_link_libraries(G4intercoms PUBLIC G4globman PRIVATE ${timemory_LIBRARIES})

source/intercoms/src/G4ProfilerMessenger.cc

@@ -23,12 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
+// G4ProfilerMessenger implementation
 //
-//
-//
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// Author: J.Madsen, 12 November 2020
+// --------------------------------------------------------------------
 
 #include "G4ProfilerMessenger.hh"
 
@@ -38,7 +36,7 @@
 #include "G4UIcmdWithAString.hh"
 #include "G4TiMemory.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// --------------------------------------------------------------------
 
 using Type = G4ProfileType;
 
@@ -145,11 +143,12 @@ G4ProfilerMessenger::G4ProfilerMessenger()
     "Display the results for each individual G4event (default: aggregation)");
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// --------------------------------------------------------------------
 
 G4ProfilerMessenger::~G4ProfilerMessenger()
 {
   delete profileDirectory;
+  delete profileOutputDirectory;
   for(auto& itr : profileTypeDirs)
     delete itr;
   for(auto& itr : profileEnableCmds)
@@ -160,7 +159,7 @@ G4ProfilerMessenger::~G4ProfilerMessenger()
     delete itr.first;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// --------------------------------------------------------------------
 
 void G4ProfilerMessenger::SetNewValue(G4UIcommand* command, G4String value)
 {
@@ -206,4 +205,4 @@ void G4ProfilerMessenger::SetNewValue(G4UIcommand* command, G4String value)
     G4Profiler::Configure(command_line);
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// --------------------------------------------------------------------

source/intercoms/src/G4UImanager.cc

@@ -488,7 +488,7 @@ G4int G4UImanager::ApplyCommand(const char* aCmd)
   if(aCommand.isNull())
     return fAliasNotFound;
   if(verboseLevel) {
-    fLastCommandOutputTreated = false;
+    if (isMaster) fLastCommandOutputTreated = false;
     G4cout << aCommand << G4endl;
   }
   G4String commandString;