Changeset 1228 for trunk/source/digits_hits/scorer/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/digits_hits/scorer/src

Files:

• G4PSCellCharge.cc (modified) (1 diff)
• G4PSCellCharge3D.cc (modified) (1 diff)
• G4PSCellFlux.cc (modified) (1 diff)
• G4PSCellFlux3D.cc (modified) (1 diff)
• G4PSCylinderSurfaceCurrent.cc (modified) (4 diffs)
• G4PSCylinderSurfaceCurrent3D.cc (modified) (1 diff)
• G4PSCylinderSurfaceFlux.cc (modified) (3 diffs)
• G4PSCylinderSurfaceFlux3D.cc (modified) (1 diff)
• G4PSDoseDeposit.cc (modified) (1 diff)
• G4PSDoseDeposit3D.cc (modified) (1 diff)
• G4PSEnergyDeposit.cc (modified) (1 diff)
• G4PSEnergyDeposit3D.cc (modified) (1 diff)
• G4PSFlatSurfaceCurrent.cc (modified) (1 diff)
• G4PSFlatSurfaceCurrent3D.cc (modified) (1 diff)
• G4PSFlatSurfaceFlux.cc (modified) (1 diff)
• G4PSFlatSurfaceFlux3D.cc (modified) (1 diff)
• G4PSMinKinEAtGeneration.cc (modified) (1 diff)
• G4PSMinKinEAtGeneration3D.cc (modified) (1 diff)
• G4PSNofCollision.cc (modified) (1 diff)
• G4PSNofCollision3D.cc (modified) (1 diff)
• G4PSNofSecondary.cc (modified) (1 diff)
• G4PSNofSecondary3D.cc (modified) (1 diff)
• G4PSNofStep.cc (modified) (1 diff)
• G4PSNofStep3D.cc (modified) (1 diff)
• G4PSPassageCellCurrent.cc (modified) (1 diff)
• G4PSPassageCellCurrent3D.cc (modified) (1 diff)
• G4PSPassageCellFlux.cc (modified) (1 diff)
• G4PSPassageCellFlux3D.cc (modified) (1 diff)
• G4PSPassageTrackLength.cc (modified) (1 diff)
• G4PSPassageTrackLength3D.cc (modified) (1 diff)
• G4PSPopulation.cc (modified) (1 diff)
• G4PSPopulation3D.cc (modified) (1 diff)
• G4PSSphereSurfaceCurrent.cc (modified) (3 diffs)
• G4PSSphereSurfaceCurrent3D.cc (modified) (1 diff)
• G4PSSphereSurfaceFlux.cc (modified) (3 diffs)
• G4PSSphereSurfaceFlux3D.cc (modified) (1 diff)
• G4PSTermination.cc (modified) (1 diff)
• G4PSTermination3D.cc (modified) (1 diff)
• G4PSTrackCounter.cc (modified) (1 diff)
• G4PSTrackCounter3D.cc (modified) (1 diff)
• G4PSTrackLength.cc (modified) (1 diff)
• G4PSTrackLength3D.cc (modified) (1 diff)
• G4SDChargedFilter.cc (modified) (1 diff)
• G4SDKineticEnergyFilter.cc (modified) (1 diff)
• G4SDNeutralFilter.cc (modified) (1 diff)
• G4SDParticleFilter.cc (modified) (1 diff)
• G4SDParticleWithEnergyFilter.cc (modified) (1 diff)

trunk/source/digits_hits/scorer/src/G4PSCellCharge.cc

@@ -25 +25 @@
 //
 // $Id: G4PSCellCharge.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellCharge

trunk/source/digits_hits/scorer/src/G4PSCellCharge3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSCellCharge3D.cc,v 1.3 2007/08/29 06:36:41 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellCharge3D

trunk/source/digits_hits/scorer/src/G4PSCellFlux.cc

@@ -26 +26 @@
 //
 // $Id: G4PSCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellFlux

trunk/source/digits_hits/scorer/src/G4PSCellFlux3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSCellFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellFlux3D

trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PSCylinderSurfaceCurrent.cc,v 1.2 2008/12/28 21:10:51 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSCylinderSurfaceCurrent.cc,v 1.3 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCylinderSurfaceCurrent
@@ -87 +87 @@
 
   G4int dirFlag =IsSelectedSurface(aStep,tubsSolid);
+  G4cout << " pos " << preStep->GetPosition() <<" dirFlag " << G4endl;
   if ( dirFlag > 0 ) {
     if ( fDirection == fCurrent_InOut || fDirection == dirFlag ){
@@ -121 +122 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos1);
     if ( std::fabs(localpos1.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( (localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y())
-                  -(tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()) )
-       < kCarTolerance ){
+    //if(std::fabs( localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y()
+    //    -(tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()))
+    //       < kCarTolerance ){
+    G4double localR2 = localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+        &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_In;
     }
@@ -134 +139 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos2);
     if ( std::fabs(localpos2.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( (localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y()) 
-                  - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()) )
-       <kCarTolerance ){
+    //if(std::fabs( localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y() 
+    //    - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()))
+    //       <kCarTolerance ){
+    G4double localR2 = localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+        &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_Out;
     }

trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSCylinderSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCylinderSurfaceCurrent3D

trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PSCylinderSurfaceFlux.cc,v 1.3 2008/12/28 21:10:51 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSCylinderSurfaceFlux.cc,v 1.4 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // // G4PSCylinderSurfaceFlux
@@ -144 +144 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos1);
     if ( std::fabs(localpos1.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y() ) 
-       - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius())<kCarTolerance ){
+    //if(std::fabs( localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y()  
+    //   - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()))
+    //   <kCarTolerance ){
+    G4double localR2 = localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+        &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_In;
     }
@@ -156 +161 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos2);
     if ( std::fabs(localpos2.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y() ) 
-       - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius())<kCarTolerance ){
+    //if(std::fabs( localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y()  
+    //   - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius())) 
+    // <kCarTolerance ){
+    G4double localR2 = localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+        &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_Out;
     }

trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSCylinderSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCylinderSurfaceFlux3D

trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc

@@ -26 +26 @@
 //
 // $Id: G4PSDoseDeposit.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSDoseDeposit

trunk/source/digits_hits/scorer/src/G4PSDoseDeposit3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSDoseDeposit3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSDoseDeposit3D

trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit.cc

@@ -26 +26 @@
 //
 // $Id: G4PSEnergyDeposit.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSEnergyDeposit

trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSEnergyDeposit3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSEnergyDeposit3D

trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent.cc

@@ -26 +26 @@
 //
 // $Id: G4PSFlatSurfaceCurrent.cc,v 1.3 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceCurrent

trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSFlatSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceCurrent3D

trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux.cc

@@ -26 +26 @@
 //
 // $Id: G4PSFlatSurfaceFlux.cc,v 1.2 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceFlux

trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSFlatSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceFlux3D

trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration.cc

@@ -26 +26 @@
 //
 // $Id: G4PSMinKinEAtGeneration.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSMinKinEAtGeneration

trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSMinKinEAtGeneration3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSMinKinEAtGeneration3D

trunk/source/digits_hits/scorer/src/G4PSNofCollision.cc

@@ -26 +26 @@
 //
 // $Id: G4PSNofCollision.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofCollision

trunk/source/digits_hits/scorer/src/G4PSNofCollision3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSNofCollision3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofCollision3D

trunk/source/digits_hits/scorer/src/G4PSNofSecondary.cc

@@ -26 +26 @@
 //
 // $Id: G4PSNofSecondary.cc,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofSecondary

trunk/source/digits_hits/scorer/src/G4PSNofSecondary3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSNofSecondary3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofSecondary3D

trunk/source/digits_hits/scorer/src/G4PSNofStep.cc

@@ -26 +26 @@
 //
 // $Id: G4PSNofStep.cc,v 1.2 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofStep

trunk/source/digits_hits/scorer/src/G4PSNofStep3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSNofStep3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofStep3D

trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPassageCellCurrent.cc,v 1.1 2007/08/14 21:30:46 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellCurrent

trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPassageCellCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellCurrent3D

trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPassageCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellFlux

trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPassageCellFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellFlux3D

trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPassageTrackLength.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageTrackLength

trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPassageTrackLength3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageTrackLength3D

trunk/source/digits_hits/scorer/src/G4PSPopulation.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPopulation.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPopulation

trunk/source/digits_hits/scorer/src/G4PSPopulation3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSPopulation3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPopulation3D

trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PSSphereSurfaceCurrent.cc,v 1.3 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSSphereSurfaceCurrent.cc,v 1.4 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceCurrent
@@ -121 +121 @@
                       +localpos1.y()*localpos1.y()
                       +localpos1.z()*localpos1.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+         &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_In;
     }
@@ -136 +139 @@
                       +localpos2.y()*localpos2.y()
                       +localpos2.z()*localpos2.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+         &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_Out;
     }

trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSSphereSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceCurrent3D

trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PSSphereSurfaceFlux.cc,v 1.2 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSSphereSurfaceFlux.cc,v 1.3 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceFlux
@@ -149 +149 @@
                       +localpos1.y()*localpos1.y()
                       +localpos1.z()*localpos1.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+         &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_In;
     }
@@ -164 +167 @@
                       +localpos2.y()*localpos2.y()
                       +localpos2.z()*localpos2.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::facb(localR2 - InsideRadius2) ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+         &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_Out;
     }

trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSSphereSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceFlux3D

trunk/source/digits_hits/scorer/src/G4PSTermination.cc

@@ -26 +26 @@
 //
 // $Id: G4PSTermination.cc,v 1.2 2007/12/10 16:29:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTermination

trunk/source/digits_hits/scorer/src/G4PSTermination3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSTermination3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTermination3D

trunk/source/digits_hits/scorer/src/G4PSTrackCounter.cc

@@ -26 +26 @@
 //
 // $Id: G4PSTrackCounter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackCounter

trunk/source/digits_hits/scorer/src/G4PSTrackCounter3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSTrackCounter3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackCounter3D

trunk/source/digits_hits/scorer/src/G4PSTrackLength.cc

@@ -26 +26 @@
 //
 // $Id: G4PSTrackLength.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackLength

trunk/source/digits_hits/scorer/src/G4PSTrackLength3D.cc

@@ -26 +26 @@
 //
 // $Id: G4PSTrackLength3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackLength3D

trunk/source/digits_hits/scorer/src/G4SDChargedFilter.cc

@@ -26 +26 @@
 //
 // $Id: G4SDChargedFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector

trunk/source/digits_hits/scorer/src/G4SDKineticEnergyFilter.cc

@@ -26 +26 @@
 //
 // $Id: G4SDKineticEnergyFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector

trunk/source/digits_hits/scorer/src/G4SDNeutralFilter.cc

@@ -26 +26 @@
 //
 // $Id: G4SDNeutralFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector

trunk/source/digits_hits/scorer/src/G4SDParticleFilter.cc

@@ -26 +26 @@
 //
 // $Id: G4SDParticleFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector

trunk/source/digits_hits/scorer/src/G4SDParticleWithEnergyFilter.cc

@@ -26 +26 @@
 //
 // $Id: G4SDParticleWithEnergyFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector