Changeset 1347 for trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc (modified) (5 diffs)

trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ParameterisationTubs.cc,v 1.8 2006/06/29 18:18:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ParameterisationTubs.cc,v 1.10 2010/11/10 09:16:13 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // class G4ParameterisationTubs Implementation file
@@ -32 +32 @@
 // 26.05.03 - P.Arce, Initial version
 // 08.04.04 - I.Hrivnacova, Implemented reflection
+// 21.04.10 - M.Asai, Added gaps
 // --------------------------------------------------------------------
 
@@ -156 +157 @@
   G4Tubs* msol = (G4Tubs*)(fmotherSolid);
 
-  G4double pRMin = msol->GetInnerRadius() + foffset + fwidth * copyNo;
-  G4double pRMax = msol->GetInnerRadius() + foffset + fwidth * (copyNo+1);
+  G4double pRMin = msol->GetInnerRadius() + foffset + fwidth * copyNo + fhgap;
+  G4double pRMax = msol->GetInnerRadius() + foffset + fwidth * (copyNo+1) - fhgap;
   G4double pDz = msol->GetZHalfLength();
   //- already rotated  G4double pSR = foffset + copyNo*fwidth;
@@ -269 +270 @@
   G4double pDz = msol->GetZHalfLength();
   //----- already rotated in 'ComputeTransformation'
-  G4double pSPhi = msol->GetStartPhiAngle();
-  G4double pDPhi = fwidth;
+  G4double pSPhi = msol->GetStartPhiAngle() + fhgap;
+  G4double pDPhi = fwidth - 2.*fhgap;
 
   tubs.SetInnerRadius( pRMin );
@@ -379 +380 @@
   G4double pRMax = msol->GetOuterRadius();
   //  G4double pDz = msol->GetZHalfLength() / GetNoDiv();
-  G4double pDz = fwidth/2.;
+  G4double pDz = fwidth/2. - fhgap;
   G4double pSPhi = msol->GetStartPhiAngle();
   G4double pDPhi = msol->GetDeltaPhiAngle();