Import Geant4 11.4.0 source tree
This commit is contained in:
@@ -73,7 +73,7 @@ class G4THnMessenger : public G4UImessenger
|
||||
G4String GetTVectorAddress() const;
|
||||
|
||||
// Functions to create commands
|
||||
void CreateDirectory() const;
|
||||
void CreateDirectory();
|
||||
void CreateCmd();
|
||||
void SetCmd();
|
||||
void DeleteCmd();
|
||||
@@ -100,6 +100,7 @@ class G4THnMessenger : public G4UImessenger
|
||||
// Data members
|
||||
G4THnToolsManager<DIM,HT>* fManager { nullptr }; ///< Associated class
|
||||
|
||||
std::unique_ptr<G4UIdirectory> fHnDir;
|
||||
std::unique_ptr<G4UIcommand> fCreateCmd;
|
||||
std::unique_ptr<G4UIcommand> fSetCmd;
|
||||
std::unique_ptr<G4UIcommand> fDeleteCmd;
|
||||
|
||||
@@ -218,13 +218,13 @@ G4String G4THnMessenger<DIM, HT>::GetTVectorAddress() const
|
||||
|
||||
//_____________________________________________________________________________
|
||||
template <unsigned int DIM, typename HT>
|
||||
void G4THnMessenger<DIM, HT>::CreateDirectory() const
|
||||
void G4THnMessenger<DIM, HT>::CreateDirectory()
|
||||
{
|
||||
G4String dirName = "/analysis/" + G4Analysis::GetHnType<HT>() + "/";
|
||||
G4String guidance = GetObjectType() + " control";
|
||||
|
||||
auto directory = std::make_unique<G4UIdirectory>(dirName);
|
||||
directory->SetGuidance(guidance.c_str());
|
||||
fHnDir = std::make_unique<G4UIdirectory>(dirName);
|
||||
fHnDir->SetGuidance(guidance.c_str());
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
@@ -84,6 +84,8 @@ G4bool G4VAnalysisManager::FillP2(G4int id,
|
||||
inline
|
||||
G4bool G4VAnalysisManager::FillNtupleIColumn(G4int columnId, G4int value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleIColumn(columnId, value);
|
||||
}
|
||||
|
||||
@@ -91,6 +93,8 @@ G4bool G4VAnalysisManager::FillNtupleIColumn(G4int columnId, G4int value)
|
||||
inline
|
||||
G4bool G4VAnalysisManager::FillNtupleFColumn(G4int columnId, G4float value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleFColumn(columnId, value);
|
||||
}
|
||||
|
||||
@@ -98,6 +102,8 @@ G4bool G4VAnalysisManager::FillNtupleFColumn(G4int columnId, G4float value)
|
||||
inline
|
||||
G4bool G4VAnalysisManager::FillNtupleDColumn(G4int columnId, G4double value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleDColumn(columnId, value);
|
||||
}
|
||||
|
||||
@@ -105,6 +111,8 @@ G4bool G4VAnalysisManager::FillNtupleDColumn(G4int columnId, G4double value)
|
||||
inline
|
||||
G4bool G4VAnalysisManager::FillNtupleSColumn(G4int columnId, const G4String& value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleSColumn(columnId, value);
|
||||
}
|
||||
|
||||
@@ -112,6 +120,8 @@ G4bool G4VAnalysisManager::FillNtupleSColumn(G4int columnId, const G4String& val
|
||||
inline
|
||||
G4bool G4VAnalysisManager::AddNtupleRow()
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->AddNtupleRow();
|
||||
}
|
||||
|
||||
@@ -120,13 +130,18 @@ inline
|
||||
G4bool G4VAnalysisManager::FillNtupleIColumn(G4int ntupleId, G4int columnId,
|
||||
G4int value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleIColumn(ntupleId, columnId, value);
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
inline
|
||||
G4bool G4VAnalysisManager::FillNtupleFColumn(G4int ntupleId, G4int columnId,
|
||||
G4float value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleFColumn(ntupleId, columnId, value);
|
||||
}
|
||||
|
||||
@@ -135,6 +150,8 @@ inline
|
||||
G4bool G4VAnalysisManager::FillNtupleDColumn(G4int ntupleId, G4int columnId,
|
||||
G4double value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleDColumn(ntupleId, columnId, value);
|
||||
}
|
||||
|
||||
@@ -143,6 +160,8 @@ inline
|
||||
G4bool G4VAnalysisManager::FillNtupleSColumn(G4int ntupleId, G4int columnId,
|
||||
const G4String& value)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->FillNtupleSColumn(ntupleId, columnId, value);
|
||||
}
|
||||
|
||||
@@ -150,6 +169,8 @@ G4bool G4VAnalysisManager::FillNtupleSColumn(G4int ntupleId, G4int columnId,
|
||||
inline
|
||||
G4bool G4VAnalysisManager::AddNtupleRow(G4int ntupleId)
|
||||
{
|
||||
if (fVNtupleManager == nullptr) return false;
|
||||
|
||||
return fVNtupleManager->AddNtupleRow(ntupleId);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user