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

Import Geant4 11.0.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/specific/src/G4UPolycone.cc
+6 -13
View File
@@ -43,8 +43,8 @@ using namespace CLHEP;
////////////////////////////////////////////////////////////////////////
//
// Constructor (GEANT3 style parameters)
//
G4UPolycone::G4UPolycone( const G4String& name,
//
G4UPolycone::G4UPolycone( const G4String& name,
G4double phiStart,
G4double phiTotal,
G4int numZPlanes,
@@ -88,14 +88,14 @@ G4UPolycone::G4UPolycone( const G4String& name,
//
// Constructor (generic parameters)
//
G4UPolycone::G4UPolycone(const G4String& name,
G4UPolycone::G4UPolycone(const G4String& name,
G4double phiStart,
G4double phiTotal,
G4int numRZ,
const G4double r[],
const G4double z[] )
: Base_t(name, phiStart, phiTotal, numRZ, r, z)
{
{
fGenericPcon = true;
SetOriginalParameters();
wrStart = phiStart; while (wrStart < 0) wrStart += twopi;
@@ -157,7 +157,7 @@ G4UPolycone::G4UPolycone( const G4UPolycone& source )
G4UPolycone& G4UPolycone::operator=( const G4UPolycone& source )
{
if (this == &source) return *this;
Base_t::operator=( source );
fGenericPcon = source.fGenericPcon;
fOriginalParameters = source.fOriginalParameters;
@@ -563,14 +563,7 @@ G4bool G4UPolycone::CalculateExtent(const EAxis pAxis,
//
G4Polyhedron* G4UPolycone::CreatePolyhedron() const
{
G4PolyhedronPcon*
polyhedron = new G4PolyhedronPcon( fOriginalParameters.Start_angle,
fOriginalParameters.Opening_angle,
fOriginalParameters.Num_z_planes,
fOriginalParameters.Z_values,
fOriginalParameters.Rmin,
fOriginalParameters.Rmax );
return polyhedron;
return new G4PolyhedronPcon(wrStart, wrDelta, rzcorners);
}
#endif // G4GEOM_USE_USOLIDS