| 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 //
>> 26 //
>> 27 // $Id: G4AssemblyVolume.cc,v 1.10 2006/06/29 18:57:50 gunter Exp $
>> 28 // GEANT4 tag $Name: geant4-09-00 $
>> 29 //
25 // 30 //
26 // Class G4AssemblyVolume - implementation 31 // Class G4AssemblyVolume - implementation
27 // 32 //
28 // Author: Radovan Chytracek, CERN - November << 33 // ----------------------------------------------------------------------
29 // ------------------------------------------- <<
30 34
31 #include "G4AssemblyVolume.hh" 35 #include "G4AssemblyVolume.hh"
32 #include "G4AssemblyStore.hh" <<
33 #include "G4PVPlacement.hh" 36 #include "G4PVPlacement.hh"
34 #include "G4RotationMatrix.hh" 37 #include "G4RotationMatrix.hh"
35 #include "G4AffineTransform.hh" 38 #include "G4AffineTransform.hh"
36 #include "G4LogicalVolume.hh" 39 #include "G4LogicalVolume.hh"
37 #include "G4VPhysicalVolume.hh" 40 #include "G4VPhysicalVolume.hh"
38 #include "G4ReflectionFactory.hh" 41 #include "G4ReflectionFactory.hh"
39 42
40 #include <sstream> 43 #include <sstream>
41 44
42 G4ThreadLocal unsigned int G4AssemblyVolume::f << 45 unsigned int G4AssemblyVolume::fsInstanceCounter = 0;
43 46
44 // ------------------------------------------- <<
45 // Default constructor 47 // Default constructor
46 // 48 //
47 G4AssemblyVolume::G4AssemblyVolume() 49 G4AssemblyVolume::G4AssemblyVolume()
>> 50 : fAssemblyID( 0 )
48 { 51 {
49 InstanceCountPlus(); 52 InstanceCountPlus();
50 SetAssemblyID( GetInstanceCount() ); 53 SetAssemblyID( GetInstanceCount() );
51 SetImprintsCount( 0 ); 54 SetImprintsCount( 0 );
52 G4AssemblyStore* aStore = G4AssemblyStore::G <<
53 if (aStore->GetAssembly(fAssemblyID,false) ! <<
54 { <<
55 std::ostringstream message; <<
56 message << "The assembly has NOT been regi <<
57 << " Assembly " << fAssem <<
58 << " already existing in store !" <<
59 G4Exception("G4AssemblyVolume::G4AssemblyV <<
60 JustWarning, message); <<
61 } <<
62 else <<
63 { <<
64 aStore->Register(this); <<
65 } <<
66 } 55 }
67 56
68 // ------------------------------------------- <<
69 // Composing constructor <<
70 // <<
71 G4AssemblyVolume::G4AssemblyVolume( G4LogicalV <<
72 G4ThreeVec <<
73 G4Rotation <<
74 { <<
75 InstanceCountPlus(); <<
76 SetAssemblyID( GetInstanceCount() ); <<
77 SetImprintsCount( 0 ); <<
78 AddPlacedVolume(volume, translation, rotatio <<
79 G4AssemblyStore* aStore = G4AssemblyStore::G <<
80 if (aStore->GetAssembly(fAssemblyID,false) ! <<
81 { <<
82 std::ostringstream message; <<
83 message << "The assembly has NOT been regi <<
84 << " Assembly " << fAssem <<
85 << " already existing in store !" <<
86 G4Exception("G4Assembly::G4Assembly()", "G <<
87 JustWarning, message); <<
88 } <<
89 else <<
90 { <<
91 aStore->Register(this); <<
92 } <<
93 } <<
94 <<
95 // ------------------------------------------- <<
96 // Destructor 57 // Destructor
97 // 58 //
98 G4AssemblyVolume::~G4AssemblyVolume() 59 G4AssemblyVolume::~G4AssemblyVolume()
99 { 60 {
100 std::size_t howmany = fTriplets.size(); << 61 unsigned int howmany = fTriplets.size();
101 if( howmany != 0 ) 62 if( howmany != 0 )
102 { 63 {
103 for( std::size_t i = 0; i < howmany; ++i ) << 64 for( unsigned int i = 0; i < howmany; i++ )
104 { 65 {
105 G4RotationMatrix* pRotToClean = fTriplet 66 G4RotationMatrix* pRotToClean = fTriplets[i].GetRotation();
106 delete pRotToClean; << 67 if( pRotToClean != 0 )
>> 68 {
>> 69 delete pRotToClean;
>> 70 }
107 } 71 }
108 } 72 }
109 fTriplets.clear(); 73 fTriplets.clear();
110 74
111 // No need to delete physical volumes, as th << 75 howmany = fPVStore.size();
112 // by physical-volumes store. << 76 if( howmany != 0 )
113 // << 77 {
>> 78 for( unsigned int j = 0; j < howmany; j++ )
>> 79 {
>> 80 G4RotationMatrix* pRotToClean = fPVStore[j]->GetRotation();
>> 81 if( pRotToClean != 0 )
>> 82 {
>> 83 delete pRotToClean;
>> 84 }
>> 85 delete fPVStore[j];
>> 86 }
>> 87 }
114 fPVStore.clear(); 88 fPVStore.clear();
115 InstanceCountMinus(); 89 InstanceCountMinus();
116 G4AssemblyStore::GetInstance()->DeRegister(t <<
117 } 90 }
118 91
119 // ------------------------------------------- <<
120 // Add and place the given volume according to 92 // Add and place the given volume according to the specified
121 // translation and rotation. 93 // translation and rotation.
122 // 94 //
123 // The rotation matrix passed in can be 0 = id 95 // The rotation matrix passed in can be 0 = identity or an address even of an
124 // object on the upper stack frame. During ass 96 // object on the upper stack frame. During assembly imprint, it creates anyway
125 // a new matrix and keeps track of it so it ca 97 // a new matrix and keeps track of it so it can delete it later at destruction
126 // time. 98 // time.
127 // This policy has been adopted since user has 99 // This policy has been adopted since user has no control on the way the
128 // rotations are combined. 100 // rotations are combined.
129 // 101 //
130 void G4AssemblyVolume::AddPlacedVolume( G4Logi 102 void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume* pVolume,
131 G4Thre 103 G4ThreeVector& translation,
132 G4Rota 104 G4RotationMatrix* pRotation )
133 { 105 {
134 auto toStore = new G4RotationMatrix; << 106 G4RotationMatrix* toStore = new G4RotationMatrix;
135 107
136 if( pRotation != nullptr ) { *toStore = *pR << 108 if( pRotation != 0 ) { *toStore = *pRotation; }
137 109
138 G4AssemblyTriplet toAdd( pVolume, translatio 110 G4AssemblyTriplet toAdd( pVolume, translation, toStore );
139 fTriplets.push_back( toAdd ); 111 fTriplets.push_back( toAdd );
140 } 112 }
141 113
142 // ------------------------------------------- <<
143 // Add and place the given volume according to 114 // Add and place the given volume according to the specified transformation
144 // 115 //
145 void G4AssemblyVolume::AddPlacedVolume( G4Logi 116 void G4AssemblyVolume::AddPlacedVolume( G4LogicalVolume* pVolume,
146 G4Tran 117 G4Transform3D& transformation )
147 { 118 {
148 // Decompose transformation 119 // Decompose transformation
149 G4Scale3D scale; 120 G4Scale3D scale;
150 G4Rotate3D rotation; 121 G4Rotate3D rotation;
151 G4Translate3D translation; 122 G4Translate3D translation;
152 transformation.getDecomposition(scale, rotat 123 transformation.getDecomposition(scale, rotation, translation);
153 124
154 G4ThreeVector v = translation.getTranslation << 125 G4ThreeVector v = translation.getTranslation();
155 auto r = new G4RotationMatrix; << 126 G4RotationMatrix* r = new G4RotationMatrix;
156 *r = rotation.getRotation(); << 127 *r = rotation.getRotation();
157 128
158 G4bool isReflection = false; 129 G4bool isReflection = false;
159 if (scale(0,0)*scale(1,1)*scale(2,2) < 0.) 130 if (scale(0,0)*scale(1,1)*scale(2,2) < 0.) { isReflection = true; }
160 131
161 G4AssemblyTriplet toAdd( pVolume, v, r, isRe 132 G4AssemblyTriplet toAdd( pVolume, v, r, isReflection );
162 fTriplets.push_back( toAdd ); 133 fTriplets.push_back( toAdd );
163 } 134 }
164 135
165 // ------------------------------------------- <<
166 // Add and place the given assembly volume acc 136 // Add and place the given assembly volume according to the specified
167 // translation and rotation. 137 // translation and rotation.
168 // 138 //
169 void G4AssemblyVolume::AddPlacedAssembly( G4As 139 void G4AssemblyVolume::AddPlacedAssembly( G4AssemblyVolume* pAssembly,
170 G4Th 140 G4ThreeVector& translation,
171 G4Ro 141 G4RotationMatrix* pRotation )
172 { 142 {
173 auto toStore = new G4RotationMatrix; << 143 G4RotationMatrix* toStore = new G4RotationMatrix;
174 144
175 if( pRotation != nullptr ) { *toStore = *pR << 145 if( pRotation != 0 ) { *toStore = *pRotation; }
176 146
177 G4AssemblyTriplet toAdd( pAssembly, translat 147 G4AssemblyTriplet toAdd( pAssembly, translation, toStore );
178 fTriplets.push_back( toAdd ); 148 fTriplets.push_back( toAdd );
179 } 149 }
180 150
181 // ------------------------------------------- <<
182 // Add and place the given assembly volume acc 151 // Add and place the given assembly volume according to the specified
183 // transformation 152 // transformation
184 // 153 //
185 void G4AssemblyVolume::AddPlacedAssembly( G4As 154 void G4AssemblyVolume::AddPlacedAssembly( G4AssemblyVolume* pAssembly,
186 G4Tr 155 G4Transform3D& transformation )
187 { 156 {
188 // Decompose transformation 157 // Decompose transformation
189 // 158 //
190 G4Scale3D scale; 159 G4Scale3D scale;
191 G4Rotate3D rotation; 160 G4Rotate3D rotation;
192 G4Translate3D translation; 161 G4Translate3D translation;
193 transformation.getDecomposition(scale, rotat 162 transformation.getDecomposition(scale, rotation, translation);
194 163
195 G4ThreeVector v = translation.getTransl 164 G4ThreeVector v = translation.getTranslation();
196 auto r = new G4RotationMatrix; << 165 G4RotationMatrix* r = new G4RotationMatrix;
197 *r = rotation.getRotation(); << 166 *r = rotation.getRotation();
198 167
199 G4bool isReflection = false; 168 G4bool isReflection = false;
200 if (scale(0,0)*scale(1,1)*scale(2,2) < 0.) 169 if (scale(0,0)*scale(1,1)*scale(2,2) < 0.) { isReflection = true; }
201 170
202 G4AssemblyTriplet toAdd( pAssembly, v, r, is 171 G4AssemblyTriplet toAdd( pAssembly, v, r, isReflection );
203 fTriplets.push_back( toAdd ); 172 fTriplets.push_back( toAdd );
204 } 173 }
205 174
206 // ------------------------------------------- <<
207 // Create an instance of an assembly volume in 175 // Create an instance of an assembly volume inside of the specified
208 // mother volume. This works analogically to m 176 // mother volume. This works analogically to making stamp imprints.
209 // This method makes use of the Geant4 affine 177 // This method makes use of the Geant4 affine transformation class.
210 // The algorithm is defined as follows: 178 // The algorithm is defined as follows:
211 // 179 //
212 // Having rotation matrix Rm and translation v 180 // Having rotation matrix Rm and translation vector Tm to be applied
213 // inside the mother and rotation matrix Ra an 181 // inside the mother and rotation matrix Ra and translation vector Ta
214 // to be applied inside the assembly itself fo 182 // to be applied inside the assembly itself for each of the participating
215 // volumes the resulting transformation is 183 // volumes the resulting transformation is
216 // 184 //
217 // Tfinal = Ta * Tm 185 // Tfinal = Ta * Tm
218 // 186 //
219 // where Ta and Tm are constructed as 187 // where Ta and Tm are constructed as
220 // 188 //
221 // -1 189 // -1 -1
222 // Ta = Ra * Ta and Tm = 190 // Ta = Ra * Ta and Tm = Rm * Tm
223 // 191 //
224 // which in words means that we create first t 192 // which in words means that we create first the affine transformations
225 // by inverse rotation matrices and translatio 193 // by inverse rotation matrices and translations for mother and assembly.
226 // The resulting final transformation to be ap 194 // The resulting final transformation to be applied to each of the
227 // participating volumes is their product. 195 // participating volumes is their product.
228 // 196 //
229 // IMPORTANT NOTE! 197 // IMPORTANT NOTE!
230 // The order of multiplication is reversed whe 198 // The order of multiplication is reversed when comparing to CLHEP 3D
231 // transformation matrix(G4Transform3D class). 199 // transformation matrix(G4Transform3D class).
232 // 200 //
233 // The rotation matrix passed in can be 0 = id 201 // The rotation matrix passed in can be 0 = identity or an address even of an
234 // object on the upper stack frame. During ass 202 // object on the upper stack frame. During assembly imprint, it creates anyway
235 // a new matrix and keeps track of it so it ca 203 // a new matrix and keeps track of it so it can delete it later at destruction
236 // time. 204 // time.
237 // This policy has been adopted since user has 205 // This policy has been adopted since user has no control on the way the
238 // rotations are combined. 206 // rotations are combined.
239 // 207 //
240 // If the assembly volume contains assembly (a 208 // If the assembly volume contains assembly (a'), the function is called
241 // recursively with composed transformation: 209 // recursively with composed transformation:
242 // 210 //
243 // Tanew = Ta * Ta' 211 // Tanew = Ta * Ta'
244 // 212 //
245 void G4AssemblyVolume::MakeImprint( G4Assembly 213 void G4AssemblyVolume::MakeImprint( G4AssemblyVolume* pAssembly,
246 G4LogicalV 214 G4LogicalVolume* pMotherLV,
247 G4Transfor 215 G4Transform3D& transformation,
248 G4int copy 216 G4int copyNumBase,
249 G4bool sur 217 G4bool surfCheck )
250 { 218 {
251 std::size_t numberOfDaughters; << 219 unsigned int numberOfDaughters;
252 << 220
253 if( copyNumBase == 0 ) 221 if( copyNumBase == 0 )
254 { 222 {
255 numberOfDaughters = pMotherLV->GetNoDaught 223 numberOfDaughters = pMotherLV->GetNoDaughters();
256 } 224 }
257 else 225 else
258 { 226 {
259 numberOfDaughters = copyNumBase; 227 numberOfDaughters = copyNumBase;
260 } 228 }
261 229
262 // We start from the first available index 230 // We start from the first available index
263 // 231 //
264 ++numberOfDaughters; << 232 numberOfDaughters++;
265 233
266 ImprintsCountPlus(); 234 ImprintsCountPlus();
267 235
268 auto triplets = pAssembly->fTriplets; << 236 std::vector<G4AssemblyTriplet> triplets = pAssembly->fTriplets;
269 <<
270 // store the transformation in a container ( <<
271 fImprintsTransf[GetImprintsCount()] = transf <<
272 237
273 for( std::size_t i = 0; i < triplets.size(); << 238 for( unsigned int i = 0; i < triplets.size(); i++ )
274 { 239 {
275 G4Transform3D Ta( *(triplets[i].GetRotatio 240 G4Transform3D Ta( *(triplets[i].GetRotation()),
276 triplets[i].GetTranslati 241 triplets[i].GetTranslation() );
277 if ( triplets[i].IsReflection() ) { Ta = 242 if ( triplets[i].IsReflection() ) { Ta = Ta * G4ReflectZ3D(); }
278 243
279 G4Transform3D Tfinal = transformation * Ta 244 G4Transform3D Tfinal = transformation * Ta;
280 245
281 if ( triplets[i].GetVolume() != nullptr ) << 246 if ( triplets[i].GetVolume() )
282 { 247 {
283 // Generate the unique name for the next 248 // Generate the unique name for the next PV instance
284 // The name has format: 249 // The name has format:
285 // 250 //
286 // av_WWW_impr_XXX_YYY_ZZZ 251 // av_WWW_impr_XXX_YYY_ZZZ
287 // where the fields mean: 252 // where the fields mean:
288 // WWW - assembly volume instance number 253 // WWW - assembly volume instance number
289 // XXX - assembly volume imprint number 254 // XXX - assembly volume imprint number
290 // YYY - the name of a log. volume we wa 255 // YYY - the name of a log. volume we want to make a placement of
291 // ZZZ - the log. volume index inside th 256 // ZZZ - the log. volume index inside the assembly volume
292 // 257 //
293 std::stringstream pvName; 258 std::stringstream pvName;
294 pvName << "av_" 259 pvName << "av_"
295 << GetAssemblyID() 260 << GetAssemblyID()
296 << "_impr_" 261 << "_impr_"
297 << GetImprintsCount() 262 << GetImprintsCount()
298 << "_" 263 << "_"
299 << triplets[i].GetVolume()->GetNa 264 << triplets[i].GetVolume()->GetName().c_str()
300 << "_pv_" 265 << "_pv_"
301 << i 266 << i
302 << std::ends; 267 << std::ends;
303 268
304 // Generate a new physical volume instan 269 // Generate a new physical volume instance inside a mother
305 // (as we allow 3D transformation use G4 270 // (as we allow 3D transformation use G4ReflectionFactory to
306 // take into account eventual reflectio 271 // take into account eventual reflection)
307 // 272 //
308 G4PhysicalVolumesPair pvPlaced 273 G4PhysicalVolumesPair pvPlaced
309 = G4ReflectionFactory::Instance()->Pla 274 = G4ReflectionFactory::Instance()->Place( Tfinal,
310 275 pvName.str().c_str(),
311 276 triplets[i].GetVolume(),
312 277 pMotherLV,
313 278 false,
314 << 279 numberOfDaughters + i,
315 280 surfCheck );
316 281
317 // Register the physical volume created 282 // Register the physical volume created by us so we can delete it later
318 // 283 //
319 fPVStore.push_back( pvPlaced.first ); 284 fPVStore.push_back( pvPlaced.first );
320 if ( pvPlaced.second != nullptr ) { fPV << 285 if ( pvPlaced.second ) { fPVStore.push_back( pvPlaced.second ); }
321 <<
322 // Here I want to save the imprint trans <<
323 // imprintTrans[GetImprintsCount()] = tr <<
324 <<
325 } 286 }
326 else if ( triplets[i].GetAssembly() != nul << 287 else if ( triplets[i].GetAssembly() )
327 { 288 {
328 // Place volumes in this assembly with c 289 // Place volumes in this assembly with composed transformation
329 // 290 //
330 MakeImprint( triplets[i].GetAssembly(), 291 MakeImprint( triplets[i].GetAssembly(), pMotherLV,
331 Tfinal, (G4int)i*100+copyNu << 292 Tfinal, i*100+copyNumBase, surfCheck );
332 } 293 }
333 else 294 else
334 { 295 {
335 G4Exception("G4AssemblyVolume::MakeImpri 296 G4Exception("G4AssemblyVolume::MakeImprint(..)",
336 "GeomVol0003", FatalExceptio << 297 "NotApplicable", FatalException,
337 "Triplet has no volume and n 298 "Triplet has no volume and no assembly");
338 } 299 }
339 } 300 }
340 } 301 }
341 302
342 // ------------------------------------------- <<
343 void G4AssemblyVolume::MakeImprint( G4LogicalV 303 void G4AssemblyVolume::MakeImprint( G4LogicalVolume* pMotherLV,
344 G4ThreeVec 304 G4ThreeVector& translationInMother,
345 G4Rotation 305 G4RotationMatrix* pRotationInMother,
346 G4int copy 306 G4int copyNumBase,
347 G4bool sur 307 G4bool surfCheck )
348 { 308 {
349 // If needed user can specify explicitely th 309 // If needed user can specify explicitely the base count from which to start
350 // off for the generation of phys. vol. copy 310 // off for the generation of phys. vol. copy numbers.
351 // The old behaviour is preserved when copyN 311 // The old behaviour is preserved when copyNumBase == 0, e.g. the generated
352 // copy numbers start from the count equal t 312 // copy numbers start from the count equal to current number of daughter
353 // volumes before an imprint is made 313 // volumes before an imprint is made
354 314
355 // Compose transformation 315 // Compose transformation
356 // 316 //
357 if( pRotationInMother == nullptr ) << 317 if( pRotationInMother == 0 )
358 { 318 {
359 // Make it by default an indentity matrix 319 // Make it by default an indentity matrix
360 // 320 //
361 pRotationInMother = 321 pRotationInMother =
362 const_cast<G4RotationMatrix*>( &G4Rotati 322 const_cast<G4RotationMatrix*>( &G4RotationMatrix::IDENTITY );
363 } 323 }
364 324
365 G4Transform3D transform( *pRotationInMother, 325 G4Transform3D transform( *pRotationInMother,
366 translationInMothe 326 translationInMother );
367 MakeImprint(this, pMotherLV, transform, copy 327 MakeImprint(this, pMotherLV, transform, copyNumBase, surfCheck);
368 } 328 }
369 329
370 // ------------------------------------------- <<
371 void G4AssemblyVolume::MakeImprint( G4LogicalV 330 void G4AssemblyVolume::MakeImprint( G4LogicalVolume* pMotherLV,
372 G4Transfor 331 G4Transform3D& transformation,
373 G4int copy 332 G4int copyNumBase,
374 G4bool sur 333 G4bool surfCheck )
375 { 334 {
376 // If needed user can specify explicitely th 335 // If needed user can specify explicitely the base count from which to start
377 // off for the generation of phys. vol. copy 336 // off for the generation of phys. vol. copy numbers.
378 // The old behaviour is preserved when copyN 337 // The old behaviour is preserved when copyNumBase == 0, e.g. the generated
379 // copy numbers start from the count equal t 338 // copy numbers start from the count equal to current number of daughter
380 // volumes before a imprint is made 339 // volumes before a imprint is made
381 340
382 MakeImprint(this, pMotherLV, transformation, 341 MakeImprint(this, pMotherLV, transformation, copyNumBase, surfCheck);
383 } 342 }
384 343
385 // ------------------------------------------- <<
386 unsigned int G4AssemblyVolume::GetInstanceCoun 344 unsigned int G4AssemblyVolume::GetInstanceCount() const
387 { 345 {
388 return G4AssemblyVolume::fsInstanceCounter; 346 return G4AssemblyVolume::fsInstanceCounter;
389 } 347 }
390 348
391 // ------------------------------------------- << 349 void G4AssemblyVolume::SetInstanceCount( unsigned int value )
392 void G4AssemblyVolume::SetInstanceCount( unsig <<
393 { 350 {
394 G4AssemblyVolume::fsInstanceCounter = value; 351 G4AssemblyVolume::fsInstanceCounter = value;
395 } 352 }
396 353
397 // ------------------------------------------- << 354 void G4AssemblyVolume::InstanceCountPlus()
398 void G4AssemblyVolume::InstanceCountPlus() <<
399 { 355 {
400 G4AssemblyVolume::fsInstanceCounter++; 356 G4AssemblyVolume::fsInstanceCounter++;
401 } 357 }
402 358
403 // ------------------------------------------- << 359 void G4AssemblyVolume::InstanceCountMinus()
404 void G4AssemblyVolume::InstanceCountMinus() <<
405 { 360 {
406 G4AssemblyVolume::fsInstanceCounter--; 361 G4AssemblyVolume::fsInstanceCounter--;
407 } 362 }
408 363