Import Geant4 11.1.0 source tree

source/analysis/factory/include/G4GenericAnalysisManager.hh

@@ -41,6 +41,7 @@
 #include <string_view>
 
 class G4GenericAnalysisManager;
+class G4GenericAnalysisMessenger;
 class G4GenericFileManager;
 class G4HnInformation;
 class G4VNtupleFileManager;
@@ -53,18 +54,17 @@ class G4GenericAnalysisManager : public  G4ToolsAnalysisManager
   friend class G4ThreadLocalSingleton<G4GenericAnalysisManager>;
 
   public:
-    virtual ~G4GenericAnalysisManager();
+    ~G4GenericAnalysisManager() override;
 
     // Static methods
     static G4GenericAnalysisManager* Instance();
     static G4bool IsInstance();
 
     // MT/MPI
-    virtual void SetNtupleMerging(G4bool mergeNtuples,
-                   G4int nofReducedNtupleFiles = 0) override;
-    virtual void SetNtupleRowWise(G4bool rowWise, G4bool rowMode = true) override;
-    virtual void SetBasketSize(unsigned int basketSize)  override;
-    virtual void SetBasketEntries(unsigned int basketEntries)  override;
+    void SetNtupleMerging(G4bool mergeNtuples, G4int nofReducedNtupleFiles = 0) override;
+    void SetNtupleRowWise(G4bool rowWise, G4bool rowMode = true) override;
+    void SetBasketSize(unsigned int basketSize) override;
+    void SetBasketEntries(unsigned int basketEntries) override;
 
     // write in an extra file
     G4bool WriteH1(G4int id, const G4String& fileName);
@@ -80,14 +80,9 @@ class G4GenericAnalysisManager : public  G4ToolsAnalysisManager
 
   protected:
     // Virtual methods from base class
-    virtual G4bool OpenFileImpl(const G4String& fileName) override;
-    virtual G4bool WriteImpl() final;
-    virtual G4bool CloseFileImpl(G4bool reset = true) override;
-    virtual G4bool ResetImpl() final;
-    virtual G4bool IsOpenFileImpl() const final;
+    G4bool OpenFileImpl(const G4String& fileName) override;
     // File manager access
-    virtual std::shared_ptr<G4VFileManager> GetFileManager(const G4String& fileName) final;
-
+    std::shared_ptr<G4VFileManager> GetFileManager(const G4String& fileName) final;
 
   private:
     G4GenericAnalysisManager();
@@ -100,6 +95,7 @@ class G4GenericAnalysisManager : public  G4ToolsAnalysisManager
     static constexpr std::string_view fkClass { "G4GenericAnalysisManager" };
 
     // Data members
+    std::unique_ptr<G4GenericAnalysisMessenger>  fMessenger;
     std::shared_ptr<G4GenericFileManager> fFileManager { nullptr };
     // add G4GenericNtupleManager
     // this class will be analogic to file managers but with ntuples

source/analysis/factory/include/G4GenericAnalysisManager.icc

@@ -76,10 +76,3 @@ inline G4String G4GenericAnalysisManager::GetDefaultFileType() const
 {
   return fFileManager->GetDefaultFileType();
 }
-
-//_____________________________________________________________________________
-inline
-G4bool G4GenericAnalysisManager::IsOpenFileImpl() const
-{
-  return fFileManager->IsOpenFile();
-}

source/analysis/factory/include/G4GenericAnalysisMessenger.hh

@@ -0,0 +1,80 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+
+// The messenger class for G4GenericAnalysisManager.
+// It implements command:
+// - /analysis/setDefaultFileType
+//
+// Author: Ivana Hrivnacova, 18/10/2022  (ivana@ipno.in2p3.fr)
+
+#ifndef G4GenericAnalysisMessenger_h
+#define G4GenericAnalysisMessenger_h 1
+
+#include "G4UImessenger.hh"
+#include "globals.hh"
+
+#include <memory>
+
+class G4GenericAnalysisManager;
+class G4UIcmdWithAString;
+
+class G4GenericAnalysisMessenger : public G4UImessenger
+{
+  public:
+    explicit G4GenericAnalysisMessenger(G4GenericAnalysisManager* manager);
+    G4GenericAnalysisMessenger() = delete;
+    ~G4GenericAnalysisMessenger() override;
+
+    // Methods
+    void SetNewValue(G4UIcommand* command, G4String value) final;
+
+  private:
+    template <typename CMD>
+    std::unique_ptr<CMD> CreateCommand(
+      G4String name, G4String guidance, G4String paremeterName,
+      G4bool ommitable = false);
+
+    // Data members
+    G4GenericAnalysisManager* fManager { nullptr }; ///< Associated class
+    std::unique_ptr<G4UIcmdWithAString>  fSetDefaultFileTypeCmd;
+};
+
+//_____________________________________________________________________________
+template <typename CMD>
+std::unique_ptr<CMD> G4GenericAnalysisMessenger::CreateCommand(
+  G4String name, G4String guidance, G4String paremeterName, G4bool ommitable)
+{
+  G4String fullName = "/analysis/" + name;
+
+  auto command = std::make_unique<CMD>(fullName, this);
+  command->SetGuidance(guidance.c_str());
+  command->SetParameterName(paremeterName.c_str(), ommitable);
+  command->AvailableForStates(G4State_PreInit, G4State_Idle);
+
+  return command;
+}
+
+#endif

source/analysis/factory/include/G4GenericFileManager.hh

@@ -53,30 +53,30 @@ class G4GenericFileManager : public G4VFileManager
 {
   public:
     explicit G4GenericFileManager(const G4AnalysisManagerState& state);
-    virtual ~G4GenericFileManager() = default;
+    ~G4GenericFileManager() override = default;
 
     // Method to manipulate a default file
-    virtual G4bool OpenFile(const G4String& fileName) final;
+    G4bool OpenFile(const G4String& fileName) final;
 
     // Methods applied to all registered files
     virtual G4bool OpenFiles() final;
-    virtual G4bool WriteFiles() final;
-    virtual G4bool CloseFiles() final;
-    virtual G4bool DeleteEmptyFiles() final;
+    G4bool WriteFiles() final;
+    G4bool CloseFiles() final;
+    G4bool DeleteEmptyFiles() final;
 
     // Clear all data
-    virtual void Clear() final;
+    void Clear() final;
 
     // Methods applied to file per name
-    virtual G4bool CreateFile(const G4String& fileName) final;
-    virtual G4bool WriteFile(const G4String& fileName) final;
-    virtual G4bool CloseFile(const G4String& fileName) final;
-    virtual G4bool SetIsEmpty(const G4String& fileName, G4bool isEmpty) final;
+    G4bool CreateFile(const G4String& fileName) final;
+    G4bool WriteFile(const G4String& fileName) final;
+    G4bool CloseFile(const G4String& fileName) final;
+    G4bool SetIsEmpty(const G4String& fileName, G4bool isEmpty) final;
 
-    virtual G4bool SetHistoDirectoryName(const G4String& dirName);
-    virtual G4bool SetNtupleDirectoryName(const G4String& dirName);
+    G4bool SetHistoDirectoryName(const G4String& dirName) override;
+    G4bool SetNtupleDirectoryName(const G4String& dirName) override;
 
-    virtual G4String GetFileType() const final { return ""; }
+    G4String GetFileType() const final { return ""; }
 
     // Set default output type (backward compatibility)
     // this type will be used for file names without extension