lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 6.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:41:53 +02:00
parent 4aea781e80
commit 96686e0c8f
6560 changed files with 153347 additions and 238155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/advanced/underground_physics/src/DMXAnalysisManager.cc
+2 -2
View File
@@ -247,8 +247,8 @@ void DMXAnalysisManager::PulseTimeFit()
}
G4cout << " Started Pulse Time Fit " << G4endl;
for (int i = 0; i < 2 ; ++i)
int i;
for (i = 0; i < 2 ; ++i)
G4cout << "\n Fit Parameters: " << i << ":\t"
<< exponFun->parameterNames()[i] << G4endl;
// first fit to time histogram:
examples/advanced/underground_physics/src/DMXDetectorRoom.icc
+1 -1
View File
@@ -529,7 +529,7 @@
desk_Z = 0.5*(desk4Height - labHeight);
G4double crateWidth = 60.0*cm; //Y
G4double crate_Y;
G4double crate_Y = 0.;
G4RotationMatrix rotMatrixDesk4;
rotMatrixDesk4.rotateZ(0.0*deg);
examples/advanced/underground_physics/src/DMXMaxTimeCuts.cc
+2 -1
View File
@@ -56,7 +56,8 @@ DMXMaxTimeCuts::DMXMaxTimeCuts(const G4String& aName)
DMXMaxTimeCuts::~DMXMaxTimeCuts()
{}
DMXMaxTimeCuts::DMXMaxTimeCuts(DMXMaxTimeCuts& right)
DMXMaxTimeCuts::DMXMaxTimeCuts(DMXMaxTimeCuts&)
: DMXSpecialCuts()
{}
examples/advanced/underground_physics/src/DMXMinEkineCuts.cc
+9 -8
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: DMXMinEkineCuts.cc,v 1.2 2002/06/18 10:17:30 ahoward Exp $
// GEANT4 tag $Name: geant4-05-02 $
// $Id: DMXMinEkineCuts.cc,v 1.4 2003/12/02 16:59:48 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
//
//
// --------------------------------------------------------------
@@ -53,10 +53,11 @@ DMXMinEkineCuts::DMXMinEkineCuts(const G4String& aName)
DMXMinEkineCuts::~DMXMinEkineCuts()
{}
DMXMinEkineCuts::DMXMinEkineCuts(DMXMinEkineCuts& right)
DMXMinEkineCuts::DMXMinEkineCuts(DMXMinEkineCuts&)
: DMXSpecialCuts()
{}
G4double DMXMinEkineCuts::PostStepGetPhysicalInteractionLength(
const G4Track& aTrack,
G4double ,
@@ -76,20 +77,20 @@ G4double DMXMinEkineCuts::PostStepGetPhysicalInteractionLength(
//min kinetic energy
G4double temp = DBL_MAX;
G4double eKine = aParticle->GetKineticEnergy();
G4Material* aMaterial = aTrack.GetMaterial();
const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple();
G4double eMin = pUserLimits->GetUserMinEkine(aTrack);
G4double rangeNow = DBL_MAX;
rangeNow = G4EnergyLossTables::GetRange(aParticleDef,eKine,aMaterial);
rangeNow = G4EnergyLossTables::GetRange(aParticleDef,eKine,couple);
if (eKine < eMin ) {
proposedStep = 0.;
} else {
// charged particles only
G4double rangeMin = G4EnergyLossTables::GetRange(aParticleDef,eMin,aMaterial);
G4double rangeMin = G4EnergyLossTables::GetRange(aParticleDef,eMin,couple);
temp = rangeNow - rangeMin;
if (proposedStep > temp) proposedStep = temp;
if (proposedStep > temp) proposedStep = temp;
}
}
return proposedStep;
examples/advanced/underground_physics/src/DMXPhysicsList.cc
+5 -26
View File
@@ -66,9 +66,6 @@ DMXPhysicsList::DMXPhysicsList() : G4VUserPhysicsList()
cutForGamma = defaultCutValue;
cutForElectron = 1.0*nanometer;
cutForPositron = defaultCutValue;
cutForProton = defaultCutValue;
cutForAlpha = 1.0*nanometer;
cutForGenericIon = 1.0*nanometer;
VerboseLevel = 1;
OpVerbLevel = 0;
@@ -655,11 +652,8 @@ void DMXPhysicsList::ConstructHad()
theNeutronElasticProcess->RegisterMe(theElasticModel1);
theElasticModel1->SetMinEnergy(19*MeV);
theNeutronElasticProcess->RegisterMe(theElasticNeutron);
G4CrossSectionDataStore * theStore =
((G4HadronElasticProcess*)theNeutronElasticProcess)
->GetCrossSectionDataStore();
G4NeutronHPElasticData * theNeutronData = new G4NeutronHPElasticData;
theStore->AddDataSet(theNeutronData);
theNeutronElasticProcess->AddDataSet(theNeutronData);
pmanager->AddDiscreteProcess(theNeutronElasticProcess);
// inelastic scattering
G4NeutronInelasticProcess* theInelasticProcess =
@@ -670,12 +664,9 @@ void DMXPhysicsList::ConstructHad()
G4NeutronHPInelastic * theLENeutronInelasticModel =
new G4NeutronHPInelastic;
theInelasticProcess->RegisterMe(theLENeutronInelasticModel);
G4CrossSectionDataStore * theStore1 =
((G4HadronInelasticProcess*)theInelasticProcess)
->GetCrossSectionDataStore();
G4NeutronHPInelasticData * theNeutronData1 =
new G4NeutronHPInelasticData;
theStore1->AddDataSet(theNeutronData1);
theInelasticProcess->AddDataSet(theNeutronData1);
pmanager->AddDiscreteProcess(theInelasticProcess);
// capture
G4HadronCaptureProcess* theCaptureProcess =
@@ -685,11 +676,8 @@ void DMXPhysicsList::ConstructHad()
theCaptureProcess->RegisterMe(theCaptureModel);
G4NeutronHPCapture * theLENeutronCaptureModel = new G4NeutronHPCapture;
theCaptureProcess->RegisterMe(theLENeutronCaptureModel);
G4CrossSectionDataStore * theStore3 =
((G4HadronCaptureProcess*)theCaptureProcess)->
GetCrossSectionDataStore();
G4NeutronHPCaptureData * theNeutronData3 = new G4NeutronHPCaptureData;
theStore3->AddDataSet(theNeutronData3);
theCaptureProcess->AddDataSet(theNeutronData3);
pmanager->AddDiscreteProcess(theCaptureProcess);
// G4ProcessManager* pmanager = G4Neutron::Neutron->GetProcessManager();
// pmanager->AddProcess(new G4UserSpecialCuts(),-1,-1,1);
@@ -807,23 +795,14 @@ void DMXPhysicsList::SetCuts()
//special for low energy physics
G4double lowlimit=250*eV;
G4Gamma ::SetEnergyRange(lowlimit,100*GeV);
G4Electron::SetEnergyRange(lowlimit,100*GeV);
G4Positron::SetEnergyRange(lowlimit,100*GeV);
G4ProductionCutsTable::GetProductionCutsTable()->SetEnergyRange(lowlimit,100.*GeV);
// set cut values for gamma at first and for e- second and next for e+,
// because some processes for e+/e- need cut values for gamma
SetCutValue(cutForGamma, "gamma");
SetCutValue(cutForElectron, "e-");
SetCutValue(cutForPositron, "e+");
// SetCutValue(cutForProton, "proton");
// SetCutValue(cutForProton, "anti_proton");
// SetCutValue(cutForAlpha, "alpha");
// SetCutValue(cutForGenericIon, "GenericIon");
// SetCutValueForOthers(defaultCutValue);
if (verboseLevel>0) DumpCutValuesTable();
}
examples/advanced/underground_physics/src/DMXPmtHit.cc
+3 -2
View File
@@ -60,7 +60,7 @@ DMXPmtHit::DMXPmtHit() {
DMXPmtHit::~DMXPmtHit() {;}
DMXPmtHit::DMXPmtHit(const DMXPmtHit& right) {
DMXPmtHit::DMXPmtHit(const DMXPmtHit& right) : G4VHit(right) {
pos = right.pos;
time = right.time;
@@ -81,7 +81,8 @@ const DMXPmtHit& DMXPmtHit::operator=(const DMXPmtHit& right) {
int DMXPmtHit::operator==(const DMXPmtHit& right) const {
return 0;
return (this==&right) ? 1 : 0;
}
examples/advanced/underground_physics/src/DMXPmtSD.cc
+2 -2
View File
@@ -61,7 +61,7 @@ DMXPmtSD::~DMXPmtSD() {;}
////////////////////////////////////////////////////////////////////////////
void DMXPmtSD::Initialize(G4HCofThisEvent* HCE) {
void DMXPmtSD::Initialize(G4HCofThisEvent*) {
pmtCollection = new DMXPmtHitsCollection
(SensitiveDetectorName,collectionName[0]);
@@ -75,7 +75,7 @@ void DMXPmtSD::Initialize(G4HCofThisEvent* HCE) {
////////////////////////////////////////////////////////////////////////////
G4bool DMXPmtSD::ProcessHits
(G4Step* aStep, G4TouchableHistory* ROhist){
(G4Step* aStep, G4TouchableHistory*){
// make known hit position
DMXPmtHit* aPmtHit = new DMXPmtHit();
examples/advanced/underground_physics/src/DMXRunAction.cc
+1 -1
View File
@@ -100,7 +100,7 @@ void DMXRunAction::BeginOfRunAction(const G4Run* aRun)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void DMXRunAction::EndOfRunAction(const G4Run* aRun)
void DMXRunAction::EndOfRunAction(const G4Run*)
{
#ifdef G4ANALYSIS_USE
examples/advanced/underground_physics/src/DMXScintHit.cc
+2 -1
View File
@@ -64,6 +64,7 @@ DMXScintHit::~DMXScintHit()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
DMXScintHit::DMXScintHit(const DMXScintHit& right)
: G4VHit(right)
{
edep = right.edep;
pos = right.pos;
@@ -88,7 +89,7 @@ const DMXScintHit& DMXScintHit::operator=(const DMXScintHit& right)
int DMXScintHit::operator==(const DMXScintHit& right) const
{
return 0;
return (this==&right) ? 1 : 0;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
examples/advanced/underground_physics/src/DMXScintSD.cc
+2 -3
View File
@@ -65,18 +65,17 @@ DMXScintSD::~DMXScintSD(){ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void DMXScintSD::Initialize(G4HCofThisEvent* HCE)
void DMXScintSD::Initialize(G4HCofThisEvent*)
{
scintillatorCollection = new DMXScintHitsCollection
(SensitiveDetectorName,collectionName[0]);
HitID = -1;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
G4bool DMXScintSD::ProcessHits(G4Step* aStep, G4TouchableHistory* ROhist)
G4bool DMXScintSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
G4double edep = aStep->GetTotalEnergyDeposit();
G4ParticleDefinition* particleType = aStep->GetTrack()->GetDefinition();
examples/advanced/underground_physics/src/DMXSpecialCuts.cc
+3 -3
View File
@@ -69,9 +69,9 @@ G4VParticleChange* DMXSpecialCuts::PostStepDoIt(
}
G4double DMXSpecialCuts::PostStepGetPhysicalInteractionLength(
const G4Track& track,
G4double previousStepSize,
G4ForceCondition* condition
const G4Track&,
G4double,
G4ForceCondition*
)
{
return DBL_MAX;
examples/advanced/underground_physics/src/DMXVisManager.cc
-10
View File
@@ -58,11 +58,6 @@
#include "G4FukuiRenderer.hh"
#endif
#ifdef G4VIS_USE_OPACS
#include "G4Wo.hh"
#include "G4Xo.hh"
#endif
#ifdef G4VIS_USE_OPENGLX
#include "G4OpenGLImmediateX.hh"
#include "G4OpenGLStoredX.hh"
@@ -115,11 +110,6 @@ void DMXVisManager::RegisterGraphicsSystems () {
RegisterGraphicsSystem (new G4FukuiRenderer);
#endif
#ifdef G4VIS_USE_OPACS
RegisterGraphicsSystem (new G4Wo);
RegisterGraphicsSystem (new G4Xo);
#endif
#ifdef G4VIS_USE_OPENGLX
RegisterGraphicsSystem (new G4OpenGLImmediateX);
RegisterGraphicsSystem (new G4OpenGLStoredX);