Changeset 1347 for trunk/source/geometry/divisions/src/G4ParameterisationTrd.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/G4ParameterisationTrd.cc (modified) (12 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ParameterisationTrd.cc,v 1.16 2008/12/18 12:57:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4ParameterisationTrd.cc,v 1.19 2010/11/10 09:16:08 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // class G4ParameterisationTrd 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
 // --------------------------------------------------------------------
 
@@ -50 +51 @@
                         G4double offset, G4VSolid* msolid,
                         DivisionType divType )
-  :  G4VDivisionParameterisation( axis, nDiv, width, offset, divType, msolid )
+  :  G4VDivisionParameterisation( axis, nDiv, width, offset, divType, msolid ),
+     bDivInTrap(false)
 {
   G4Trd* msol = (G4Trd*)(msolid);
@@ -141 +143 @@
   G4ThreeVector origin(0.,0.,0.); 
   G4double posi;
-  if( !bDivInTrap ) {
+  if( !bDivInTrap )
+  {
     posi = -mdx + foffset + (copyNo+0.5)*fwidth;
-  } else {
+  }
+  else
+  {
     G4double aveHL = (msol->GetXHalfLength1()+msol->GetXHalfLength2())/2.;
     posi = - aveHL + foffset + (copyNo+0.5)*aveHL/fnDiv*2;
@@ -181 +186 @@
   G4double pDy2 = msol->GetYHalfLength2();
   G4double pDz = msol->GetZHalfLength();
-  G4double pDx = fwidth/2.;
+  G4double pDx = fwidth/2. - fhgap;
   
   trd.SetAllParameters ( pDx, pDx, pDy1, pDy2, pDz );
@@ -203 +208 @@
   else 
   {
-    return theTrap;
+    return fmotherSolid;
   }
 }
@@ -232 +237 @@
                           alp,
                           pDy2,
-                          pDx1,
-                          pDx2,
+                          pDx1 - fhgap,
+                          pDx2 - fhgap * pDx2/pDx1,
                           alp);
 
@@ -249 +254 @@
 {
   G4VDivisionParameterisation::CheckParametersValidity();
-
+/*
   G4Trd* msol = (G4Trd*)(fmotherSolid);
 
@@ -258 +263 @@
   if( std::fabs(mpDx1 - mpDx2) > kCarTolerance )
   {
-    return;
-
     G4cerr << "ERROR - G4ParameterisationTrdX::CheckParametersValidity()"
            << G4endl
@@ -270 +273 @@
                 "Invalid solid specification. NOT supported.");
   }
+*/
 }
 
@@ -370 +374 @@
   G4double pDx2 = msol->GetXHalfLength2();
   G4double pDz = msol->GetZHalfLength();
-  G4double pDy = fwidth/2.;
+  G4double pDy = fwidth/2. - fhgap;
  
   trd.SetAllParameters ( pDx1, pDx2, pDy, pDy, pDz );
@@ -501 +505 @@
   G4double pDy1 = msol->GetYHalfLength1();
   G4double DDy = (msol->GetYHalfLength2() - msol->GetYHalfLength1() );
-  G4double pDz = fwidth/2.;
+  G4double pDz = fwidth/2. - fhgap;
   G4double zLength = 2*msol->GetZHalfLength();
  
-  trd.SetAllParameters( pDx1+DDx*(OffsetZ()+copyNo*fwidth)/zLength,
-                        pDx1+DDx*(OffsetZ()+(copyNo+1)*fwidth)/zLength, 
-                        pDy1+DDy*(OffsetZ()+copyNo*fwidth)/zLength,
-                        pDy1+DDy*(OffsetZ()+(copyNo+1)*fwidth)/zLength, pDz );
+  trd.SetAllParameters( pDx1+DDx*(OffsetZ()+copyNo*fwidth+fhgap)/zLength,
+                        pDx1+DDx*(OffsetZ()+(copyNo+1)*fwidth-fhgap)/zLength, 
+                        pDy1+DDy*(OffsetZ()+copyNo*fwidth+fhgap)/zLength,
+                        pDy1+DDy*(OffsetZ()+(copyNo+1)*fwidth-fhgap)/zLength, pDz );
 
 #ifdef G4DIVDEBUG