Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create G4ScoringManager in Geant4Kernel steered by option #1262

Merged
merged 1 commit into from
May 15, 2024
Merged

Create G4ScoringManager in Geant4Kernel steered by option #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DDG4/include/DDG4/Geant4Kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ namespace dd4hep {
/// Property: Output level
int m_outputLevel;

/// Property: Running in multi threaded context
//bool m_multiThreaded;
/// Master property: Number of execution threads in multi threaded mode.
int m_numThreads;

/// Master property: Instantiate the Geant4 scoring manager object
int m_haveScoringMgr;

/// Registered action callbacks on configure
UserCallbacks m_actionConfigure;
/// Registered action callbacks on initialize
Expand Down
22 changes: 14 additions & 8 deletions DDG4/src/Geant4Kernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

// Geant4 include files
#include <G4RunManager.hh>
#include <G4ScoringManager.hh>
#include <G4UIdirectory.hh>
#include <G4Threading.hh>
#include <G4AutoLock.hh>
Expand Down Expand Up @@ -88,16 +89,16 @@ Geant4Kernel::Geant4Kernel(Detector& description_ref)
m_numThreads(0), m_id(Geant4Kernel::thread_self()), m_master(this), m_shared(0),
m_threadContext(0), phase(this)
{
//m_detDesc->addExtension < Geant4Kernel > (this);
m_ident = -1;
declareProperty("UI",m_uiName);
declareProperty("OutputLevel", m_outputLevel = DEBUG);
declareProperty("NumEvents", m_numEvent = 10);
declareProperty("OutputLevels", m_clientLevels);
declareProperty("NumberOfThreads", m_numThreads);
declareProperty("UI", m_uiName);
declareProperty("OutputLevel", m_outputLevel = DEBUG);
declareProperty("NumEvents", m_numEvent = 10);
declareProperty("OutputLevels", m_clientLevels);
declareProperty("NumberOfThreads", m_numThreads);
declareProperty("HaveScoringManager", m_haveScoringMgr = false);
declareProperty("SensitiveTypes", m_sensitiveDetectorTypes);
declareProperty("RunManagerType", m_runManagerType = "G4RunManager");
declareProperty("DefaultSensitiveType", m_dfltSensitiveDetectorType = "Geant4SensDet");
declareProperty("SensitiveTypes", m_sensitiveDetectorTypes);
declareProperty("RunManagerType", m_runManagerType = "G4RunManager");
m_controlName = "/ddg4/";
m_control = new G4UIdirectory(m_controlName.c_str());
m_control->SetGuidance("Control for named Geant4 actions");
Expand Down Expand Up @@ -282,6 +283,11 @@ G4RunManager& Geant4Kernel::runManager() {
}
mgr->property("NumberOfThreads").set(m_numThreads);
mgr->enableUI();
if ( this->m_haveScoringMgr ) {
if ( nullptr == G4ScoringManager::GetScoringManager() ) {
except("Geant4Kernel", "+++ FAILED to create the G4ScoringManager instance.");
}
}
m_runManager = dynamic_cast<G4RunManager*>(mgr);
if ( m_runManager ) {
return *m_runManager;
Expand Down
Loading