Import Geant4 11.2.0 source tree

source/externals/g4tools/History

@@ -6,6 +6,16 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-11-09 Guy Barrand (g4tools-V11-01-06)
+- tools/wroot/file: in the constructor, for the streaming of the root directory, take into account the streaming of what would be
+  the fUUID (a TUUID in ROOT) field of the TDirectory version 4. This permits to fix the "G4AnalysisManager creates ROOT files
+  that are not updateable" issue described in bugzilla problem 2570.
+- tools/version: pass to 6.3.0.
+
+## 2023-07-03 Guy Barrand (g4tools-V11-01-05)
+- toolx/Xt/session: quiet Coverity CID=104821: in copy constructor, initialise m_app_owner(false).
+- tools/version: pass to 6.2.1.
+
 ## 2023-06-15 Gabriele Cosmo (g4tools-V11-01-04)
 - Fixed compilation warning for implicit type conversions on macOS/XCode 14.1
   in toolsx/Xt/zb_viewer.

source/externals/g4tools/History_tools

@@ -1,3 +1,14 @@
+6.3.0:
+- tools/wroot/file: in the constructor, for the streaming of the root directory, take into account the streaming of what would be
+  the fUUID (a TUUID in ROOT) field of the TDirectory version 4. This permits to fix the "G4AnalysisManager creates ROOT files
+  that are not updateable" issue described in bugzilla problem 2570.
+- tools/version: pass to 6.3.0.
+
+6.2.1:
+- toolx/Xt/session: quiet Coverity CID=104821: in copy constructor, initialise m_app_owner(false).
+- toolx/Xt/zb_viewer: Fixed compilation warning for implicit type conversions on macOS/XCode 14.1.
+- tools/version: pass to 6.2.1.
+
 6.2.0:
 - toolx/Qt: zb_viewer, pixwin, session, s2q: have a Qt viewer for the tools/zbuffer rendering.
 - toolx/Xt: zb_viewer, ImageArea, session: have a Xt viewer for the tools/zbuffer rendering.

source/externals/g4tools/include/tools/version

@@ -5,13 +5,13 @@
 #define tools_version
 
 #define TOOLS_MAJOR_VERSION 6
-#define TOOLS_MINOR_VERSION 2
+#define TOOLS_MINOR_VERSION 3
 #define TOOLS_PATCH_VERSION 0
-#define TOOLS_VERSION "6.2.0"
-#define TOOLS_VERSION_VRP "v6r2p0"
+#define TOOLS_VERSION "6.3.0"
+#define TOOLS_VERSION_VRP "v6r3p0"
 
 namespace tools {
-inline unsigned int version() {return 60200;}
+inline unsigned int version() {return 60300;}
 }
 
 #endif

source/externals/g4tools/include/tools/wroot/file

@@ -278,6 +278,12 @@ public:
       key::std_string_record_size(m_path) +
       key::std_string_record_size(m_title);
     uint32 nbytes = namelen + m_root_directory.record_size();
+
+    //TUUID version 1:
+    nbytes += sizeof(unsigned int);
+    nbytes += 2*sizeof(unsigned short);
+    nbytes += 8*sizeof(unsigned char);
+
     wroot::key key(m_out,*this,0,m_path,m_title,"TFile",nbytes); // It does a (*this).set_END().
 
     // m_nbytes_name = start point of directory info from key head.
@@ -297,7 +303,12 @@ public:
     wbuf wb(m_out,byte_swap(),key.eob(),pos);
     if(!wb.write(m_path)) return;
     if(!wb.write(m_title)) return;
-    if(!m_root_directory.to_buffer(wb)) return;}
+    if(!m_root_directory.to_buffer(wb)) return;
+    //TUUID version 1:
+    if(!wb.write((unsigned int)0)) return;
+    if(!wb.write((unsigned short)0)) return;
+    if(!wb.write((unsigned short)0)) return;
+   {for(size_t count=0;count<8;count++) if(!wb.write((unsigned char)0)) return;}}
 
     if(m_verbose) {
       m_out << "tools::wroot::file::file :"

source/externals/g4tools/include/toolx/Xt/session

@@ -44,7 +44,7 @@ public:
   }
 protected:
   session(const session& a_from)
-  :m_out(a_from.m_out),m_app_context(0),m_app_widget(0)
+  :m_out(a_from.m_out),m_app_context(0),m_app_widget(0),m_app_owner(false)
   {}
   session& operator=(const session&){return *this;}
 public: