Import Geant4 5.1.0 source tree
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
|
||||
$Id: History,v 1.34 2002/10/29 14:16:22 gcosmo Exp $
|
||||
$Id: History,v 1.36 2003/03/25 17:02:01 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -20,6 +20,19 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
Mar 25, 2003 G.Cosmo geom-bool-V05-00-01
|
||||
- Fixed trivial strict pedantic warnings in G4ReflectedSolid.cc and
|
||||
G4ReflectionFactory.cc.
|
||||
- Minor fixes to unit tests.
|
||||
|
||||
Jan 27, 2003 G.Cosmo geom-bool-V05-00-00
|
||||
- G4ReflectionFactory[.hh.cc] (courtesy of I.Hrivnacova):
|
||||
o Added set/get functions Set/GetVolumesNameExtension() for volume-name
|
||||
extension. By default now the factory assigns "_refl" postfix to name
|
||||
of reflected volumes.
|
||||
o Assumed less strict condition in the CheckScale() method, to avoid
|
||||
precision problems with imported rotation matrices.
|
||||
|
||||
Oct 29 2002 Gabriele Cosmo geom-bool-V04-01-01
|
||||
- Added method CleanTransformations() to G4DisplacedSolid and corrected
|
||||
implementation in destructor of G4BooleanSolid to not call for deletion
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4BooleanSolid.hh,v 1.6 2002/10/28 11:36:28 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4BooleanSolid
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4DisplacedSolid.hh,v 1.13 2002/10/29 14:13:53 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4DisplacedSolid
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4IntersectionSolid.hh,v 1.6 2002/10/28 11:36:28 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4IntersectionSolid
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4ReflectedSolid.hh,v 1.6 2002/10/28 11:36:28 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4ReflectedSolid
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ReflectionFactory.hh,v 1.1 2001/10/18 10:05:08 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// $Id: G4ReflectionFactory.hh,v 1.2 2003/01/27 10:43:30 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4Reflection
|
||||
@@ -121,6 +121,11 @@ class G4ReflectionFactory
|
||||
G4int GetVerboseLevel() const;
|
||||
// Sets/gets verbosity level.
|
||||
|
||||
void SetVolumesNameExtension(const G4String& nameExtension);
|
||||
G4String GetVolumesNameExtension() const;
|
||||
// Returns the name extension for the reflected solids
|
||||
// and logical volumes.
|
||||
|
||||
protected:
|
||||
|
||||
G4ReflectionFactory();
|
||||
@@ -184,10 +189,11 @@ class G4ReflectionFactory
|
||||
private:
|
||||
|
||||
static G4ReflectionFactory* fInstance;
|
||||
static const G4String fNameExtension;
|
||||
static const G4String fDefaultNameExtension;
|
||||
static const G4Scale3D fScale;
|
||||
|
||||
G4int fVerboseLevel;
|
||||
G4String fNameExtension;
|
||||
LogicalVolumesMap fConstituentLVMap;
|
||||
LogicalVolumesMap fReflectedLVMap;
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4SubtractionSolid.hh,v 1.6 2002/10/28 11:36:28 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4SubtractionSolid
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UnionSolid.hh,v 1.7 2002/10/28 11:36:28 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
//
|
||||
// class G4UnionSolid
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4BooleanSolid.cc,v 1.8 2002/10/29 14:15:52 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Implementation for the abstract base class for solids created by boolean
|
||||
// operations between other solids
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4DisplacedSolid.cc,v 1.16 2002/10/29 14:13:53 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Implementation for G4DisplacedSolid class for boolean
|
||||
// operations between other solids
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4IntersectionSolid.cc,v 1.18 2002/10/28 11:36:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Implementation of methods for the class G4IntersectionSolid
|
||||
//
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ReflectedSolid.cc,v 1.9 2002/10/28 11:36:29 gcosmo Exp $
|
||||
// $Id: G4ReflectedSolid.cc,v 1.10 2003/03/25 17:03:03 gcosmo Exp $
|
||||
//
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Implementation for G4ReflectedSolid class for boolean
|
||||
// operations between other solids
|
||||
@@ -472,9 +472,9 @@ G4ReflectedSolid::DistanceToOut( const G4ThreeVector& p ) const
|
||||
//
|
||||
|
||||
void
|
||||
G4ReflectedSolid::ComputeDimensions( G4VPVParameterisation* p,
|
||||
const G4int n,
|
||||
const G4VPhysicalVolume* pRep )
|
||||
G4ReflectedSolid::ComputeDimensions( G4VPVParameterisation*,
|
||||
const G4int,
|
||||
const G4VPhysicalVolume* )
|
||||
{
|
||||
DumpInfo();
|
||||
G4Exception("G4ReflectedSolid::ComputeDimensions() - has no meaning!");
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ReflectionFactory.cc,v 1.4 2002/10/28 11:36:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// $Id: G4ReflectionFactory.cc,v 1.6 2003/03/25 17:03:03 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Author: Ivana Hrivnacova, 16.10.2001 (Ivana.Hrivnacova@cern.ch)
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
#include "G4PVReplica.hh"
|
||||
|
||||
G4ReflectionFactory* G4ReflectionFactory::fInstance = 0;
|
||||
const G4String G4ReflectionFactory::fNameExtension = "_refl";
|
||||
const G4String G4ReflectionFactory::fDefaultNameExtension = "_refl";
|
||||
const G4Scale3D G4ReflectionFactory::fScale = G4ScaleZ3D(-1.0);
|
||||
|
||||
//_____________________________________________________________________________
|
||||
@@ -76,7 +76,8 @@ G4ReflectionFactory* G4ReflectionFactory::Instance()
|
||||
//_____________________________________________________________________________
|
||||
|
||||
G4ReflectionFactory::G4ReflectionFactory()
|
||||
: fVerboseLevel(0)
|
||||
: fVerboseLevel(0),
|
||||
fNameExtension(fDefaultNameExtension)
|
||||
{
|
||||
// Protected singleton constructor.
|
||||
// ---
|
||||
@@ -455,7 +456,7 @@ void G4ReflectionFactory::ReflectPVReplica(G4VPhysicalVolume* dPV,
|
||||
//_____________________________________________________________________________
|
||||
|
||||
void G4ReflectionFactory::ReflectPVParameterised(G4VPhysicalVolume* dPV,
|
||||
G4LogicalVolume* refLV)
|
||||
G4LogicalVolume*)
|
||||
{
|
||||
// Not implemented.
|
||||
// Should copy and transform daughter of PVReplica type of
|
||||
@@ -570,7 +571,7 @@ void G4ReflectionFactory::CheckScale(const G4Scale3D& scale) const
|
||||
for (G4int j=0; j<4; j++)
|
||||
diff += abs(scale(i,j) - fScale(i,j));
|
||||
|
||||
if (diff > kCarTolerance)
|
||||
if (diff > kCarTolerance*10.)
|
||||
{
|
||||
G4cout << "ERROR - G4ReflectionFactory::CheckScale()" << G4endl
|
||||
<< " Unexpected scale. Difference: " << diff << G4endl;
|
||||
@@ -580,16 +581,34 @@ void G4ReflectionFactory::CheckScale(const G4Scale3D& scale) const
|
||||
}
|
||||
}
|
||||
|
||||
void G4ReflectionFactory::SetVerboseLevel(G4int verboseLevel)
|
||||
//_____________________________________________________________________________
|
||||
|
||||
void G4ReflectionFactory::SetVerboseLevel(G4int verboseLevel)
|
||||
{
|
||||
fVerboseLevel = verboseLevel;
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
G4int G4ReflectionFactory::GetVerboseLevel() const
|
||||
{
|
||||
return fVerboseLevel;
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
void G4ReflectionFactory::SetVolumesNameExtension(const G4String& nameExtension)
|
||||
{
|
||||
fNameExtension = nameExtension;
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
G4String G4ReflectionFactory::GetVolumesNameExtension() const
|
||||
{
|
||||
return fNameExtension;
|
||||
}
|
||||
|
||||
/*
|
||||
// placement with decomposed transformation
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4SubtractionSolid.cc,v 1.17 2002/10/28 11:36:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Implementation of methods for the class G4IntersectionSolid
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UnionSolid.cc,v 1.21 2002/10/28 11:36:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-00 $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
//
|
||||
// Implementation of methods for the class G4IntersectionSolid
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user