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

Import Geant4 11.2.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2023-06-30 09:09:57 +02:00
parent aef78ca386
commit dd1f179cda
3780 changed files with 212808 additions and 142780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/divisions/src/G4ParameterisationPolyhedra.cc
+17 -25
View File
@@ -57,7 +57,7 @@ G4VParameterisationPolyhedra( EAxis axis, G4int nDiv, G4double width,
"GeomDiv0001", FatalException, message);
#endif */
G4Polyhedra* msol = (G4Polyhedra*)(msolid);
auto msol = (G4Polyhedra*)(msolid);
if ((msolid->GetEntityType() != "G4ReflectedSolid") && (msol->IsGeneric()))
{
message << "Generic construct for G4Polyhedra NOT supported." << G4endl
@@ -83,9 +83,9 @@ G4VParameterisationPolyhedra( EAxis axis, G4int nDiv, G4double width,
// Invert z values, convert radius parameters
//
G4double* rminValues2 = new G4double[nofZplanes];
G4double* rmaxValues2 = new G4double[nofZplanes];
G4double* zValuesRefl = new G4double[nofZplanes];
auto rminValues2 = new G4double[nofZplanes];
auto rmaxValues2 = new G4double[nofZplanes];
auto zValuesRefl = new G4double[nofZplanes];
for (G4int i=0; i<nofZplanes; ++i)
{
rminValues2[i] = rminValues[i] * ConvertRadiusFactor(*msol);
@@ -93,7 +93,7 @@ G4VParameterisationPolyhedra( EAxis axis, G4int nDiv, G4double width,
zValuesRefl[i] = - zValues[i];
}
G4Polyhedra* newSolid
auto newSolid
= new G4Polyhedra(msol->GetName(),
msol->GetStartPhi(),
msol->GetEndPhi() - msol->GetStartPhi(),
@@ -112,9 +112,7 @@ G4VParameterisationPolyhedra( EAxis axis, G4int nDiv, G4double width,
}
//------------------------------------------------------------------------
G4VParameterisationPolyhedra::~G4VParameterisationPolyhedra()
{
}
G4VParameterisationPolyhedra::~G4VParameterisationPolyhedra() = default;
//--------------------------------------------------------------------------
G4double
@@ -142,7 +140,7 @@ G4ParameterisationPolyhedraRho( EAxis axis, G4int nDiv,
CheckParametersValidity();
SetType( "DivisionPolyhedraRho" );
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
G4PolyhedraHistorical* original_pars = msol->GetOriginalParameters();
if( divType == DivWIDTH )
@@ -168,16 +166,14 @@ G4ParameterisationPolyhedraRho( EAxis axis, G4int nDiv,
}
//------------------------------------------------------------------------
G4ParameterisationPolyhedraRho::~G4ParameterisationPolyhedraRho()
{
}
G4ParameterisationPolyhedraRho::~G4ParameterisationPolyhedraRho() = default;
//---------------------------------------------------------------------
void G4ParameterisationPolyhedraRho::CheckParametersValidity()
{
G4VDivisionParameterisation::CheckParametersValidity();
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
if( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH )
{
@@ -204,7 +200,7 @@ void G4ParameterisationPolyhedraRho::CheckParametersValidity()
//------------------------------------------------------------------------
G4double G4ParameterisationPolyhedraRho::GetMaxParameter() const
{
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
G4PolyhedraHistorical* original_pars = msol->GetOriginalParameters();
return original_pars->Rmax[0] - original_pars->Rmin[0];
}
@@ -251,7 +247,7 @@ G4ParameterisationPolyhedraRho::
ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
const G4VPhysicalVolume* ) const
{
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
G4PolyhedraHistorical origparam( *origparamMother );
@@ -289,7 +285,7 @@ G4ParameterisationPolyhedraPhi( EAxis axis, G4int nDiv,
CheckParametersValidity();
SetType( "DivisionPolyhedraPhi" );
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
G4double deltaPhi = msol->GetEndPhi() - msol->GetStartPhi();
if( divType == DivWIDTH )
@@ -311,14 +307,12 @@ G4ParameterisationPolyhedraPhi( EAxis axis, G4int nDiv,
}
//------------------------------------------------------------------------
G4ParameterisationPolyhedraPhi::~G4ParameterisationPolyhedraPhi()
{
}
G4ParameterisationPolyhedraPhi::~G4ParameterisationPolyhedraPhi() = default;
//------------------------------------------------------------------------
G4double G4ParameterisationPolyhedraPhi::GetMaxParameter() const
{
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
return msol->GetEndPhi() - msol->GetStartPhi();
}
@@ -327,7 +321,7 @@ void G4ParameterisationPolyhedraPhi::CheckParametersValidity()
{
G4VDivisionParameterisation::CheckParametersValidity();
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
if( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH )
{
@@ -407,7 +401,7 @@ G4ParameterisationPolyhedraPhi::
ComputeDimensions( G4Polyhedra& phedra, const G4int,
const G4VPhysicalVolume* ) const
{
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
auto msol = (G4Polyhedra*)(fmotherSolid);
G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
G4PolyhedraHistorical origparam( *origparamMother );
@@ -464,9 +458,7 @@ G4ParameterisationPolyhedraZ( EAxis axis, G4int nDiv,
}
//---------------------------------------------------------------------
G4ParameterisationPolyhedraZ::~G4ParameterisationPolyhedraZ()
{
}
G4ParameterisationPolyhedraZ::~G4ParameterisationPolyhedraZ() = default;
//------------------------------------------------------------------------
G4double G4ParameterisationPolyhedraZ::GetR(G4double z,