- Timestamp:
- Dec 22, 2010, 3:52:27 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/geometry/navigation/src/G4TransportationManager.cc
r1337 r1347 25 25 // 26 26 // 27 // $Id: G4TransportationManager.cc,v 1.1 5 2007/04/12 11:51:48 vnivanchExp $28 // GEANT4 tag $Name: geant4-09-04- beta-01$27 // $Id: G4TransportationManager.cc,v 1.16 2010/07/13 15:59:42 gcosmo Exp $ 28 // GEANT4 tag $Name: geant4-09-04-ref-00 $ 29 29 // 30 30 // … … 56 56 G4TransportationManager::G4TransportationManager() 57 57 { 58 if (!fTransportationManager) 59 { 60 // Create the navigator for tracking and activate it; add to collections 61 // 62 G4Navigator* trackingNavigator = new G4Navigator(); 63 trackingNavigator->Activate(true); 64 fNavigators.push_back(trackingNavigator); 65 fActiveNavigators.push_back(trackingNavigator); 66 fWorlds.push_back(trackingNavigator->GetWorldVolume()); // NULL registered 67 68 fGeomMessenger = new G4GeometryMessenger(this); 69 fFieldManager = new G4FieldManager(); 70 fPropagatorInField = new G4PropagatorInField(trackingNavigator, 71 fFieldManager); 72 fSafetyHelper = new G4SafetyHelper(); 73 } 74 else 58 if (fTransportationManager) 75 59 { 76 60 G4cerr << "Only ONE instance of G4TransportationManager is allowed!" … … 80 64 "Only ONE instance of G4TransportationManager is allowed!"); 81 65 } 66 67 // Create the navigator for tracking and activate it; add to collections 68 // 69 G4Navigator* trackingNavigator = new G4Navigator(); 70 trackingNavigator->Activate(true); 71 fNavigators.push_back(trackingNavigator); 72 fActiveNavigators.push_back(trackingNavigator); 73 fWorlds.push_back(trackingNavigator->GetWorldVolume()); // NULL registered 74 75 fGeomMessenger = new G4GeometryMessenger(this); 76 fFieldManager = new G4FieldManager(); 77 fPropagatorInField= new G4PropagatorInField(trackingNavigator,fFieldManager); 78 fSafetyHelper = new G4SafetyHelper(); 82 79 } 83 80 … … 329 326 std::vector<G4Navigator*>::iterator pNav = 330 327 std::find(fNavigators.begin(), fNavigators.end(), aNavigator); 331 if (pNav == fNavigators.end()) 328 if (pNav != fNavigators.end()) 329 { 330 (*pNav)->Activate(false); 331 } 332 else 332 333 { 333 334 G4String message … … 337 338 "NoEffect", JustWarning, message); 338 339 } 339 else 340 { 341 (*pNav)->Activate(false); 342 } 340 343 341 std::vector<G4Navigator*>::iterator pActiveNav = 344 342 std::find(fActiveNavigators.begin(), fActiveNavigators.end(), aNavigator);
Note: See TracChangeset
for help on using the changeset viewer.