Import Geant4 10.5.0 source tree
This commit is contained in:
@@ -81,24 +81,27 @@ G4ReactionProduct * G4ParticleHPContEnergyAngular::Sample(G4double anEnergy, G4d
|
||||
#else
|
||||
if( getenv("G4PHPTEST") ) G4cout << i << " G4ParticleHPContEnergyAngular To BUILDBYINTERPOLATION " << it << " : " << theAngular[it].GetEnergy()<< " , " << theAngular[it].GetNEnergies() << " " << it-1 << " : " << theAngular[it-1].GetEnergy()<< " : " << theAngular[it-1].GetNEnergies() << G4endl; //GDEB
|
||||
|
||||
G4ParticleHPContAngularPar * angular = new G4ParticleHPContAngularPar(theProjectile );
|
||||
|
||||
angular->SetInterpolation(theInterpolation);
|
||||
angular->BuildByInterpolation( anEnergy, theManager.GetScheme(0), (theAngular[it-1]), (theAngular[it]) );
|
||||
|
||||
angular->SetTarget(GetTarget());
|
||||
angular->SetTargetCode(theTargetCode);
|
||||
angular->SetPrimary(GetProjectileRP());
|
||||
result = angular->Sample(anEnergy, massCode, targetMass,
|
||||
// G4ParticleHPContAngularPar * fAngular = new G4ParticleHPContAngularPar(theProjectile ); //fix start
|
||||
if (fCacheAngular.Get() == NULL) {
|
||||
G4ParticleHPContAngularPar* angpar = new G4ParticleHPContAngularPar(theProjectile);
|
||||
fCacheAngular.Put(angpar);
|
||||
}
|
||||
fCacheAngular.Get()->SetInterpolation(theInterpolation);
|
||||
fCacheAngular.Get()->BuildByInterpolation( anEnergy, theManager.GetScheme(0), (theAngular[it-1]), (theAngular[it]) );
|
||||
fCacheAngular.Get()->SetTarget(GetTarget());
|
||||
fCacheAngular.Get()->SetTargetCode(theTargetCode);
|
||||
fCacheAngular.Get()->SetPrimary(GetProjectileRP());
|
||||
result = fCacheAngular.Get()->Sample(anEnergy, massCode, targetMass,
|
||||
theAngularRep, theInterpolation);
|
||||
currentMeanEnergy.Put( angular->MeanEnergyOfThisInteraction() );
|
||||
|
||||
delete angular;
|
||||
currentMeanEnergy.Put( fCacheAngular.Get()->MeanEnergyOfThisInteraction() );
|
||||
fCacheAngular.Get()->ClearHistories();
|
||||
|
||||
// delete fAngular; //fix end
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
// G4cout << " 0 0 @@@ G4ParticleHPContEnergyAngular::Sample " << result->GetDefinition()->GetParticleName() << " E= " << result->GetKineticEnergy() << G4endl;//GDEB
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user