Changeset 1342 for trunk/examples/extended/geometry
- Timestamp:
- Nov 5, 2010, 4:08:39 PM (14 years ago)
- Location:
- trunk/examples/extended/geometry/olap
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/examples/extended/geometry/olap/History
r1337 r1342 1 $Id: History,v 1.1 1 2010/05/12 20:38:24 allisonExp $1 $Id: History,v 1.15 2010/10/27 10:41:33 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 October 27th, 2010 G.Cosmo - olapex-V09-03-02 21 - Set primary-generator action after physics-list to run-manager. 22 - Fixed compilation warnings for unused parameters. 23 24 August 24th, 2010 G.Cosmo - olapex-V09-03-01 25 - Fixed compilation error for setting of kRadTolerance. 26 27 August 16th, 2010 H.Kurashige 28 - Removed inclusion of G4ParticleWithCuts header. 19 29 20 30 May 12th, 2010 J.Allison - olapex-V09-03-00 -
trunk/examples/extended/geometry/olap/include/OlapEventAction.hh
r1337 r1342 25 25 // 26 26 // 27 // $Id: OlapEventAction.hh,v 1. 3 2006/06/29 17:22:02 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: OlapEventAction.hh,v 1.5 2010/10/27 10:29:12 gcosmo Exp $ 28 // GEANT4 tag $Name: examples-V09-03-09 $ 29 29 // 30 30 // … … 59 59 G4int a=0, 60 60 G4LogicalVolume* original=0) : 61 hist1(h1), hist2(h2), v1(p1), v2(p2),axis(a) 61 hist1(h1), hist2(h2), v1(p1), v2(p2),axis(a), 62 originalMother(original) 62 63 {}; 63 64 -
trunk/examples/extended/geometry/olap/include/OlapManager.hh
r1337 r1342 25 25 // 26 26 // 27 // $Id: OlapManager.hh,v 1. 4 2006/06/29 17:22:08 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: OlapManager.hh,v 1.5 2010/10/27 10:25:26 gcosmo Exp $ 28 // GEANT4 tag $Name: examples-V09-03-09 $ 29 29 // 30 30 // … … 89 89 void notifyNewWorld(G4LogicalVolume*); 90 90 void notifyOlaps(const std::vector<OlapInfo*> &); 91 void deRegisterNotification(OlapNotify* n) { ; }91 void deRegisterNotification(OlapNotify*) { ; } 92 92 // FIXME: handle completly different in next redesign! 93 93 std::map<G4LogicalVolume *, G4bool> NoOlapMap; -
trunk/examples/extended/geometry/olap/olapex.cc
r1337 r1342 25 25 // 26 26 // 27 // $Id: olapex.cc,v 1. 4 2010/05/12 20:38:24 allisonExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: olapex.cc,v 1.5 2010/10/27 10:40:21 gcosmo Exp $ 28 // GEANT4 tag $Name: examples-V09-03-09 $ 29 29 // 30 30 // … … 71 71 G4RunManager * runManager = new G4RunManager; 72 72 73 // particle-generator must be the first useraction!!!74 runManager->SetUserAction(new OlapGenerator);75 76 73 // put the user-geometry here 77 74 G4VUserDetectorConstruction * origGeom = new RandomDetector(0); 78 75 OlapDetConstr * olapGeom = new OlapDetConstr(origGeom); 79 76 runManager->SetUserInitialization(olapGeom); 77 80 78 runManager->SetUserInitialization(new OlapPhysicsList); 79 runManager->SetUserAction(new OlapGenerator); 81 80 82 81 // initialize G4 -
trunk/examples/extended/geometry/olap/src/OlapManager.cc
r1337 r1342 25 25 // 26 26 // 27 // $Id: OlapManager.cc,v 1. 3 2006/06/29 17:23:00 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: OlapManager.cc,v 1.4 2010/08/24 07:57:14 gcosmo Exp $ 28 // GEANT4 tag $Name: examples-V09-03-09 $ 29 29 // 30 30 // … … 46 46 #include "OlapEventAction.hh" 47 47 #include "G4GeoNav.hh" 48 #include "G4GeometryTolerance.hh" 48 49 #include "G4RunManager.hh" 49 50 #include "globals.hh" … … 51 52 OlapManager * OlapManager::theInstance = 0; 52 53 53 OlapManager::OlapManager() : 54 olapGenerator(0), delta( kRadTolerance ), 55 eventsPerRun(27), lvPos(0), polyMode(false), 56 interrupt(false) 54 OlapManager::OlapManager() 55 : olapGenerator(0), eventsPerRun(27), lvPos(0), 56 polyMode(false), interrupt(false) 57 57 { 58 58 theMessenger = new OlapManagerMessenger(this); … … 62 62 //G4LogicalVolumeStore::iterator aIt = theLVStore->begin(); 63 63 64 delta = G4GeometryTolerance::GetInstance()->GetAngularTolerance(); 64 65 theRunManager = G4RunManager::GetRunManager(); 65 66 const G4VUserDetectorConstruction * aTmp = -
trunk/examples/extended/geometry/olap/src/OlapManagerMessenger.cc
r1337 r1342 25 25 // 26 26 // 27 // $Id: OlapManagerMessenger.cc,v 1. 3 2006/06/29 17:23:02 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: OlapManagerMessenger.cc,v 1.4 2010/08/24 07:57:14 gcosmo Exp $ 28 // GEANT4 tag $Name: examples-V09-03-09 $ 29 29 // 30 30 // … … 40 40 #include "OlapLogManager.hh" 41 41 42 #include "G4GeometryTolerance.hh" 42 43 #include "G4UIdirectory.hh" 43 44 #include "G4UIcmdWithAString.hh" … … 54 55 55 56 theLogManager = OlapLogManager::GetOlapLogManager(); 57 58 G4double delta = G4GeometryTolerance::GetInstance()->GetAngularTolerance(); 56 59 57 60 theOlapDir = new G4UIdirectory("/olap/"); … … 78 81 theDeltaCmd = new G4UIcmdWithADoubleAndUnit("/olap/delta",this); 79 82 theDeltaCmd->SetGuidance("set boundary tolerance for overlaps in units of length"); 80 theDeltaCmd->SetDefaultValue( kRadTolerance);83 theDeltaCmd->SetDefaultValue(delta); 81 84 theDeltaCmd->SetParameterName("delta",true); 82 85 theDeltaCmd->SetRange("delta>=1.e-9"); // current G4-accuracy -
trunk/examples/extended/geometry/olap/src/OlapPhysicsList.cc
r1337 r1342 25 25 // 26 26 // 27 // $Id: OlapPhysicsList.cc,v 1. 2 2006/06/29 17:23:07 gunterExp $28 // GEANT4 tag $Name: geant4-09-04-beta-01$27 // $Id: OlapPhysicsList.cc,v 1.3 2010/08/16 08:23:55 kurasige Exp $ 28 // GEANT4 tag $Name: examples-V09-03-09 $ 29 29 // 30 30 // … … 39 39 40 40 #include "G4ios.hh" 41 #include "G4ParticleDefinition.hh"42 #include "G4ParticleWithCuts.hh"43 41 #include "G4ProcessManager.hh" 44 42 #include "G4ProcessVector.hh"
Note: See TracChangeset
for help on using the changeset viewer.