| 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 // $Id$
27 // 28 //
28 // by I.Hrivnacova, 27 Sep 99 29 // by I.Hrivnacova, 27 Sep 99
29 30
30 #include "G3MatTable.hh" 31 #include "G3MatTable.hh"
31 32
32 G3MatTable::G3MatTable() 33 G3MatTable::G3MatTable()
33 { 34 {
34 fMatVector = new G3MaterialVector(); 35 fMatVector = new G3MaterialVector();
35 } 36 }
36 37
37 G3MatTable::~G3MatTable() 38 G3MatTable::~G3MatTable()
38 { 39 {
39 Clear(); 40 Clear();
40 delete fMatVector; 41 delete fMatVector;
41 } 42 }
42 43
43 G4Material* G3MatTable::get(G4int id) const 44 G4Material* G3MatTable::get(G4int id) const
44 { 45 {
45 for (size_t i=0; i< fMatVector->size(); i++) 46 for (size_t i=0; i< fMatVector->size(); i++) {
46 G3MatTableEntry* mte = (*fMatVector)[i]; 47 G3MatTableEntry* mte = (*fMatVector)[i];
47 if (id == mte->GetID()) return mte->GetMat 48 if (id == mte->GetID()) return mte->GetMaterial();
48 } 49 }
49 return 0; 50 return 0;
50 } 51 }
51 52
52 void G3MatTable::put(G4int id, G4Material* mat 53 void G3MatTable::put(G4int id, G4Material* material)
53 { 54 {
54 G3MatTableEntry* mte = new G3MatTableEntry(i 55 G3MatTableEntry* mte = new G3MatTableEntry(id, material);
55 fMatVector->push_back(mte); 56 fMatVector->push_back(mte);
56 } 57 }
57 58
58 void G3MatTable::Clear() 59 void G3MatTable::Clear()
59 { 60 {
60 G3MatTableEntry* a; 61 G3MatTableEntry* a;
61 while (fMatVector->size()>0) { 62 while (fMatVector->size()>0) {
62 a = fMatVector->back(); 63 a = fMatVector->back();
63 fMatVector->pop_back(); 64 fMatVector->pop_back();
64 for (G3MaterialVector::iterator i=fMatVect 65 for (G3MaterialVector::iterator i=fMatVector->begin();
65 i!=fMatVec 66 i!=fMatVector->end();){
66 if (*i==a) { 67 if (*i==a) {
67 i = fMatVector->erase(i); 68 i = fMatVector->erase(i);
68 } 69 }
69 else { 70 else {
70 ++i; 71 ++i;
71 } 72 }
72 } 73 }
73 if ( a ) delete a; 74 if ( a ) delete a;
74 } 75 }
75 } 76 }
76 77