| 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 // G4DCofThisEvent << 26 //
27 // ------------------------------------------- << 27 //
28 28
29 #include "G4DCofThisEvent.hh" 29 #include "G4DCofThisEvent.hh"
30 <<
31 #include <algorithm> 30 #include <algorithm>
32 31
33 G4Allocator<G4DCofThisEvent>*& anDCoTHAllocato 32 G4Allocator<G4DCofThisEvent>*& anDCoTHAllocator_G4MT_TLS_()
34 { 33 {
35 G4ThreadLocalStatic G4Allocator<G4DCofThisEv << 34 G4ThreadLocalStatic G4Allocator<G4DCofThisEvent>* _instance = nullptr;
36 return _instance; << 35 return _instance;
37 } 36 }
38 37
39 G4DCofThisEvent::G4DCofThisEvent() { DC = new << 38 G4DCofThisEvent::G4DCofThisEvent()
>> 39 { if (!anDCoTHAllocator_G4MT_TLS_()) anDCoTHAllocator_G4MT_TLS_() = new G4Allocator<G4DCofThisEvent> ;
>> 40 DC = new std::vector<G4VDigiCollection*>;
>> 41 }
40 42
41 G4DCofThisEvent::G4DCofThisEvent(G4int cap) 43 G4DCofThisEvent::G4DCofThisEvent(G4int cap)
42 { << 44 { if (!anDCoTHAllocator_G4MT_TLS_()) anDCoTHAllocator_G4MT_TLS_() = new G4Allocator<G4DCofThisEvent> ;
43 DC = new std::vector<G4VDigiCollection*>(cap << 45 DC = new std::vector<G4VDigiCollection*>;
>> 46 for(G4int i=0;i<cap;i++)
>> 47 {
>> 48 DC->push_back((G4VDigiCollection*)0);
>> 49 }
44 } 50 }
45 51
46 G4DCofThisEvent::~G4DCofThisEvent() 52 G4DCofThisEvent::~G4DCofThisEvent()
47 { << 53 { if (!anDCoTHAllocator_G4MT_TLS_()) anDCoTHAllocator_G4MT_TLS_() = new G4Allocator<G4DCofThisEvent> ;
48 for (const G4VDigiCollection* d : *DC) { << 54 //DC->clearAndDestroy();
49 delete d; << 55 for(size_t i=0;i<DC->size();i++)
50 } << 56 { delete (*DC)[i]; }
>> 57 DC->clear();
51 delete DC; 58 delete DC;
52 } 59 }
53 60
54 void G4DCofThisEvent::AddDigiCollection(G4int << 61 void G4DCofThisEvent::AddDigiCollection(G4int DCID,G4VDigiCollection * aDC)
55 { << 62 { if (!anDCoTHAllocator_G4MT_TLS_()) anDCoTHAllocator_G4MT_TLS_() = new G4Allocator<G4DCofThisEvent> ;
56 if (DCID >= 0 && DCID < G4int(DC->size())) { << 63 if(DCID>=0 && DCID<G4int(DC->size()))
57 (*DC)[DCID] = aDC; << 64 { (*DC)[DCID] = aDC; }
58 } <<
59 } 65 }
60 66
61 G4DCofThisEvent::G4DCofThisEvent(const G4DCofT 67 G4DCofThisEvent::G4DCofThisEvent(const G4DCofThisEvent& rhs)
62 { 68 {
63 DC = new std::vector<G4VDigiCollection*>(rhs << 69 if ( !anDCoTHAllocator_G4MT_TLS_() ) anDCoTHAllocator_G4MT_TLS_() = new G4Allocator<G4DCofThisEvent>;
64 for (unsigned int i = 0; i < rhs.DC->size(); << 70 DC = new std::vector<G4VDigiCollection*>(rhs.DC->size());
65 *(DC->at(i)) = *(rhs.DC->at(i)); << 71 for ( unsigned int i = 0 ; i < rhs.DC->size() ; ++i )
>> 72 *(DC->at(i)) = *(rhs.DC->at(i));
66 } 73 }
67 74
68 G4DCofThisEvent& G4DCofThisEvent::operator=(co 75 G4DCofThisEvent& G4DCofThisEvent::operator=(const G4DCofThisEvent& rhs)
69 { 76 {
70 if (this == &rhs) return *this; << 77 if ( this == &rhs ) return *this;
71 << 78 if ( !anDCoTHAllocator_G4MT_TLS_() ) anDCoTHAllocator_G4MT_TLS_() = new G4Allocator<G4DCofThisEvent>;
72 for (const G4VDigiCollection* d : *DC) { << 79 for ( std::vector<G4VDigiCollection*>::const_iterator it = DC->begin() ;
73 delete d; << 80 it != DC->end() ; ++it )
74 } << 81 {
75 DC->resize(rhs.DC->size()); << 82 delete *it;
76 for (unsigned int i = 0; i < rhs.DC->size(); << 83 }
77 *(DC->at(i)) = *(rhs.DC->at(i)); << 84 DC->resize(rhs.DC->size());
78 return *this; << 85 for ( unsigned int i = 0 ; i < rhs.DC->size() ; ++i )
>> 86 *(DC->at(i)) = *(rhs.DC->at(i));
>> 87 return *this;
79 } 88 }
>> 89
80 90