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

Timestamp:

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

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/geometry/olap

Files:

• History (modified) (2 diffs)
• include/OlapEventAction.hh (modified) (2 diffs)
• include/OlapManager.hh (modified) (2 diffs)
• olapex.cc (modified) (2 diffs)
• src/OlapManager.cc (modified) (4 diffs)
• src/OlapManagerMessenger.cc (modified) (4 diffs)
• src/OlapPhysicsList.cc (modified) (2 diffs)

trunk/examples/extended/geometry/olap/History

@@ -1 @@
-$Id: History,v 1.11 2010/05/12 20:38:24 allison Exp $
+$Id: History,v 1.15 2010/10/27 10:41:33 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+October 27th, 2010  G.Cosmo - olapex-V09-03-02
+- Set primary-generator action after physics-list to run-manager.
+- Fixed compilation warnings for unused parameters.
+
+August 24th, 2010  G.Cosmo - olapex-V09-03-01
+- Fixed compilation error for setting of kRadTolerance.
+
+August 16th, 2010  H.Kurashige
+- Removed inclusion of G4ParticleWithCuts header.
 
 May 12th, 2010  J.Allison - olapex-V09-03-00

trunk/examples/extended/geometry/olap/include/OlapEventAction.hh

@@ -25 +25 @@
 //
 //
-// $Id: OlapEventAction.hh,v 1.3 2006/06/29 17:22:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: OlapEventAction.hh,v 1.5 2010/10/27 10:29:12 gcosmo Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 // 
@@ -59 +59 @@
             G4int a=0,
             G4LogicalVolume* original=0) :
-            hist1(h1), hist2(h2), v1(p1), v2(p2),axis(a) 
+            hist1(h1), hist2(h2), v1(p1), v2(p2),axis(a),
+            originalMother(original)
             {};
    

trunk/examples/extended/geometry/olap/include/OlapManager.hh

@@ -25 +25 @@
 //
 //
-// $Id: OlapManager.hh,v 1.4 2006/06/29 17:22:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: OlapManager.hh,v 1.5 2010/10/27 10:25:26 gcosmo Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 // 
@@ -89 +89 @@
    void notifyNewWorld(G4LogicalVolume*);
    void notifyOlaps(const std::vector<OlapInfo*> &);
-   void deRegisterNotification(OlapNotify*n) { ; }
+   void deRegisterNotification(OlapNotify*) { ; }
    // FIXME: handle completly different in next redesign!
    std::map<G4LogicalVolume *, G4bool> NoOlapMap; 

trunk/examples/extended/geometry/olap/olapex.cc

@@ -25 +25 @@
 //
 //
-// $Id: olapex.cc,v 1.4 2010/05/12 20:38:24 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: olapex.cc,v 1.5 2010/10/27 10:40:21 gcosmo Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 // 
@@ -71 +71 @@
   G4RunManager * runManager = new G4RunManager;
   
-  // particle-generator must be the first useraction!!!
-  runManager->SetUserAction(new OlapGenerator);
-  
   // put the user-geometry here
   G4VUserDetectorConstruction * origGeom = new RandomDetector(0);
   OlapDetConstr * olapGeom = new OlapDetConstr(origGeom);
   runManager->SetUserInitialization(olapGeom);
+
   runManager->SetUserInitialization(new OlapPhysicsList); 
+  runManager->SetUserAction(new OlapGenerator);
   
   // initialize G4

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"