Import Geant4 11.0.0 source tree
This commit is contained in:
committed by
Ben Morgan
parent
6399a014b6
commit
80e2389dd8
@@ -28,7 +28,6 @@
|
||||
// file STCyclotronRun.cc
|
||||
|
||||
#include "STCyclotronRun.hh"
|
||||
#include "STCyclotronAnalysis.hh"
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4Event.hh"
|
||||
|
||||
@@ -333,8 +332,10 @@ void STCyclotronRun::EndOfRun(G4double irradiationTime)
|
||||
// life of the particle, divided by ln(2), in nS
|
||||
//----------------------------------------------
|
||||
|
||||
G4double decayConstantMum = 1/(fPrimaryIsotopeTimeTarget[nameMum]*10.E-10);
|
||||
G4double decayConstantDaughter = 1/(fDecayIsotopeTimeTarget[nameDaughter]*10.E-10);
|
||||
G4double decayConstantMum = fPrimaryIsotopeTimeTarget[nameMum]
|
||||
? 1/(fPrimaryIsotopeTimeTarget[nameMum]*10.E-10) : 0.;
|
||||
G4double decayConstantDaughter = fDecayIsotopeTimeTarget[nameDaughter]
|
||||
? 1/(fDecayIsotopeTimeTarget[nameDaughter]*10.E-10) : 0.;
|
||||
|
||||
|
||||
//----------------------------------------------
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "STCyclotronSensitiveTarget.hh"
|
||||
#include "STCyclotronRun.hh"
|
||||
#include "STCyclotronDetectorConstruction.hh"
|
||||
#include "STCyclotronAnalysis.hh"
|
||||
#include "G4AnalysisManager.hh"
|
||||
#include "G4GeneralParticleSource.hh"
|
||||
#include "G4UserRunAction.hh"
|
||||
#include "G4Run.hh"
|
||||
@@ -66,6 +66,7 @@ STCyclotronRunAction::STCyclotronRunAction(STCyclotronDetectorConstruction*)
|
||||
//----------------------------------------------
|
||||
|
||||
auto analysisManager = G4AnalysisManager::Instance();
|
||||
analysisManager->SetDefaultFileType("root");
|
||||
G4cout << "Using " << analysisManager->GetType() << G4endl;
|
||||
analysisManager->SetVerboseLevel(1);
|
||||
|
||||
@@ -100,7 +101,6 @@ STCyclotronRunAction::STCyclotronRunAction(STCyclotronDetectorConstruction*)
|
||||
STCyclotronRunAction::~STCyclotronRunAction()
|
||||
{
|
||||
delete fMessenger;
|
||||
delete G4AnalysisManager::Instance();
|
||||
}
|
||||
|
||||
G4Run* STCyclotronRunAction::GenerateRun()
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
//
|
||||
#include "STCyclotronRun.hh"
|
||||
#include "STCyclotronSensitiveFoil.hh"
|
||||
#include "STCyclotronAnalysis.hh"
|
||||
#include "G4AnalysisManager.hh"
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4HCofThisEvent.hh"
|
||||
#include "G4Step.hh"
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
//
|
||||
// file STCyclotronSensitiveTarget.cc
|
||||
//
|
||||
#include "STCyclotronAnalysis.hh"
|
||||
#include "STCyclotronRun.hh"
|
||||
#include "STCyclotronSensitiveTarget.hh"
|
||||
|
||||
#include "G4AnalysisManager.hh"
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4HCofThisEvent.hh"
|
||||
#include "G4UnitsTable.hh"
|
||||
|
||||
Reference in New Issue
Block a user