Import Geant4 9.4.0 source tree
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: OlapDetConstr.cc,v 1.4 2006/06/29 17:22:52 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: OlapDetConstr.cc,v 1.5 2010/11/16 14:34:30 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -529,7 +529,7 @@ void OlapDetConstr::DeleteNewWorld()
|
||||
|
||||
if (nr==0)
|
||||
{
|
||||
G4cerr << "OlapDetConstr::DeleteNewWorld(): no daughter in NewWorld!"
|
||||
G4cout << "OlapDetConstr::DeleteNewWorld(): no daughter in NewWorld!"
|
||||
<< G4endl << G4endl;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: OlapManager.cc,v 1.3 2006/06/29 17:23:00 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: OlapManager.cc,v 1.4 2010/08/24 07:57:14 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -45,15 +45,15 @@
|
||||
#include "OlapGenerator.hh"
|
||||
#include "OlapEventAction.hh"
|
||||
#include "G4GeoNav.hh"
|
||||
#include "G4GeometryTolerance.hh"
|
||||
#include "G4RunManager.hh"
|
||||
#include "globals.hh"
|
||||
|
||||
OlapManager * OlapManager::theInstance = 0;
|
||||
|
||||
OlapManager::OlapManager() :
|
||||
olapGenerator(0), delta( kRadTolerance ),
|
||||
eventsPerRun(27), lvPos(0), polyMode(false),
|
||||
interrupt(false)
|
||||
OlapManager::OlapManager()
|
||||
: olapGenerator(0), eventsPerRun(27), lvPos(0),
|
||||
polyMode(false), interrupt(false)
|
||||
{
|
||||
theMessenger = new OlapManagerMessenger(this);
|
||||
theLVStore = G4LogicalVolumeStore::GetInstance();
|
||||
@@ -61,6 +61,7 @@ OlapManager::OlapManager() :
|
||||
//std::vector<G4LogicalVolume*>::iterator aIt = theLVStore->begin();
|
||||
//G4LogicalVolumeStore::iterator aIt = theLVStore->begin();
|
||||
|
||||
delta = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
|
||||
theRunManager = G4RunManager::GetRunManager();
|
||||
const G4VUserDetectorConstruction * aTmp =
|
||||
theRunManager->GetUserDetectorConstruction();
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: OlapManagerMessenger.cc,v 1.3 2006/06/29 17:23:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: OlapManagerMessenger.cc,v 1.4 2010/08/24 07:57:14 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "OlapManager.hh"
|
||||
#include "OlapLogManager.hh"
|
||||
|
||||
#include "G4GeometryTolerance.hh"
|
||||
#include "G4UIdirectory.hh"
|
||||
#include "G4UIcmdWithAString.hh"
|
||||
#include "G4UIcmdWithAnInteger.hh"
|
||||
@@ -54,6 +55,8 @@ OlapManagerMessenger::OlapManagerMessenger(OlapManager* aManager)
|
||||
|
||||
theLogManager = OlapLogManager::GetOlapLogManager();
|
||||
|
||||
G4double delta = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
|
||||
|
||||
theOlapDir = new G4UIdirectory("/olap/");
|
||||
theOlapDir->SetGuidance("Overlap detection facility");
|
||||
|
||||
@@ -77,7 +80,7 @@ OlapManagerMessenger::OlapManagerMessenger(OlapManager* aManager)
|
||||
|
||||
theDeltaCmd = new G4UIcmdWithADoubleAndUnit("/olap/delta",this);
|
||||
theDeltaCmd->SetGuidance("set boundary tolerance for overlaps in units of length");
|
||||
theDeltaCmd->SetDefaultValue(kRadTolerance);
|
||||
theDeltaCmd->SetDefaultValue(delta);
|
||||
theDeltaCmd->SetParameterName("delta",true);
|
||||
theDeltaCmd->SetRange("delta>=1.e-9"); // current G4-accuracy
|
||||
theDeltaCmd->SetUnitCategory("Length");
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: OlapPhysicsList.cc,v 1.2 2006/06/29 17:23:07 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: OlapPhysicsList.cc,v 1.3 2010/08/16 08:23:55 kurasige Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -38,8 +38,6 @@
|
||||
#include "OlapPhysicsList.hh"
|
||||
|
||||
#include "G4ios.hh"
|
||||
#include "G4ParticleDefinition.hh"
|
||||
#include "G4ParticleWithCuts.hh"
|
||||
#include "G4ProcessManager.hh"
|
||||
#include "G4ProcessVector.hh"
|
||||
#include "G4ParticleTypes.hh"
|
||||
|
||||
Reference in New Issue
Block a user