Changeset 1342 for trunk/examples/extended/geometry/olap/src

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/geometry/olap/src

Files:

• OlapManager.cc (modified) (4 diffs)
• OlapManagerMessenger.cc (modified) (4 diffs)
• OlapPhysicsList.cc (modified) (2 diffs)

trunk/examples/extended/geometry/olap/src/OlapManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: OlapManager.cc,v 1.3 2006/06/29 17:23:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: OlapManager.cc,v 1.4 2010/08/24 07:57:14 gcosmo Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 // 
@@ -46 +46 @@
 #include "OlapEventAction.hh"
 #include "G4GeoNav.hh"
+#include "G4GeometryTolerance.hh"
 #include "G4RunManager.hh"
 #include "globals.hh"
@@ -51 +52 @@
 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);
@@ -62 +62 @@
    //G4LogicalVolumeStore::iterator aIt = theLVStore->begin();
 
+   delta = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
    theRunManager = G4RunManager::GetRunManager();
    const G4VUserDetectorConstruction * aTmp =

trunk/examples/extended/geometry/olap/src/OlapManagerMessenger.cc

@@ -25 +25 @@
 //
 //
-// $Id: OlapManagerMessenger.cc,v 1.3 2006/06/29 17:23:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: OlapManagerMessenger.cc,v 1.4 2010/08/24 07:57:14 gcosmo Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 // 
@@ -40 +40 @@
 #include "OlapLogManager.hh"
 
+#include "G4GeometryTolerance.hh"
 #include "G4UIdirectory.hh"
 #include "G4UIcmdWithAString.hh"
@@ -54 +55 @@
 
   theLogManager = OlapLogManager::GetOlapLogManager();
+
+  G4double delta = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
 
   theOlapDir = new G4UIdirectory("/olap/");
@@ -78 +81 @@
   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

trunk/examples/extended/geometry/olap/src/OlapPhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: OlapPhysicsList.cc,v 1.2 2006/06/29 17:23:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: OlapPhysicsList.cc,v 1.3 2010/08/16 08:23:55 kurasige Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 // 
@@ -39 +39 @@
 
 #include "G4ios.hh"              
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleWithCuts.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"