Import Geant4 10.4.0 source tree

This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
@@ -68,17 +68,17 @@ class G4XmlAnalysisReader : public G4ToolsAnalysisReader
protected:
// virtual methods from base class
virtual G4int ReadH1Impl(const G4String& h1Name, const G4String& fileName,
G4bool isUserFileName) final;
const G4String& dirName, G4bool isUserFileName) final;
virtual G4int ReadH2Impl(const G4String& h1Name, const G4String& fileName,
G4bool isUserFileName) final;
const G4String& dirName, G4bool isUserFileName) final;
virtual G4int ReadH3Impl(const G4String& h1Name, const G4String& fileName,
G4bool isUserFileName) final;
const G4String& dirName, G4bool isUserFileName) final;
virtual G4int ReadP1Impl(const G4String& h1Name, const G4String& fileName,
G4bool isUserFileName) final;
const G4String& dirName, G4bool isUserFileName) final;
virtual G4int ReadP2Impl(const G4String& h1Name, const G4String& fileName,
G4bool isUserFileName) final;
const G4String& dirName, G4bool isUserFileName) final;
virtual G4int ReadNtupleImpl(const G4String& ntupleName, const G4String& fileName,
G4bool isUserFileName) final;
const G4String& dirName, G4bool isUserFileName) final;
private:
// static data members
@@ -1,95 +0,0 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// $Id$
// Structure containing the information related to rroot ntuple
//
// Author: Ivana Hrivnacova, 09/04/2014 (ivana@ipno.in2p3.fr)
#ifndef G4XmlRNtupleDescription_h
#define G4XmlRNtupleDescription_h 1
#include <map>
#include "tools/raxml"
#include "tools/ntuple_binding"
#include <map>
namespace tools {
class ntuple_binding;
}
struct G4XmlRNtupleDescription
{
G4XmlRNtupleDescription(
tools::aida::ntuple* rntuple)
: fNtuple(rntuple),
fNtupleBinding(new tools::ntuple_binding()),
fIVectorBindingMap(),
fFVectorBindingMap(),
fDVectorBindingMap(),
fIsInitialized(false) {}
~G4XmlRNtupleDescription()
{
delete fNtupleBinding;
delete fNtuple; // CHECK
{std::map< tools::aida::ntuple*, std::vector<int>* >::iterator it;
for ( it = fIVectorBindingMap.begin();
it != fIVectorBindingMap.end(); it++) {
delete it->first;
}}
{std::map<tools::aida::ntuple*, std::vector<float>* >::iterator it;
for ( it = fFVectorBindingMap.begin();
it != fFVectorBindingMap.end(); it++) {
delete it->first;
}}
{std::map<tools::aida::ntuple*, std::vector<double>* >::iterator it;
for ( it = fDVectorBindingMap.begin();
it != fDVectorBindingMap.end(); it++) {
delete it->first;
}}
}
// deleted copy constructor
G4XmlRNtupleDescription(const G4XmlRNtupleDescription& rhs) = delete;
// deleted assignement operator
G4XmlRNtupleDescription& operator=(G4XmlRNtupleDescription& rhs) = delete;
tools::aida::ntuple* fNtuple;
tools::ntuple_binding* fNtupleBinding;
std::map<tools::aida::ntuple*, std::vector<int>* > fIVectorBindingMap;
std::map<tools::aida::ntuple*, std::vector<float>* > fFVectorBindingMap;
std::map<tools::aida::ntuple*, std::vector<double>* > fDVectorBindingMap;
G4bool fIsInitialized;
};
#endif
@@ -33,7 +33,7 @@
#ifndef G4XmlRNtupleManager_h
#define G4XmlRNtupleManager_h 1
#include "G4VRNtupleManager.hh"
#include "G4TRNtupleManager.hh"
#include "globals.hh"
#include "tools/raxml"
@@ -42,7 +42,7 @@
struct G4XmlRNtupleDescription;
class G4XmlRNtupleManager : public G4VRNtupleManager
class G4XmlRNtupleManager : public G4TRNtupleManager<tools::aida::ntuple>
{
friend class G4XmlAnalysisReader;
@@ -50,70 +50,29 @@ class G4XmlRNtupleManager : public G4VRNtupleManager
G4XmlRNtupleManager(const G4AnalysisManagerState& state);
virtual ~G4XmlRNtupleManager();
// Methods to manipulate ntuples
G4bool IsEmpty() const;
G4bool Reset();
// Methods from base classes
using G4BaseRNtupleManager::SetNtupleIColumn;
using G4BaseRNtupleManager::SetNtupleFColumn;
using G4BaseRNtupleManager::SetNtupleDColumn;
using G4TRNtupleManager<tools::aida::ntuple>::SetNtupleIColumn;
using G4TRNtupleManager<tools::aida::ntuple>::SetNtupleFColumn;
using G4TRNtupleManager<tools::aida::ntuple>::SetNtupleDColumn;
// Access methods
tools::aida::ntuple* GetNtuple() const;
tools::aida::ntuple* GetNtuple(G4int ntupleId) const;
// Functions independent from the output type
//
// Methods to read ntuple from a file
G4int SetNtuple(G4XmlRNtupleDescription* rntupleDescription);
// Methods for ntuple with id = FirstNtupleId
virtual G4bool SetNtupleIColumn(const G4String& columnName,
G4int& value);
virtual G4bool SetNtupleFColumn(const G4String& columnName,
G4float& value);
virtual G4bool SetNtupleDColumn(const G4String& columnName,
G4double& value);
virtual G4bool SetNtupleSColumn(const G4String& columnName,
G4String& value);
// Bind the ntuple columns of vector type
virtual G4bool SetNtupleIColumn(const G4String& columnName,
std::vector<G4int>& vector);
virtual G4bool SetNtupleFColumn(const G4String& columnName,
std::vector<G4float>& vector);
virtual G4bool SetNtupleDColumn(const G4String& columnName,
std::vector<G4double>& vector);
// Methods for ntuple with id > FirstNtupleId
virtual G4bool SetNtupleIColumn(G4int ntupleId,
const G4String& columnName, G4int& value);
virtual G4bool SetNtupleFColumn(G4int ntupleId,
const G4String& columnName, G4float& value);
virtual G4bool SetNtupleDColumn(G4int ntupleId,
const G4String& columnName, G4double& value);
virtual G4bool SetNtupleSColumn(G4int ntupleId,
const G4String& columnName, G4String& value);
// Bind the ntuple columns of vector type
virtual G4bool SetNtupleIColumn(G4int ntupleId, const G4String& columnName,
std::vector<G4int>& vector);
virtual G4bool SetNtupleFColumn(G4int ntupleId, const G4String& columnName,
std::vector<G4float>& vector);
virtual G4bool SetNtupleDColumn(G4int ntupleId, const G4String& columnName,
std::vector<G4double>& vector);
virtual G4bool GetNtupleRow();
virtual G4bool GetNtupleRow(G4int ntupleId) ;
// Access methods
virtual G4int GetNofNtuples() const;
// Override base class functions for vector columns
// in order to fill the maps
virtual G4bool SetNtupleIColumn(G4int ntupleId, const G4String& columnName,
std::vector<G4int>& vector) final;
virtual G4bool SetNtupleFColumn(G4int ntupleId, const G4String& columnName,
std::vector<G4float>& vector) final;
virtual G4bool SetNtupleDColumn(G4int ntupleId, const G4String& columnName,
std::vector<G4double>& vector) final;
private:
// methods
G4XmlRNtupleDescription* GetNtupleInFunction(G4int id,
G4String function,
G4bool warn = true) const;
// data members
std::vector<G4XmlRNtupleDescription*> fNtupleVector;
// Methods from the templated base class
//
virtual G4bool GetTNtupleRow(G4TRNtupleDescription<tools::aida::ntuple>* ntupleDescription) final;
};
// inline functions
inline G4int G4XmlRNtupleManager::GetNofNtuples() const
{ return fNtupleVector.size(); }
#endif