| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
>> 26 // $Id: G4AllITFinder.cc 80074 2014-04-01 13:35:04Z matkara $
26 // 27 //
27 // Author: Mathieu Karamitros (kara (AT) cenbg 28 // Author: Mathieu Karamitros (kara (AT) cenbg . in2p3 . fr)
28 // 29 //
29 // History: 30 // History:
30 // ----------- 31 // -----------
31 // 10 Oct 2011 M.Karamitros created 32 // 10 Oct 2011 M.Karamitros created
32 // 33 //
33 // ------------------------------------------- 34 // -------------------------------------------------------------------
34 35
35 #include "G4ITFinder.hh" 36 #include "G4ITFinder.hh"
36 37
37 using namespace std; 38 using namespace std;
38 39
39 G4ThreadLocal G4AllITFinder* G4AllITFinder::fp << 40 G4ThreadLocal G4AllITFinder* G4AllITFinder::fpInstance = 0;
40 41
41 G4AllITFinder::G4AllITFinder() 42 G4AllITFinder::G4AllITFinder()
42 { 43 {
43 fVerbose = 0; 44 fVerbose = 0;
44 } 45 }
45 46
46 G4AllITFinder* G4AllITFinder::Instance() 47 G4AllITFinder* G4AllITFinder::Instance()
47 { 48 {
48 if (fpInstance == nullptr) fpInstance = new << 49 if (!fpInstance) fpInstance = new G4AllITFinder();
49 return fpInstance; 50 return fpInstance;
50 } 51 }
51 52
52 void G4AllITFinder::DeleteInstance() 53 void G4AllITFinder::DeleteInstance()
53 { 54 {
54 if (fpInstance != nullptr) << 55 if (fpInstance)
55 { 56 {
56 delete fpInstance; 57 delete fpInstance;
57 fpInstance = nullptr; << 58 fpInstance = 0;
58 } 59 }
59 } 60 }
60 61
61 G4AllITFinder::~G4AllITFinder() 62 G4AllITFinder::~G4AllITFinder()
62 { 63 {
63 std::map<G4ITType, G4VITFinder*>::iterator i 64 std::map<G4ITType, G4VITFinder*>::iterator it;
64 std::map<G4ITType, G4VITFinder*>::iterator i 65 std::map<G4ITType, G4VITFinder*>::iterator it_tmp;
65 66
66 for (it = fITSubManager.begin(); it != fITSu 67 for (it = fITSubManager.begin(); it != fITSubManager.end();)
67 { 68 {
68 delete it->second; << 69 if (it->second) delete it->second;
69 it_tmp = it; 70 it_tmp = it;
70 it++; 71 it++;
71 fITSubManager.erase(it_tmp); 72 fITSubManager.erase(it_tmp);
72 } 73 }
73 fpInstance = nullptr; << 74 fpInstance = 0;
74 } 75 }
75 76
76 void G4AllITFinder::UpdatePositionMap() 77 void G4AllITFinder::UpdatePositionMap()
77 { 78 {
78 auto it = fITSubManager.begin(); << 79 std::map<G4ITType, G4VITFinder*>::iterator it = fITSubManager.begin();
79 80
80 for (; it != fITSubManager.end(); it++) 81 for (; it != fITSubManager.end(); it++)
81 { 82 {
82 it->second->UpdatePositionMap(); 83 it->second->UpdatePositionMap();
83 } 84 }
84 } 85 }
85 86
86 G4VITFinder* G4AllITFinder::GetInstance(G4ITTy 87 G4VITFinder* G4AllITFinder::GetInstance(G4ITType type)
87 { 88 {
88 auto it = fITSubManager.find(type); << 89 map<G4ITType, G4VITFinder*>::iterator it = fITSubManager.find(type);
89 90
90 if (it == fITSubManager.end()) return nullpt << 91 if (it == fITSubManager.end()) return 0;
91 92
92 return it->second; 93 return it->second;
93 } 94 }
94 95
95 void G4AllITFinder::RegisterManager(G4VITFinde 96 void G4AllITFinder::RegisterManager(G4VITFinder* manager)
96 { 97 {
97 fITSubManager[manager->GetITType()] = manage 98 fITSubManager[manager->GetITType()] = manager;
98 } 99 }
99 100
100 void G4AllITFinder::Push(G4Track* track) 101 void G4AllITFinder::Push(G4Track* track)
101 { 102 {
102 fITSubManager[GetIT(track)->GetITType()]->Pu 103 fITSubManager[GetIT(track)->GetITType()]->Push(track);
103 } 104 }
104 105
105 106