| 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 /* 26 /*
27 * G4ITReactionInfo.cc 27 * G4ITReactionInfo.cc
28 * 28 *
29 * Created on: 1 févr. 2015 29 * Created on: 1 févr. 2015
30 * Author: matkara 30 * Author: matkara
31 */ 31 */
32 32
33 #include <G4ITReaction.hh> 33 #include <G4ITReaction.hh>
34 #include "globals.hh" 34 #include "globals.hh"
35 35
36 //G4ThreadLocal std::set<G4ITReaction*>* G4ITR 36 //G4ThreadLocal std::set<G4ITReaction*>* G4ITReaction::gAll(0);
37 37
38 G4ThreadLocal G4ITReactionSet* G4ITReactionSet << 38 G4ThreadLocal G4ITReactionSet* G4ITReactionSet::fpInstance(0);
39 39
40 G4bool compReactionPerTime::operator()(G4ITRea << 40 bool compReactionPerTime::operator()(G4ITReactionPtr rhs,
41 G4ITReact 41 G4ITReactionPtr lhs) const
42 { 42 {
43 G4double time1 = rhs->GetTime(); << 43 double time1 = rhs->GetTime();
44 G4double time2 = lhs->GetTime(); << 44 double time2 = lhs->GetTime();
45 if (time1 == time2) 45 if (time1 == time2)
46 { 46 {
47 return rhs->GetHash() < lhs->GetHash(); 47 return rhs->GetHash() < lhs->GetHash();
48 } 48 }
49 return rhs->GetTime() < lhs->GetTime(); 49 return rhs->GetTime() < lhs->GetTime();
50 } 50 }
51 51
52 52
53 template<class T> 53 template<class T>
54 inline void hash_combine(std::size_t& seed, 54 inline void hash_combine(std::size_t& seed,
55 const T& v) 55 const T& v)
56 { 56 {
57 // std::hash<T> hasher; 57 // std::hash<T> hasher;
58 seed ^= /*std::hash<T>(v)*/ v + 0x9e3779b9 + 58 seed ^= /*std::hash<T>(v)*/ v + 0x9e3779b9 + (seed << 6) + (seed >> 2);
59 } 59 }
60 60
61 std::size_t G4ITReaction::GetHash() const 61 std::size_t G4ITReaction::GetHash() const
62 { 62 {
63 std::size_t hash = 0; 63 std::size_t hash = 0;
64 hash_combine(hash, fReactants.first->GetTrac 64 hash_combine(hash, fReactants.first->GetTrackID());
65 hash_combine(hash, fReactants.first->GetTrac 65 hash_combine(hash, fReactants.first->GetTrackID());
66 return hash; 66 return hash;
67 } 67 }
68 68
69 G4ITReaction::G4ITReaction(G4double time, G4Tr << 69 G4ITReaction::G4ITReaction(double time, G4Track* trackA, G4Track* trackB) :
70 << 70 G4enable_shared_from_this<G4ITReaction>(),
71 fTime(time), 71 fTime(time),
72 fReactants(trackA,trackB) 72 fReactants(trackA,trackB)
73 { 73 {
74 //if(gAll == 0) gAll = new std::set<G4ITReac 74 //if(gAll == 0) gAll = new std::set<G4ITReaction*>();
75 //gAll->insert(this); 75 //gAll->insert(this);
76 fReactionPerTimeIt = nullptr; << 76
>> 77 fReactionPerTimeIt = 0;
77 } 78 }
78 79
79 G4ITReaction::~G4ITReaction() 80 G4ITReaction::~G4ITReaction()
80 { 81 {
81 //gAll->erase(this); 82 //gAll->erase(this);
82 delete fReactionPerTimeIt; << 83 if(fReactionPerTimeIt) delete fReactionPerTimeIt;
83 } 84 }
84 85
85 void G4ITReaction::RemoveMe() 86 void G4ITReaction::RemoveMe()
86 { 87 {
87 G4ITReactionPtr backMeUp = this->shared_from 88 G4ITReactionPtr backMeUp = this->shared_from_this();
88 for(auto & it : fReactionPerTrack) << 89 for(G4ReactionPerTrackIt::iterator it = fReactionPerTrack.begin() ;
>> 90 it != fReactionPerTrack.end() ; ++it)
89 { 91 {
90 it.first->RemoveThisReaction(it.second); << 92 // G4cout << it->first.get() << G4endl;
>> 93 // assert(it->first.get() != 0);
>> 94 it->first->RemoveThisReaction(it->second);
91 } 95 }
92 fReactionPerTrack.clear(); 96 fReactionPerTrack.clear();
93 97
94 if(fReactionPerTimeIt != nullptr) << 98 if(fReactionPerTimeIt)
95 { 99 {
96 G4ITReactionSet::Instance()->GetReactionsPe 100 G4ITReactionSet::Instance()->GetReactionsPerTime().erase(*fReactionPerTimeIt);
97 delete fReactionPerTimeIt; 101 delete fReactionPerTimeIt;
98 fReactionPerTimeIt = nullptr; << 102 fReactionPerTimeIt = 0;
99 } 103 }
100 } 104 }
101 105
102 G4bool G4ITReactionPerTrack::RemoveThisReactio << 106 bool G4ITReactionPerTrack::RemoveThisReaction(G4ITReactionList::iterator it)
103 { 107 {
>> 108 // G4cout << "G4ITReactionPerTrack::RemoveReaction" << G4endl;
104 fReactions.erase(it); 109 fReactions.erase(it);
105 if(fReactions.empty()) 110 if(fReactions.empty())
106 { 111 {
>> 112 // G4cout << "G4ITReactionPerTrack is empty" << G4endl;
107 G4ITReactionSet::Instance()->RemoveReactio 113 G4ITReactionSet::Instance()->RemoveReactionPerTrack(this->shared_from_this());
108 return true; 114 return true;
109 } 115 }
110 return false; 116 return false;
111 } 117 }
112 118