Import Geant4 11.0.0.beta source tree
This commit is contained in:
@@ -175,7 +175,7 @@ ComputeAccumulatedDepthVectorAlongBackRay(G4ThreeVector glob_pos,
|
||||
G4double newStep = fLinearNavigator->ComputeStep(position,direction,1.e50,
|
||||
safety);
|
||||
if (theAccumulatedDepthVector != nullptr) {delete theAccumulatedDepthVector;}
|
||||
theAccumulatedDepthVector = new G4PhysicsOrderedFreeVector();
|
||||
theAccumulatedDepthVector = new G4PhysicsFreeVector();
|
||||
|
||||
G4double acc_depth=0.;
|
||||
G4double acc_length=0.;
|
||||
|
||||
@@ -427,6 +427,7 @@ G4GeneralParticleSourceMessenger(G4GeneralParticleSource* fPtclGun)
|
||||
minphiCmd1 = new G4UIcmdWithADoubleAndUnit("/gps/ang/minphi",this);
|
||||
minphiCmd1->SetGuidance("Set minimum phi");
|
||||
minphiCmd1->SetParameterName("MinPhi",true,false);
|
||||
minphiCmd1->SetDefaultValue(0.);
|
||||
minphiCmd1->SetDefaultUnit("rad");
|
||||
// minphiCmd1->SetUnitCandidates("rad deg");
|
||||
|
||||
|
||||
@@ -285,13 +285,13 @@ G4double G4SPSEneDistribution::Getcept() const
|
||||
return threadLocalData.Get().cept;
|
||||
}
|
||||
|
||||
G4PhysicsOrderedFreeVector G4SPSEneDistribution::GetUserDefinedEnergyHisto()
|
||||
G4PhysicsFreeVector G4SPSEneDistribution::GetUserDefinedEnergyHisto()
|
||||
{
|
||||
G4AutoLock l(&mutex);
|
||||
return UDefEnergyH;
|
||||
}
|
||||
|
||||
G4PhysicsOrderedFreeVector G4SPSEneDistribution::GetArbEnergyHisto()
|
||||
G4PhysicsFreeVector G4SPSEneDistribution::GetArbEnergyHisto()
|
||||
{
|
||||
G4AutoLock l(&mutex);
|
||||
return ArbEnergyH;
|
||||
|
||||
@@ -276,28 +276,14 @@ void G4SPSPosDistribution::ConfineSourceToVolume(const G4String& Vname)
|
||||
}
|
||||
|
||||
G4VPhysicalVolume* tempPV = nullptr;
|
||||
G4PhysicalVolumeStore* PVStore = nullptr;
|
||||
G4String theRequiredVolumeName = VolName;
|
||||
PVStore = G4PhysicalVolumeStore::GetInstance();
|
||||
G4int i = 0;
|
||||
G4bool found = false;
|
||||
G4PhysicalVolumeStore* PVStore = G4PhysicalVolumeStore::GetInstance();
|
||||
if(verbosityLevel == 2) { G4cout << PVStore->size() << G4endl; }
|
||||
|
||||
while (!found && i<G4int(PVStore->size()))
|
||||
{
|
||||
tempPV = (*PVStore)[i];
|
||||
found = tempPV->GetName() == theRequiredVolumeName;
|
||||
if(verbosityLevel == 2)
|
||||
{
|
||||
G4cout << i << " " << " " << tempPV->GetName()
|
||||
<< " " << theRequiredVolumeName << " " << found << G4endl;
|
||||
}
|
||||
if (!found) { ++i; }
|
||||
}
|
||||
tempPV = PVStore->GetVolume(VolName);
|
||||
|
||||
// found = true then the volume exists else it doesn't
|
||||
// the volume exists else it doesn't
|
||||
//
|
||||
if(found == true)
|
||||
if (tempPV != nullptr)
|
||||
{
|
||||
if(verbosityLevel >= 1)
|
||||
{
|
||||
@@ -307,7 +293,8 @@ void G4SPSPosDistribution::ConfineSourceToVolume(const G4String& Vname)
|
||||
}
|
||||
else
|
||||
{
|
||||
G4cout << " **** Error: Volume <" << VolName << "> does not exist **** " << G4endl;
|
||||
G4cout << " **** Error: Volume <" << VolName
|
||||
<< "> does not exist **** " << G4endl;
|
||||
G4cout << " Ignoring confine condition" << G4endl;
|
||||
Confine = false;
|
||||
VolName = "NULL";
|
||||
|
||||
@@ -191,7 +191,7 @@ void G4SPSRandomGenerator::SetVerbosity(G4int a)
|
||||
|
||||
namespace
|
||||
{
|
||||
G4PhysicsOrderedFreeVector ZeroPhysVector; // for re-set only
|
||||
G4PhysicsFreeVector ZeroPhysVector; // for re-set only
|
||||
}
|
||||
|
||||
void G4SPSRandomGenerator::ReSetHist(const G4String& atype)
|
||||
|
||||
Reference in New Issue
Block a user