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

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/divisions/src/G4PVDivision.cc
+2 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVDivision.cc,v 1.11 2004/05/13 14:57:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4PVDivision.cc,v 1.12 2004/08/26 07:58:37 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// class G4PVDivision Implementation file
//
@@ -166,8 +166,6 @@ G4PVDivision::CheckAndSetParameters( const EAxis pAxis,
// daughter solid (otherwise, the corresponding
// Parameterisation::ComputeDimension() will not be called)
//
G4cout << " GetMotherLogical " << GetMotherLogical() << G4endl;
G4cout << " GetLogicalVolume " << GetLogicalVolume() << G4endl;
G4String msolType = pMotherLogical->GetSolid()->GetEntityType();
G4String dsolType = GetLogicalVolume()->GetSolid()->GetEntityType();
if( msolType != dsolType )
source/geometry/divisions/src/G4PVDivisionFactory.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PVDivisionFactory.cc,v 1.1 2004/05/13 14:56:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// class G4PVDivisionFactory Implementation file
//
source/geometry/divisions/src/G4ParameterisationBox.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParameterisationBox.cc,v 1.7 2004/05/17 07:20:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// class G4ParameterisationBox Implementation file
//
source/geometry/divisions/src/G4ParameterisationCons.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParameterisationCons.cc,v 1.8 2004/05/17 07:20:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// class G4ParameterisationCons Implementation file
//
source/geometry/divisions/src/G4ParameterisationPara.cc
+7 -7
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParameterisationPara.cc,v 1.8 2004/05/17 07:20:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParameterisationPara.cc,v 1.10 2004/12/10 16:20:21 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-05 $
//
// class G4ParameterisationPara Implementation file
//
@@ -63,8 +63,8 @@ G4VParameterisationPara( EAxis axis, G4int nDiv, G4double width,
msol->GetXHalfLength(),
msol->GetYHalfLength(),
msol->GetZHalfLength(),
atan(msol->GetTanAlpha()),
M_PI - msol->GetSymAxis().theta(),
std::atan(msol->GetTanAlpha()),
pi - msol->GetSymAxis().theta(),
msol->GetSymAxis().phi());
msol = newSolid;
@@ -161,7 +161,7 @@ ComputeDimensions(G4Para& para, const G4int,
G4double pDx = fwidth/2.;
G4double pDy = msol->GetYHalfLength();
G4double pDz = msol->GetZHalfLength();
G4double pAlpha = atan(msol->GetTanAlpha());
G4double pAlpha = std::atan(msol->GetTanAlpha());
G4double pTheta = msol->GetSymAxis().theta();
G4double pPhi = msol->GetSymAxis().phi();
@@ -263,7 +263,7 @@ ComputeDimensions(G4Para& para, const G4int,
G4double pDx = msol->GetXHalfLength();
G4double pDy = fwidth/2.;
G4double pDz = msol->GetZHalfLength();
G4double pAlpha = atan(msol->GetTanAlpha());
G4double pAlpha = std::atan(msol->GetTanAlpha());
G4double pTheta = msol->GetSymAxis().theta();
G4double pPhi = msol->GetSymAxis().phi();
@@ -362,7 +362,7 @@ ComputeDimensions(G4Para& para, const G4int,
//---- Get
G4double pDx = msol->GetXHalfLength();
G4double pDy = msol->GetYHalfLength();
G4double pAlpha = atan(msol->GetTanAlpha());
G4double pAlpha = std::atan(msol->GetTanAlpha());
G4double pTheta = msol->GetSymAxis().theta();
G4double pPhi = msol->GetSymAxis().phi();
G4double pDz = fwidth/2.;
source/geometry/divisions/src/G4ParameterisationPolycone.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParameterisationPolycone.cc,v 1.9 2004/05/17 07:20:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParameterisationPolycone.cc,v 1.10 2004/12/02 09:31:22 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// class G4ParameterisationPolycone Implementation file
//
@@ -386,7 +386,7 @@ G4double G4ParameterisationPolyconeZ::GetMaxParameter() const
{
G4Polycone* msol = (G4Polycone*)(fmotherSolid);
G4PolyconeHistorical* origparamMother = msol->GetOriginalParameters();
return abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
return std::abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
-origparamMother->Z_values[0]);
}
source/geometry/divisions/src/G4ParameterisationPolyhedra.cc
+6 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParameterisationPolyhedra.cc,v 1.8 2004/05/17 07:20:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParameterisationPolyhedra.cc,v 1.10 2004/12/10 16:20:21 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-05 $
//
// class G4ParameterisationPolyhedra Implementation file
//
@@ -105,10 +105,10 @@ ConvertRadiusFactor(const G4Polyhedra& phedra) const
G4double phiTotal = phedra.GetEndPhi() - phedra.GetStartPhi();
G4int nofSides = phedra.GetOriginalParameters()->numSide;
if ( (phiTotal <=0) || (phiTotal > 2*M_PI+kAngTolerance) )
phiTotal = 2*M_PI;
if ( (phiTotal <=0) || (phiTotal > 2*pi+kAngTolerance) )
phiTotal = 2*pi;
return cos(0.5*phiTotal/nofSides);
return std::cos(0.5*phiTotal/nofSides);
}
//--------------------------------------------------------------------------
@@ -461,7 +461,7 @@ G4double G4ParameterisationPolyhedraZ::GetMaxParameter() const
{
G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
return abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
return std::abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
-origparamMother->Z_values[0]);
}
source/geometry/divisions/src/G4ParameterisationTrd.cc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParameterisationTrd.cc,v 1.10 2004/05/17 07:20:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4ParameterisationTrd.cc,v 1.11 2004/12/02 09:31:22 gcosmo Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
// class G4ParameterisationTrd Implementation file
//
@@ -190,7 +190,7 @@ void G4ParameterisationTrdX::CheckParametersValidity()
G4double mpDx1 = msol->GetXHalfLength1();
G4double mpDx2 = msol->GetXHalfLength2();
if( fabs(mpDx1 - mpDx2) > kCarTolerance )
if( std::fabs(mpDx1 - mpDx2) > kCarTolerance )
{
G4cerr << "ERROR - G4ParameterisationTrdX::CheckParametersValidity()"
<< G4endl
@@ -318,7 +318,7 @@ void G4ParameterisationTrdY::CheckParametersValidity()
G4double mpDy1 = msol->GetYHalfLength1();
G4double mpDy2 = msol->GetYHalfLength2();
if( fabs(mpDy1 - mpDy2) > kCarTolerance )
if( std::fabs(mpDy1 - mpDy2) > kCarTolerance )
{
G4cerr << "ERROR - G4ParameterisationTrdY::CheckParametersValidity()"
<< G4endl
source/geometry/divisions/src/G4ParameterisationTubs.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParameterisationTubs.cc,v 1.7 2004/05/17 07:20:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// class G4ParameterisationTubs Implementation file
//
source/geometry/divisions/src/G4VDivisionParameterisation.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VDivisionParameterisation.cc,v 1.10 2004/05/17 07:20:42 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// GEANT4 tag $Name: geant4-07-00-cand-01 $
//
// class G4VDivisionParameterisation Implementation file
//