Import Geant4 11.4.0 source tree
This commit is contained in:
@@ -117,16 +117,14 @@ G4PVDivisionFactory::CreatePVDivision(const G4String& pName,
|
||||
"Unexpected parameterisation type!");
|
||||
return nullptr;
|
||||
}
|
||||
else
|
||||
{
|
||||
EAxis axis = divParam->GetAxis();
|
||||
G4int nofDivisions = divParam->GetNoDiv();
|
||||
G4double width = divParam->GetWidth();
|
||||
G4double offset = divParam->GetOffset();
|
||||
|
||||
EAxis axis = divParam->GetAxis();
|
||||
G4int nofDivisions = divParam->GetNoDiv();
|
||||
G4double width = divParam->GetWidth();
|
||||
G4double offset = divParam->GetOffset();
|
||||
|
||||
return new G4PVDivision(pName, pLogical, pMotherLogical,
|
||||
axis, nofDivisions, width, offset);
|
||||
}
|
||||
return new G4PVDivision(pName, pLogical, pMotherLogical,
|
||||
axis, nofDivisions, width, offset);
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
@@ -550,10 +550,14 @@ ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol) const
|
||||
//
|
||||
posi = fOrigParamMother->Z_values[0];
|
||||
|
||||
if ( !fReflectedSolid )
|
||||
if ( !fReflectedSolid )
|
||||
{
|
||||
posi += foffset + (2*copyNo + 1) * fwidth/2.;
|
||||
}
|
||||
else
|
||||
{
|
||||
posi -= foffset + (2*copyNo + 1) * fwidth/2.;
|
||||
}
|
||||
|
||||
physVol->SetTranslation( G4ThreeVector(0, 0, posi) );
|
||||
}
|
||||
@@ -660,8 +664,8 @@ ComputeDimensions( G4Polycone& pcone, const G4int copyNo,
|
||||
|
||||
// It can happen due to rounding errors
|
||||
//
|
||||
if ( origparam.Rmin[0] < 0.0 ) origparam.Rmin[0] = 0.0;
|
||||
if ( origparam.Rmin[nz-1] < 0.0 ) origparam.Rmin[1] = 0.0;
|
||||
if ( origparam.Rmin[0] < 0.0 ) { origparam.Rmin[0] = 0.0; }
|
||||
if ( origparam.Rmin[nz-1] < 0.0 ) { origparam.Rmin[1] = 0.0; }
|
||||
}
|
||||
|
||||
pcone.SetOriginalParameters(&origparam); // copy values & transfer pointers
|
||||
|
||||
@@ -628,9 +628,13 @@ ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol) const
|
||||
posi = fOrigParamMother->Z_values[0];
|
||||
|
||||
if ( !fReflectedSolid )
|
||||
{
|
||||
posi += foffset + (2*copyNo + 1) * fwidth/2.;
|
||||
}
|
||||
else
|
||||
{
|
||||
posi -= foffset + (2*copyNo + 1) * fwidth/2.;
|
||||
}
|
||||
|
||||
physVol->SetTranslation( G4ThreeVector(0, 0, posi) );
|
||||
}
|
||||
@@ -739,8 +743,8 @@ ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
|
||||
|
||||
// It can happen due to rounding errors
|
||||
//
|
||||
if ( origparam.Rmin[0] < 0.0 ) origparam.Rmin[0] = 0.0;
|
||||
if ( origparam.Rmin[nz-1] < 0.0 ) origparam.Rmin[1] = 0.0;
|
||||
if ( origparam.Rmin[0] < 0.0 ) { origparam.Rmin[0] = 0.0; }
|
||||
if ( origparam.Rmin[nz-1] < 0.0 ) { origparam.Rmin[1] = 0.0; }
|
||||
}
|
||||
|
||||
phedra.SetOriginalParameters(&origparam); // copy values & transfer pointers
|
||||
|
||||
Reference in New Issue
Block a user