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

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent.cc
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSSphereSurfaceCurrent.cc 76272 2013-11-08 11:53:00Z gcosmo $
//
// G4PSSphereSurfaceCurrent
#include "G4PSSphereSurfaceCurrent.hh"
@@ -99,7 +99,7 @@ G4bool G4PSSphereSurfaceCurrent::ProcessHits(G4Step* aStep,G4TouchableHistory*)
G4int dirFlag =IsSelectedSurface(aStep,sphereSolid);
if ( dirFlag > 0 ) {
if ( fDirection == fCurrent_InOut || fDirection == dirFlag ){
G4double radi = sphereSolid->GetInsideRadius();
G4double radi = sphereSolid->GetInnerRadius();
G4double dph = sphereSolid->GetDeltaPhiAngle()/radian;
G4double stth = sphereSolid->GetStartThetaAngle()/radian;
G4double enth = stth+sphereSolid->GetDeltaThetaAngle()/radian;
@@ -135,7 +135,7 @@ G4int G4PSSphereSurfaceCurrent::IsSelectedSurface(G4Step* aStep, G4Sphere* spher
//G4double InsideRadius2 =
// sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
//if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
G4double InsideRadius = sphereSolid->GetInsideRadius();
G4double InsideRadius = sphereSolid->GetInnerRadius();
if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
&&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
return fCurrent_In;
@@ -153,7 +153,7 @@ G4int G4PSSphereSurfaceCurrent::IsSelectedSurface(G4Step* aStep, G4Sphere* spher
//G4double InsideRadius2 =
// sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
//if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
G4double InsideRadius = sphereSolid->GetInsideRadius();
G4double InsideRadius = sphereSolid->GetInnerRadius();
if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
&&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
return fCurrent_Out;