Skip to content
Snippets Groups Projects
Commit fe53bbed authored by Marilena Bandieramonte's avatar Marilena Bandieramonte
Browse files

Merge branch 'gmgeantino-update' into 'master'

Fix gmgeantino compatibility with Geant4.11

See merge request !140
parents 61311886 62d3b08a
Branches
Tags
1 merge request!140Fix gmgeantino compatibility with Geant4.11
...@@ -202,7 +202,7 @@ int main(int argc, char** argv) { ...@@ -202,7 +202,7 @@ int main(int argc, char** argv) {
gm_config->SetMapsFilename(parOutputFileName); gm_config->SetMapsFilename(parOutputFileName);
// 3. User action // 3. User action
FSLActionInitialization* FSLAct = new FSLActionInitialization(parIsPerformance); FSLActionInitialization* FSLAct = new FSLActionInitialization(parIsPerformance, false);
runManager->SetUserInitialization(FSLAct); runManager->SetUserInitialization(FSLAct);
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
#include "FSLSteppingAction.hh" #include "FSLSteppingAction.hh"
#include "FSLTrackingAction.hh" #include "FSLTrackingAction.hh"
#include "G4ProductionCutsTable.hh" #include "G4ProductionCutsTable.hh"
#include "G4Region.hh" #include "G4Region.hh"
#include "G4RegionStore.hh" #include "G4RegionStore.hh"
G4AnalysisManager* FSLRunAction::fMasterAnalysisManager = nullptr; G4AnalysisManager* FSLRunAction::fMasterAnalysisManager = nullptr;
FSLRunAction::FSLRunAction() FSLRunAction::FSLRunAction()
...@@ -30,8 +30,12 @@ FSLRunAction::FSLRunAction() ...@@ -30,8 +30,12 @@ FSLRunAction::FSLRunAction()
} }
FSLRunAction::~FSLRunAction() { FSLRunAction::~FSLRunAction() {
#if G4VERSION_NUMBER<1100
if(fGeantinoMapsConf->GetCreateGeantinoMaps()) if(fGeantinoMapsConf->GetCreateGeantinoMaps())
delete G4AnalysisManager::Instance(); delete G4AnalysisManager::Instance();
#endif
} }
G4Run* FSLRunAction::GenerateRun() { G4Run* FSLRunAction::GenerateRun() {
...@@ -53,6 +57,9 @@ void FSLRunAction::BeginOfRunAction(const G4Run* /*aRun*/){ ...@@ -53,6 +57,9 @@ void FSLRunAction::BeginOfRunAction(const G4Run* /*aRun*/){
{ {
// Create analysis manager // Create analysis manager
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance(); G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
#if G4VERSION_NUMBER>=1100
analysisManager->SetDefaultFileType("root");
#endif
if (isMaster) { if (isMaster) {
fMasterAnalysisManager = analysisManager; fMasterAnalysisManager = analysisManager;
//G4cout<<"FSLRunAction::BeginOfRunAction, created MASTER istance of the G4AnalysisManager: "<<fMasterAnalysisManager<<G4endl; //G4cout<<"FSLRunAction::BeginOfRunAction, created MASTER istance of the G4AnalysisManager: "<<fMasterAnalysisManager<<G4endl;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment