Import Geant4 10.3.1 source tree

source/analysis/History

@@ -1,4 +1,4 @@
-$Id: History 101419 2016-11-17 10:36:30Z gcosmo $
+$Id: History 102848 2017-02-27 13:09:25Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,10 @@ committal in the SVN repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+February 24, 2017 I. Hrivnacova (analysis-V10-02-26)
+- Restored clean-up of Root empty files in MT mode
+  (which was lost with previous updates)
+
 November 17, 2016 I. Hrivnacova (analysis-V10-02-25)
 - Fixed compiler warning issued when G4VERBOSE is not set.
 - Updated to g4tools 2.3.0 (Guy Barrand):

source/analysis/accumulables/CMakeLists.txt

@@ -7,7 +7,7 @@
 #
 # Created on : 15/07/2013
 #
-# $Id: CMakeLists.txt 99561 2016-09-27 07:04:12Z gcosmo $
+# $Id: CMakeLists.txt 92606 2015-09-08 12:34:01Z ihrivnac $
 #
 #------------------------------------------------------------------------------
 

source/analysis/root/src/G4RootAnalysisManager.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4RootAnalysisManager.cc 100648 2016-10-31 10:06:45Z gcosmo $
+// $Id: G4RootAnalysisManager.cc 102848 2017-02-27 13:09:25Z gcosmo $
 
 // Author: Ivana Hrivnacova, 18/06/2013  (ivana@ipno.in2p3.fr)
 
@@ -624,6 +624,32 @@ G4bool G4RootAnalysisManager::CloseFileImpl()
     fFileManager->CloseFile(); 
   }
 
+  // No files clean-up in sequential mode
+  if ( ! G4Threading::IsMultithreadedApplication() )  return finalResult;
+  
+  // Delete files if empty in MT mode
+  if ( ( fState.GetIsMaster() && 
+         fH1Manager->IsEmpty() && fH2Manager->IsEmpty() && fH3Manager->IsEmpty() &&
+         fP1Manager->IsEmpty() && fP2Manager->IsEmpty() && fNtupleManager->IsEmpty() ) || 
+       ( ( ! fState.GetIsMaster() ) && fNtupleManager->IsEmpty() &&
+             fNtupleMergeMode == G4NtupleMergeMode::kNone ) ) {
+    result = ! std::remove(fFileManager->GetFullFileName());
+    //  std::remove returns 0 when success
+    if ( ! result ) {
+      G4ExceptionDescription description;
+      description << "      " << "Removing file " 
+                  << fFileManager->GetFullFileName() << " failed";
+      G4Exception("G4XmlAnalysisManager::CloseFile()",
+                "Analysis_W021", JustWarning, description);
+    }            
+    finalResult = finalResult && result;
+#ifdef G4VERBOSE
+    if ( fState.GetVerboseL1() ) 
+      fState.GetVerboseL1()
+        ->Message("delete", "empty file", fFileManager->GetFullFileName());
+#endif
+  }
+
   return finalResult;
 }