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

Import Geant4 1.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:28:20 +02:00
parent aaa409b6ee
commit ca1c8cb059
2995 changed files with 106830 additions and 299600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/g3tog4/src/G3toG4MakeSolid.cc
+15 -3
View File
@@ -1,13 +1,14 @@
// This code implementation is the intellectual property of
// the RD44 GEANT4 collaboration.
// the GEANT4 collaboration.
//
// By copying, distributing or modifying the Program (or any work
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3toG4MakeSolid.cc,v 1.2 1999/05/28 02:19:36 lockman Exp $
// GEANT4 tag $Name: geant4-00-01 $
// $Id: G3toG4MakeSolid.cc,v 1.3 1999/12/05 17:50:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-01-00 $
//
// modified by I.Hrivnacova, V.Berejnoi 27 Sep 99
#include "globals.hh"
#include "G4Box.hh"
@@ -35,6 +36,8 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
// if npar = 0 assume LV deferral
Deferred = (npar == 0);
// modified
if (Deferred) return solid;
for (int i=0;i<3;i++){
OKAxis[i]=false;
@@ -101,6 +104,15 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
NegVolPars= pDz<0 || pDy1<0 || pDx1<0 || pDx2<0 || pDy2<0 || pDx3<0 || pDx4<0;
if (!(NegVolPars || Deferred)) {
// added for test only
if (!(pDz>0)) pDz += 0.001*cm;
if (!(pDy1>0)) pDy1 += 0.001*cm;
if (!(pDx1>0)) pDx1 += 0.001*cm;
if (!(pDx2>0)) pDx2 += 0.001*cm;
if (!(pDy2>0)) pDy2 += 0.001*cm;
if (!(pDx3>0)) pDx3 += 0.001*cm;
if (!(pDx4>0)) pDx4 += 0.001*cm;
solid = new
G4Trap(vname, pDz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3,
pDx4, pAlp2);