Import Geant4 10.4.0 source tree
This commit is contained in:
@@ -96,7 +96,7 @@ G4bool G4Channeling::UpdateParameters(const G4Track& aTrack){
|
||||
G4ThreeVector posPre = preStepPoint->GetPosition();
|
||||
aLCV->RotateToLattice(posPre);
|
||||
|
||||
G4double integrationLimit = fabs(posPost.z() - posPre.z());
|
||||
G4double integrationLimit = std::fabs(posPost.z() - posPre.z());
|
||||
|
||||
if(integrationLimit > 0.){
|
||||
//----------------------------------------
|
||||
@@ -276,8 +276,8 @@ UpdateIntegrationStep(const G4Track& aTrack,
|
||||
step = std::fabs(fTransverseVariationMax * GetPre(aTrack)->GetKineticEnergy() / std::pow(xy2,0.5));
|
||||
if(step < fTimeStepMin) step = fTimeStepMin;
|
||||
else{
|
||||
fTimeStepMax = sqrt( fTransverseVariationMax * GetPre(aTrack)->GetKineticEnergy()
|
||||
/ fabs(GetMatData(aTrack)->GetEFX()->GetMax()));
|
||||
fTimeStepMax = std::sqrt( fTransverseVariationMax * GetPre(aTrack)->GetKineticEnergy()
|
||||
/ std::fabs(GetMatData(aTrack)->GetEFX()->GetMax()));
|
||||
|
||||
if(step > fTimeStepMax) step = fTimeStepMax;
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ fMinimum(DBL_MAX){
|
||||
fPoints[0] = 0;
|
||||
fPoints[1] = 0;
|
||||
fPoints[2] = 0;
|
||||
fVectorEC2D = 0;
|
||||
ReadFromECHARM(fileName,vConversion);
|
||||
}
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
Reference in New Issue
Block a user