| 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 // G4LogicalSkinSurface Implementation 26 // G4LogicalSkinSurface Implementation
27 // 27 //
28 // A Logical Surface class for the surface sur 28 // A Logical Surface class for the surface surrounding a single
29 // logical volume. 29 // logical volume.
30 // 30 //
31 // Author: John Apostolakis, CERN - 26-06-1997 31 // Author: John Apostolakis, CERN - 26-06-1997
32 // ------------------------------------------- 32 // --------------------------------------------------------------------
33 33
34 #include "G4LogicalSkinSurface.hh" 34 #include "G4LogicalSkinSurface.hh"
35 #include "G4LogicalVolume.hh" 35 #include "G4LogicalVolume.hh"
36 36
37 G4LogicalSkinSurfaceTable *G4LogicalSkinSurfac 37 G4LogicalSkinSurfaceTable *G4LogicalSkinSurface::theSkinSurfaceTable = nullptr;
38 38
39 // ------------------------------------------- 39 // --------------------------------------------------------------------
40 // Constructor 40 // Constructor
41 // 41 //
42 G4LogicalSkinSurface::G4LogicalSkinSurface(con 42 G4LogicalSkinSurface::G4LogicalSkinSurface(const G4String& name,
43 G4L 43 G4LogicalVolume* logicalVolume,
44 G4S 44 G4SurfaceProperty* surfaceProperty)
45 : G4LogicalSurface(name, surfaceProperty), 45 : G4LogicalSurface(name, surfaceProperty),
46 LogVolume(logicalVolume) 46 LogVolume(logicalVolume)
47 { 47 {
48 if (theSkinSurfaceTable == nullptr) 48 if (theSkinSurfaceTable == nullptr)
49 { 49 {
50 theSkinSurfaceTable = new G4LogicalSkinSur 50 theSkinSurfaceTable = new G4LogicalSkinSurfaceTable;
51 } 51 }
52 // Store in the table of Surfaces 52 // Store in the table of Surfaces
53 // 53 //
54 theSkinSurfaceTable->insert(std::make_pair(l << 54 theSkinSurfaceTable->push_back(this);
55 } 55 }
56 56
57 // ------------------------------------------- 57 // --------------------------------------------------------------------
58 // Default destructor 58 // Default destructor
59 // 59 //
60 G4LogicalSkinSurface::~G4LogicalSkinSurface() 60 G4LogicalSkinSurface::~G4LogicalSkinSurface() = default;
61 61
62 // ------------------------------------------- 62 // --------------------------------------------------------------------
63 G4bool 63 G4bool
64 G4LogicalSkinSurface::operator==(const G4Logic 64 G4LogicalSkinSurface::operator==(const G4LogicalSkinSurface& right) const
65 { 65 {
66 return (this == (G4LogicalSkinSurface *) &ri 66 return (this == (G4LogicalSkinSurface *) &right);
67 } 67 }
68 68
69 // ------------------------------------------- 69 // --------------------------------------------------------------------
70 G4bool 70 G4bool
71 G4LogicalSkinSurface::operator!=(const G4Logic 71 G4LogicalSkinSurface::operator!=(const G4LogicalSkinSurface& right) const
72 { 72 {
73 return (this != (G4LogicalSkinSurface *) &ri 73 return (this != (G4LogicalSkinSurface *) &right);
74 } 74 }
75 75
76 // ------------------------------------------- 76 // --------------------------------------------------------------------
77 const G4LogicalSkinSurfaceTable* G4LogicalSkin 77 const G4LogicalSkinSurfaceTable* G4LogicalSkinSurface::GetSurfaceTable()
78 { 78 {
79 if (theSkinSurfaceTable == nullptr) 79 if (theSkinSurfaceTable == nullptr)
80 { 80 {
81 theSkinSurfaceTable = new G4LogicalSkinSur 81 theSkinSurfaceTable = new G4LogicalSkinSurfaceTable;
82 } 82 }
83 return theSkinSurfaceTable; 83 return theSkinSurfaceTable;
84 } 84 }
85 85
86 // ------------------------------------------- 86 // --------------------------------------------------------------------
87 size_t G4LogicalSkinSurface::GetNumberOfSkinSu 87 size_t G4LogicalSkinSurface::GetNumberOfSkinSurfaces()
88 { 88 {
89 if (theSkinSurfaceTable != nullptr) 89 if (theSkinSurfaceTable != nullptr)
90 { 90 {
91 return theSkinSurfaceTable->size(); 91 return theSkinSurfaceTable->size();
92 } 92 }
93 return 0; 93 return 0;
94 } 94 }
95 95
96 // ------------------------------------------- 96 // --------------------------------------------------------------------
97 G4LogicalSkinSurface* 97 G4LogicalSkinSurface*
98 G4LogicalSkinSurface::GetSurface(const G4Logic 98 G4LogicalSkinSurface::GetSurface(const G4LogicalVolume* vol)
99 { 99 {
100 if (theSkinSurfaceTable != nullptr) 100 if (theSkinSurfaceTable != nullptr)
101 { 101 {
102 auto pos = theSkinSurfaceTable->find(vol); << 102 for(auto pos : *theSkinSurfaceTable)
103 if(pos != theSkinSurfaceTable->cend()) ret << 103 {
>> 104 if (pos->GetLogicalVolume() == vol) { return pos; }
>> 105 }
104 } 106 }
105 return nullptr; 107 return nullptr;
106 } 108 }
107 109
108 // ------------------------------------------- 110 // --------------------------------------------------------------------
109 // Dump info for known surfaces 111 // Dump info for known surfaces
110 // 112 //
111 void G4LogicalSkinSurface::DumpInfo() 113 void G4LogicalSkinSurface::DumpInfo()
112 { 114 {
113 G4cout << "***** Skin Surface Table : Nb of 115 G4cout << "***** Skin Surface Table : Nb of Surfaces = "
114 << GetNumberOfSkinSurfaces() << " *** 116 << GetNumberOfSkinSurfaces() << " *****" << G4endl;
115 117
116 if (theSkinSurfaceTable != nullptr) 118 if (theSkinSurfaceTable != nullptr)
117 { 119 {
118 for(const auto & pos : *theSkinSurfaceTabl << 120 for(auto pos : *theSkinSurfaceTable)
119 { 121 {
120 G4LogicalSkinSurface* pSurf = pos.second << 122 G4cout << pos->GetName() << " : " << G4endl
121 G4cout << pSurf->GetName() << " : " << G <<
122 << " Skin of logical volume " 123 << " Skin of logical volume "
123 << pSurf->GetLogicalVolume()->Get << 124 << pos->GetLogicalVolume()->GetName()
124 << G4endl; 125 << G4endl;
125 } 126 }
126 } 127 }
127 G4cout << G4endl; 128 G4cout << G4endl;
128 } 129 }
129 130
130 // ------------------------------------------- 131 // --------------------------------------------------------------------
131 void G4LogicalSkinSurface::CleanSurfaceTable() 132 void G4LogicalSkinSurface::CleanSurfaceTable()
132 { 133 {
133 if (theSkinSurfaceTable != nullptr) 134 if (theSkinSurfaceTable != nullptr)
134 { 135 {
135 for(const auto & pos : *theSkinSurfaceTabl << 136 for(auto pos : *theSkinSurfaceTable)
136 { 137 {
137 delete pos.second; << 138 if (pos != nullptr) { delete pos; }
138 } 139 }
139 theSkinSurfaceTable->clear(); 140 theSkinSurfaceTable->clear();
140 } 141 }
141 return; 142 return;
142 } 143 }
143 144