Import Geant4 10.6.0.beta source tree
This commit is contained in:
@@ -16,18 +16,21 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
March 13th, 2019 M. Asai (digits_hits-V10-04-13)
|
||||
May 29th, 2019 M. Asai (digits_hits-V10-05-04)
|
||||
- G4PSSphereSurfaceFlux : fix track weight forgotten from SphereSurfaceFlux.
|
||||
|
||||
March 13th, 2019 M. Asai (digits_hits-V10-05-03)
|
||||
- Defining unit categories for UI commands that take units. Co-working with
|
||||
intercoms-V10-05-02.
|
||||
|
||||
March 10th, 2019 M. Asai
|
||||
March 10th, 2019 M. Asai (digits_hits-V10-05-02)
|
||||
- G4SDManager, G4VSDFilter :
|
||||
Cleanly deleting all the G4VSDFilter objects at the end of program.
|
||||
|
||||
January 31st, 2019 I. Hrivnacova
|
||||
January 31st, 2019 I. Hrivnacova (digits_hits-V10-05-01)
|
||||
- Merged GitHub PR #4: all Boolean operators now return G4bool.
|
||||
|
||||
December 20th, 2018 G. Cosmo
|
||||
December 20th, 2018 G. Cosmo (digits_hits-V10-05-00)
|
||||
- Fixed shadowing compilation warning in G4ScoringBox and G4ScoringCylinder.
|
||||
|
||||
October 30th, 2018 I. Hrivnacova (digits_hits-V10-04-11,12)
|
||||
|
||||
@@ -132,17 +132,16 @@ G4bool G4PSSphereSurfaceFlux::ProcessHits(G4Step* aStep,G4TouchableHistory*)
|
||||
/std::sqrt(localdirL2)/std::sqrt(localR2);
|
||||
if ( anglefactor < 0.0 ) anglefactor *= -1.0;
|
||||
|
||||
G4double radi = sphereSolid->GetInnerRadius();
|
||||
G4double dph = sphereSolid->GetDeltaPhiAngle()/radian;
|
||||
G4double stth = sphereSolid->GetStartThetaAngle()/radian;
|
||||
G4double enth = stth+sphereSolid->GetDeltaThetaAngle()/radian;
|
||||
G4double square = radi*radi*dph*( -std::cos(enth) + std::cos(stth) );
|
||||
|
||||
G4double current = 1.0;
|
||||
if ( weighted ) thisStep->GetWeight(); // Flux (Particle Weight)
|
||||
if ( divideByArea ) current = current/square; // Flux with angle.
|
||||
|
||||
current /= anglefactor;
|
||||
G4double current = 1.0 / anglefactor;
|
||||
if ( weighted ) current *= thisStep->GetWeight(); // Flux (Particle Weight)
|
||||
if ( divideByArea ) // Flux with angle.
|
||||
{
|
||||
G4double radi = sphereSolid->GetInnerRadius();
|
||||
G4double dph = sphereSolid->GetDeltaPhiAngle()/radian;
|
||||
G4double stth = sphereSolid->GetStartThetaAngle()/radian;
|
||||
G4double enth = stth+sphereSolid->GetDeltaThetaAngle()/radian;
|
||||
current /= radi*radi*dph*( -std::cos(enth) + std::cos(stth) );
|
||||
}
|
||||
|
||||
G4int index = GetIndex(aStep);
|
||||
EvtMap->add(index,current);
|
||||
|
||||
Reference in New Issue
Block a user