Import Geant4 11.1.0.beta source tree
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
#include "G4ToolsAnalysisReader.hh"
|
||||
#include "globals.hh"
|
||||
|
||||
#include "tools/raxml"
|
||||
#include "toolx/raxml"
|
||||
|
||||
#include <memory>
|
||||
#include <string_view>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
//
|
||||
// Author: Ivana Hrivnacova, 26/08/2021 (ivana@ipno.in2p3.fr)
|
||||
|
||||
#include "tools/raxml"
|
||||
#include "toolx/raxml"
|
||||
|
||||
//_____________________________________________________________________________
|
||||
template <typename HT>
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "G4VRFileManager.hh"
|
||||
#include "globals.hh"
|
||||
|
||||
#include "tools/raxml"
|
||||
#include "toolx/raxml"
|
||||
|
||||
#include <string_view>
|
||||
|
||||
@@ -56,7 +56,7 @@ class G4XmlRFileManager : public G4VRFileManager
|
||||
virtual G4bool OpenRFile(const G4String& fileName);
|
||||
|
||||
// Specific methods for files per objects
|
||||
tools::raxml* GetRFile(const G4String& fileName) const;
|
||||
toolx::raxml* GetRFile(const G4String& fileName) const;
|
||||
|
||||
// Helper method
|
||||
template <typename HT>
|
||||
@@ -70,7 +70,7 @@ class G4XmlRFileManager : public G4VRFileManager
|
||||
|
||||
// Data members
|
||||
tools::xml::default_factory* fReadFactory { nullptr };
|
||||
std::map<G4String, tools::raxml*> fRFiles;
|
||||
std::map<G4String, toolx::raxml*> fRFiles;
|
||||
};
|
||||
|
||||
#include "G4XmlRFileManager.icc"
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "G4TRNtupleManager.hh"
|
||||
#include "globals.hh"
|
||||
|
||||
#include "tools/raxml"
|
||||
#include "toolx/raxml"
|
||||
|
||||
#include <vector>
|
||||
#include <string_view>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "G4AnalysisManagerState.hh"
|
||||
#include "G4AnalysisUtilities.hh"
|
||||
|
||||
#include "tools/raxml"
|
||||
#include "toolx/raxml"
|
||||
|
||||
using namespace G4Analysis;
|
||||
using namespace tools;
|
||||
@@ -79,7 +79,7 @@ G4bool G4XmlRFileManager::OpenRFile(const G4String& fileName)
|
||||
}
|
||||
|
||||
// create new file
|
||||
auto newFile = new tools::raxml(*fReadFactory, G4cout, verbose);
|
||||
auto newFile = new toolx::raxml(*fReadFactory, G4cout, verbose);
|
||||
|
||||
// clear objects
|
||||
// (this should not be needed when starting a new raxml)
|
||||
@@ -109,7 +109,7 @@ G4bool G4XmlRFileManager::OpenRFile(const G4String& fileName)
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
tools::raxml* G4XmlRFileManager::GetRFile(const G4String& fileName) const
|
||||
toolx::raxml* G4XmlRFileManager::GetRFile(const G4String& fileName) const
|
||||
{
|
||||
// Get full file name (add only extension)
|
||||
G4bool isPerThread = false;
|
||||
|
||||
Reference in New Issue
Block a user