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

Import Geant4 3.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:55:53 +02:00
parent e7d7193284
commit cfcb558cfe
3050 changed files with 91703 additions and 48310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/g3tog4/src/G3toG4MakeSolid.cc
+15 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3toG4MakeSolid.cc,v 1.4 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3toG4MakeSolid.cc,v 1.6 2000/08/01 09:08:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I.Hrivnacova, V.Berejnoi 27 Sep 99
@@ -22,6 +22,7 @@
#include "G4Polyhedra.hh"
#include "G4Para.hh"
#include "G4Hype.hh"
#include "G4EllipticalTube.hh"
#include "G3toG4MakeSolid.hh"
G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
@@ -174,7 +175,7 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
G4double pRmin2 = Rpar[3]*cm;
G4double pRmax2 = Rpar[4]*cm;
G4double pSPhi = Rpar[5]*deg;
G4double pDPhi = Rpar[6]- pSPhi;
G4double pDPhi = Rpar[6]*deg - pSPhi;
if ( Rpar[6]*deg <= pSPhi ) pDPhi = pDPhi + 360.*deg;
OKAxis[0]=OKAxis[1]=OKAxis[2]=true;
@@ -272,8 +273,17 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
delete [] Rmax;
} else if ( shape == "ELTU" ) {
// $$$ not implemented.
G4cerr << "ELTU not supported" << G4endl;
G4double dX = Rpar[0]*cm;
G4double dY = Rpar[1]*cm;
G4double dZ = Rpar[2]*cm;
OKAxis[0]=OKAxis[1]=OKAxis[2]=true;
NegVolPars = dX<0 || dY<0 || dZ<0;
if (!(NegVolPars || Deferred)) {
solid = new G4EllipticalTube(vname, dX, dY, dZ);
}
} else if ( shape == "HYPE" ) {
G4double pRmin = Rpar[0]*cm;