Import Geant4 10.0.0 source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4PVDivision.cc 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
//
|
||||
// class G4PVDivision Implementation file
|
||||
//
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4PVDivisionFactory.cc 68718 2013-04-05 09:16:24Z gcosmo $
|
||||
//
|
||||
// class G4PVDivisionFactory Implementation file
|
||||
//
|
||||
@@ -54,12 +54,11 @@ G4PVDivisionFactory::~G4PVDivisionFactory()
|
||||
|
||||
G4PVDivisionFactory* G4PVDivisionFactory::GetInstance()
|
||||
{
|
||||
static G4PVDivisionFactory theFactory;
|
||||
if (!fgInstance)
|
||||
{
|
||||
fgInstance = &theFactory;
|
||||
fgInstance = new G4PVDivisionFactory;
|
||||
}
|
||||
return &theFactory;
|
||||
return dynamic_cast<G4PVDivisionFactory*>(fgInstance);
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationBox.cc 68040 2013-03-13 14:19:04Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationBox Implementation file
|
||||
//
|
||||
@@ -126,10 +126,11 @@ ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol ) const
|
||||
origin.setX( posi );
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Only axes along X are allowed ! Axis: " << faxis;
|
||||
G4Exception("G4ParameterisationBoxX::ComputeTransformation()",
|
||||
"GeomDiv0002", FatalException,
|
||||
"Only axes along X are allowed ! Axis: "+faxis);
|
||||
"GeomDiv0002", FatalException, message);
|
||||
}
|
||||
#ifdef G4DIVDEBUG
|
||||
if( verbose >= 2 )
|
||||
@@ -228,9 +229,10 @@ ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol ) const
|
||||
}
|
||||
else
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Only axes along Y are allowed ! Axis: " << faxis;
|
||||
G4Exception("G4ParameterisationBoxY::ComputeTransformation()",
|
||||
"GeomDiv0002", FatalException,
|
||||
"Only axes along Y are allowed ! Axis: "+faxis);
|
||||
"GeomDiv0002", FatalException, message);
|
||||
}
|
||||
#ifdef G4DIVDEBUG
|
||||
if( verbose >= 2 )
|
||||
@@ -329,9 +331,10 @@ ComputeTransformation( const G4int copyNo, G4VPhysicalVolume *physVol ) const
|
||||
}
|
||||
else
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Only axes along Z are allowed ! Axis: " << faxis;
|
||||
G4Exception("G4ParameterisationBoxZ::ComputeTransformation()",
|
||||
"GeomDiv0002", FatalException,
|
||||
"Only axes along Z are allowed ! Axis: "+faxis);
|
||||
"GeomDiv0002", FatalException, message);
|
||||
}
|
||||
#ifdef G4DIVDEBUG
|
||||
if( verbose >= 2 )
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationCons.cc 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationCons Implementation file
|
||||
//
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationPara.cc 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationPara Implementation file
|
||||
//
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationPolycone.cc 75219 2013-10-29 16:12:13Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationPolycone Implementation file
|
||||
//
|
||||
@@ -49,14 +49,6 @@ G4VParameterisationPolycone( EAxis axis, G4int nDiv, G4double width,
|
||||
: G4VDivisionParameterisation( axis, nDiv, width, offset, divType, msolid )
|
||||
{
|
||||
G4Polycone* msol = (G4Polycone*)(msolid);
|
||||
if ((msolid->GetEntityType() != "G4ReflectedSolid") && (msol->IsGeneric()))
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Generic construct for G4Polycone NOT supported." << G4endl
|
||||
<< "Sorry! Solid: " << msol->GetName() << ".";
|
||||
G4Exception("G4VParameterisationPolycone::G4VParameterisationPolycone()",
|
||||
"GeomDiv0001", FatalException, message);
|
||||
}
|
||||
if (msolid->GetEntityType() == "G4ReflectedSolid")
|
||||
{
|
||||
// Get constituent solid
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationPolyhedra.cc 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationPolyhedra Implementation file
|
||||
//
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationTrd.cc 68040 2013-03-13 14:19:04Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationTrd Implementation file
|
||||
//
|
||||
@@ -157,9 +157,10 @@ ComputeTransformation( const G4int copyNo,
|
||||
}
|
||||
else
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Only axes along X are allowed ! Axis: " << faxis;
|
||||
G4Exception("G4ParameterisationTrdX::ComputeTransformation()",
|
||||
"GeomDiv0002", FatalException,
|
||||
"Only axes along X are allowed, and axis is: "+faxis);
|
||||
"GeomDiv0002", FatalException, message);
|
||||
}
|
||||
|
||||
#ifdef G4DIVDEBUG
|
||||
@@ -348,9 +349,10 @@ ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol ) const
|
||||
}
|
||||
else
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Only axes along Y are allowed ! Axis: " << faxis;
|
||||
G4Exception("G4ParameterisationTrdY::ComputeTransformation()",
|
||||
"GeomDiv0002", FatalException,
|
||||
"Only axes along Y are allowed !");
|
||||
"GeomDiv0002", FatalException, message);
|
||||
}
|
||||
|
||||
#ifdef G4DIVDEBUG
|
||||
@@ -476,9 +478,10 @@ ComputeTransformation(const G4int copyNo, G4VPhysicalVolume *physVol) const
|
||||
}
|
||||
else
|
||||
{
|
||||
std::ostringstream message;
|
||||
message << "Only axes along Z are allowed ! Axis: " << faxis;
|
||||
G4Exception("G4ParameterisationTrdZ::ComputeTransformation()",
|
||||
"GeomDiv0002", FatalException,
|
||||
"Only axes along Z are allowed !");
|
||||
"GeomDiv0002", FatalException, message);
|
||||
}
|
||||
|
||||
#ifdef G4DIVDEBUG
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ParameterisationTubs.cc 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
//
|
||||
// class G4ParameterisationTubs Implementation file
|
||||
//
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4ReplicatedSlice.cc 66356 2012-12-18 09:02:32Z gcosmo $
|
||||
//
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id$
|
||||
// $Id: G4VDivisionParameterisation.cc 66872 2013-01-15 01:25:57Z japost $
|
||||
//
|
||||
// class G4VDivisionParameterisation Implementation file
|
||||
//
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "G4ReflectedSolid.hh"
|
||||
#include "G4GeometryTolerance.hh"
|
||||
|
||||
G4int G4VDivisionParameterisation::verbose = 5;
|
||||
G4ThreadLocal G4int G4VDivisionParameterisation::verbose = 5;
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
G4VDivisionParameterisation::
|
||||
|
||||
Reference in New Issue
Block a user