| 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 // $Id: G4DCofThisEvent.cc,v 1.4 2006/06/29 18:06:22 gunter Exp $
>> 28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
>> 29 //
28 30
29 #include "G4DCofThisEvent.hh" 31 #include "G4DCofThisEvent.hh"
30 32
31 #include <algorithm> << 33 G4Allocator<G4DCofThisEvent> anDCoTHAllocator;
32 34
33 G4Allocator<G4DCofThisEvent>*& anDCoTHAllocato << 35 G4DCofThisEvent::G4DCofThisEvent()
34 { 36 {
35 G4ThreadLocalStatic G4Allocator<G4DCofThisEv << 37 DC = new std::vector<G4VDigiCollection*>;
36 return _instance; <<
37 } 38 }
38 39
39 G4DCofThisEvent::G4DCofThisEvent() { DC = new <<
40 <<
41 G4DCofThisEvent::G4DCofThisEvent(G4int cap) 40 G4DCofThisEvent::G4DCofThisEvent(G4int cap)
42 { 41 {
43 DC = new std::vector<G4VDigiCollection*>(cap << 42 DC = new std::vector<G4VDigiCollection*>;
>> 43 for(G4int i=0;i<cap;i++)
>> 44 {
>> 45 DC->push_back((G4VDigiCollection*)0);
>> 46 }
44 } 47 }
45 48
46 G4DCofThisEvent::~G4DCofThisEvent() 49 G4DCofThisEvent::~G4DCofThisEvent()
47 { 50 {
48 for (const G4VDigiCollection* d : *DC) { << 51 //DC->clearAndDestroy();
49 delete d; << 52 for(size_t i=0;i<DC->size();i++)
50 } << 53 { delete (*DC)[i]; }
>> 54 DC->clear();
51 delete DC; 55 delete DC;
52 } 56 }
53 57
54 void G4DCofThisEvent::AddDigiCollection(G4int << 58 void G4DCofThisEvent::AddDigiCollection(G4int DCID,G4VDigiCollection * aDC)
55 { 59 {
56 if (DCID >= 0 && DCID < G4int(DC->size())) { << 60 if(DCID>=0 && DCID<G4int(DC->size()))
57 (*DC)[DCID] = aDC; << 61 { (*DC)[DCID] = aDC; }
58 } <<
59 } 62 }
60 63
61 G4DCofThisEvent::G4DCofThisEvent(const G4DCofT <<
62 { <<
63 DC = new std::vector<G4VDigiCollection*>(rhs <<
64 for (unsigned int i = 0; i < rhs.DC->size(); <<
65 *(DC->at(i)) = *(rhs.DC->at(i)); <<
66 } <<
67 <<
68 G4DCofThisEvent& G4DCofThisEvent::operator=(co <<
69 { <<
70 if (this == &rhs) return *this; <<
71 <<
72 for (const G4VDigiCollection* d : *DC) { <<
73 delete d; <<
74 } <<
75 DC->resize(rhs.DC->size()); <<
76 for (unsigned int i = 0; i < rhs.DC->size(); <<
77 *(DC->at(i)) = *(rhs.DC->at(i)); <<
78 return *this; <<
79 } <<
80 64