Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
/// \file electromagnetic/TestEm8/src/DetectorConstruction.cc
|
||||
/// \brief Implementation of the DetectorConstruction class
|
||||
//
|
||||
// $Id: DetectorConstruction.cc 106960 2017-10-31 08:35:19Z gcosmo $
|
||||
// $Id: DetectorConstruction.cc 109102 2018-03-27 07:38:33Z gcosmo $
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -75,10 +75,10 @@
|
||||
|
||||
DetectorConstruction::DetectorConstruction()
|
||||
: G4VUserDetectorConstruction(),
|
||||
fGasMat(0), fWindowMat(0), fWorldMaterial(0),
|
||||
fSolidWorld(0), fSolidContainer(0), fSolidDetector(0),
|
||||
fPhysWorld(0), fLogicWorld(0), fLogicContainer(0), fLogicDetector(0),
|
||||
fDetectorMessenger(0), fGasDetectorCuts(0), fRegGasDet(0)
|
||||
fGasMat(nullptr), fWindowMat(nullptr), fWorldMaterial(nullptr),
|
||||
fSolidWorld(nullptr), fSolidContainer(nullptr), fSolidDetector(nullptr),
|
||||
fPhysWorld(nullptr), fLogicWorld(nullptr), fLogicContainer(nullptr),
|
||||
fLogicDetector(nullptr),fRegGasDet(nullptr)
|
||||
{
|
||||
fGasThickness = 23.0*mm;
|
||||
fGasRadius = 10.*cm;
|
||||
@@ -90,7 +90,7 @@ DetectorConstruction::DetectorConstruction()
|
||||
|
||||
fDetectorMessenger = new DetectorMessenger(this);
|
||||
|
||||
G4double cut = 23.*mm;
|
||||
G4double cut = 0.7*mm;
|
||||
fGasDetectorCuts = new G4ProductionCuts();
|
||||
fGasDetectorCuts->SetProductionCut(cut,"gamma");
|
||||
fGasDetectorCuts->SetProductionCut(cut,"e-");
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/// \file electromagnetic/TestEm8/src/PrimaryGeneratorAction.cc
|
||||
/// \brief Implementation of the PrimaryGeneratorAction class
|
||||
//
|
||||
// $Id: PrimaryGeneratorAction.cc 95713 2016-02-22 08:08:38Z gcosmo $
|
||||
// $Id: PrimaryGeneratorAction.cc 109102 2018-03-27 07:38:33Z gcosmo $
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -73,10 +73,8 @@ PrimaryGeneratorAction::~PrimaryGeneratorAction()
|
||||
void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
|
||||
{
|
||||
G4double z = fParam->GetPositionZ();
|
||||
if(0 == anEvent->GetEventID()) {
|
||||
fParam->SetBeamParticle(fParticleGun->GetParticleDefinition());
|
||||
fParam->SetBeamEnergy(fParticleGun->GetParticleEnergy());
|
||||
}
|
||||
fParam->SetBeamParticle(fParticleGun->GetParticleDefinition());
|
||||
fParam->SetBeamEnergy(fParticleGun->GetParticleEnergy());
|
||||
fParticleGun->SetParticlePosition(G4ThreeVector(0.,0.,z));
|
||||
fParticleGun->GeneratePrimaryVertex(anEvent);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/// \file electromagnetic/TestEm8/src/RunAction.cc
|
||||
/// \brief Implementation of the RunAction class
|
||||
//
|
||||
// $Id: RunAction.cc 92047 2015-08-14 07:23:37Z gcosmo $
|
||||
// $Id: RunAction.cc 110166 2018-05-16 15:54:41Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
@@ -45,8 +45,6 @@
|
||||
#include "TestParameters.hh"
|
||||
#include "G4Run.hh"
|
||||
#include "G4RunManager.hh"
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4VVisManager.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
@@ -131,12 +129,6 @@ void RunAction::EndOfRunAction(const G4Run*)
|
||||
fAnalysisManager->CloseFile();
|
||||
}
|
||||
//delete fAnalysisManager;
|
||||
|
||||
#ifdef G4VIS_USE
|
||||
if (G4VVisManager::GetConcreteInstance()) {
|
||||
G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Reference in New Issue
Block a user