Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: B3DetectorConstruction.cc 71079 2013-06-10 20:37:11Z ihrivnac $
|
||||
// $Id: B3DetectorConstruction.cc 101905 2016-12-07 11:34:39Z gunter $
|
||||
//
|
||||
/// \file B3DetectorConstruction.cc
|
||||
/// \brief Implementation of the B3DetectorConstruction class
|
||||
@@ -237,8 +237,8 @@ G4VPhysicalVolume* B3DetectorConstruction::Construct()
|
||||
|
||||
// Visualization attributes
|
||||
//
|
||||
logicRing->SetVisAttributes (G4VisAttributes::Invisible);
|
||||
logicDetector->SetVisAttributes (G4VisAttributes::Invisible);
|
||||
logicRing->SetVisAttributes (G4VisAttributes::GetInvisible());
|
||||
logicDetector->SetVisAttributes (G4VisAttributes::GetInvisible());
|
||||
|
||||
// Print materials
|
||||
G4cout << *(G4Material::GetMaterialTable()) << G4endl;
|
||||
@@ -257,6 +257,7 @@ void B3DetectorConstruction::ConstructSDandField()
|
||||
// declare crystal as a MultiFunctionalDetector scorer
|
||||
//
|
||||
G4MultiFunctionalDetector* cryst = new G4MultiFunctionalDetector("crystal");
|
||||
G4SDManager::GetSDMpointer()->AddNewDetector(cryst);
|
||||
G4VPrimitiveScorer* primitiv1 = new G4PSEnergyDeposit("edep");
|
||||
cryst->RegisterPrimitive(primitiv1);
|
||||
SetSensitiveDetector("CrystalLV",cryst);
|
||||
@@ -264,6 +265,7 @@ void B3DetectorConstruction::ConstructSDandField()
|
||||
// declare patient as a MultiFunctionalDetector scorer
|
||||
//
|
||||
G4MultiFunctionalDetector* patient = new G4MultiFunctionalDetector("patient");
|
||||
G4SDManager::GetSDMpointer()->AddNewDetector(patient);
|
||||
G4VPrimitiveScorer* primitiv2 = new G4PSDoseDeposit("dose");
|
||||
patient->RegisterPrimitive(primitiv2);
|
||||
SetSensitiveDetector("PatientLV",patient);
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: B3aRunAction.cc 94031 2015-11-05 11:54:38Z ihrivnac $
|
||||
// $Id: B3aRunAction.cc 99559 2016-09-27 07:02:21Z gcosmo $
|
||||
//
|
||||
/// \file B3aRunAction.cc
|
||||
/// \brief Implementation of the B3aRunAction class
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4Run.hh"
|
||||
#include "G4ParameterManager.hh"
|
||||
#include "G4AccumulableManager.hh"
|
||||
#include "G4UnitsTable.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
|
||||
B3aRunAction::B3aRunAction()
|
||||
: G4UserRunAction(),
|
||||
fGoodEvents("GoodEvents", 0),
|
||||
fSumDose("SumDose", 0.)
|
||||
fGoodEvents(0),
|
||||
fSumDose(0.)
|
||||
{
|
||||
//add new units for dose
|
||||
//
|
||||
@@ -56,10 +56,10 @@ B3aRunAction::B3aRunAction()
|
||||
new G4UnitDefinition("nanogray" , "nanoGy" , "Dose", nanogray);
|
||||
new G4UnitDefinition("picogray" , "picoGy" , "Dose", picogray);
|
||||
|
||||
// Register parameter to the parameter manager
|
||||
G4ParameterManager* parameterManager = G4ParameterManager::Instance();
|
||||
parameterManager->RegisterParameter(fGoodEvents);
|
||||
parameterManager->RegisterParameter(fSumDose);
|
||||
// Register accumulable to the accumulable manager
|
||||
G4AccumulableManager* accumulableManager = G4AccumulableManager::Instance();
|
||||
accumulableManager->RegisterAccumulable(fGoodEvents);
|
||||
accumulableManager->RegisterAccumulable(fSumDose);
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
@@ -73,9 +73,9 @@ void B3aRunAction::BeginOfRunAction(const G4Run* run)
|
||||
{
|
||||
G4cout << "### Run " << run->GetRunID() << " start." << G4endl;
|
||||
|
||||
// reset parameters to their initial values
|
||||
G4ParameterManager* parameterManager = G4ParameterManager::Instance();
|
||||
parameterManager->Reset();
|
||||
// reset accumulables to their initial values
|
||||
G4AccumulableManager* accumulableManager = G4AccumulableManager::Instance();
|
||||
accumulableManager->Reset();
|
||||
|
||||
//inform the runManager to save random number seed
|
||||
G4RunManager::GetRunManager()->SetRandomNumberStore(false);
|
||||
@@ -88,9 +88,9 @@ void B3aRunAction::EndOfRunAction(const G4Run* run)
|
||||
G4int nofEvents = run->GetNumberOfEvent();
|
||||
if (nofEvents == 0) return;
|
||||
|
||||
// Merge parameters
|
||||
G4ParameterManager* parameterManager = G4ParameterManager::Instance();
|
||||
parameterManager->Merge();
|
||||
// Merge accumulables
|
||||
G4AccumulableManager* accumulableManager = G4AccumulableManager::Instance();
|
||||
accumulableManager->Merge();
|
||||
|
||||
// Run conditions
|
||||
// note: There is no primary generator action object for "master"
|
||||
|
||||
Reference in New Issue
Block a user