Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/navigation/src/G4PartialPhantomParameterisation.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /geometry/navigation/src/G4PartialPhantomParameterisation.cc (Version 11.3.0) and /geometry/navigation/src/G4PartialPhantomParameterisation.cc (Version 9.6.p1)


  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 //
                                                   >>  27 // $Id$
                                                   >>  28 //
                                                   >>  29 //
 26 // class G4PartialPhantomParameterisation impl     30 // class G4PartialPhantomParameterisation implementation
 27 //                                                 31 //
 28 // May 2007 Pedro Arce (CIEMAT), first version     32 // May 2007 Pedro Arce (CIEMAT), first version
                                                   >>  33 //
 29 // -------------------------------------------     34 // --------------------------------------------------------------------
 30                                                    35 
 31 #include "G4PartialPhantomParameterisation.hh"     36 #include "G4PartialPhantomParameterisation.hh"
 32                                                    37 
 33 #include "globals.hh"                              38 #include "globals.hh"
 34 #include "G4Material.hh"                           39 #include "G4Material.hh"
 35 #include "G4VSolid.hh"                             40 #include "G4VSolid.hh"
 36 #include "G4VPhysicalVolume.hh"                    41 #include "G4VPhysicalVolume.hh"
 37 #include "G4LogicalVolume.hh"                      42 #include "G4LogicalVolume.hh"
 38 #include "G4VVolumeMaterialScanner.hh"             43 #include "G4VVolumeMaterialScanner.hh"
 39 #include "G4GeometryTolerance.hh"                  44 #include "G4GeometryTolerance.hh"
 40                                                    45 
 41 #include <list>                                    46 #include <list>
 42                                                    47 
 43 //--------------------------------------------     48 //------------------------------------------------------------------
                                                   >>  49 G4PartialPhantomParameterisation::G4PartialPhantomParameterisation()
                                                   >>  50   : G4PhantomParameterisation()
                                                   >>  51 {
                                                   >>  52 }
                                                   >>  53 
                                                   >>  54 
                                                   >>  55 //------------------------------------------------------------------
                                                   >>  56 G4PartialPhantomParameterisation::~G4PartialPhantomParameterisation()
                                                   >>  57 {
                                                   >>  58 }
                                                   >>  59 
                                                   >>  60 //------------------------------------------------------------------
 44 void G4PartialPhantomParameterisation::            61 void G4PartialPhantomParameterisation::
 45 ComputeTransformation( const G4int copyNo, G4V <<  62 ComputeTransformation(const G4int copyNo, G4VPhysicalVolume *physVol ) const
 46 {                                                  63 {
 47   // Voxels cannot be rotated, return translat     64   // Voxels cannot be rotated, return translation
 48   //                                               65   //
 49   G4ThreeVector trans = GetTranslation( copyNo     66   G4ThreeVector trans = GetTranslation( copyNo );
 50   physVol->SetTranslation( trans );                67   physVol->SetTranslation( trans );
 51 }                                                  68 }
 52                                                    69 
 53                                                    70 
 54 //--------------------------------------------     71 //------------------------------------------------------------------
 55 G4ThreeVector G4PartialPhantomParameterisation     72 G4ThreeVector G4PartialPhantomParameterisation::
 56 GetTranslation(const G4int copyNo ) const          73 GetTranslation(const G4int copyNo ) const
 57 {                                                  74 {
 58   CheckCopyNo( copyNo );                           75   CheckCopyNo( copyNo );
 59                                                    76 
 60   std::size_t nx, ny, nz;                      <<  77   size_t nx;
                                                   >>  78   size_t ny;
                                                   >>  79   size_t nz;
 61   ComputeVoxelIndices( copyNo, nx, ny, nz );       80   ComputeVoxelIndices( copyNo, nx, ny, nz );
 62                                                    81 
 63   G4ThreeVector trans( (2*nx+1)*fVoxelHalfX -      82   G4ThreeVector trans( (2*nx+1)*fVoxelHalfX - fContainerWallX,
 64                        (2*ny+1)*fVoxelHalfY -      83                        (2*ny+1)*fVoxelHalfY - fContainerWallY,
 65                        (2*nz+1)*fVoxelHalfZ -      84                        (2*nz+1)*fVoxelHalfZ - fContainerWallZ);
 66   return trans;                                    85   return trans;
 67 }                                                  86 }
 68                                                    87 
 69                                                    88 
 70 //--------------------------------------------     89 //------------------------------------------------------------------
 71 G4Material* G4PartialPhantomParameterisation::     90 G4Material* G4PartialPhantomParameterisation::
 72 ComputeMaterial( const G4int copyNo, G4VPhysic <<  91 ComputeMaterial(const G4int copyNo, G4VPhysicalVolume *, const G4VTouchable *) 
 73 {                                                  92 { 
 74   CheckCopyNo( copyNo );                           93   CheckCopyNo( copyNo );
 75   auto matIndex = GetMaterialIndex(copyNo);    <<  94   size_t matIndex = GetMaterialIndex(copyNo);
 76                                                    95 
 77   return fMaterials[ matIndex ];                   96   return fMaterials[ matIndex ];
 78 }                                                  97 }
 79                                                    98 
 80                                                    99 
 81 //--------------------------------------------    100 //------------------------------------------------------------------
 82 size_t G4PartialPhantomParameterisation::         101 size_t G4PartialPhantomParameterisation::
 83 GetMaterialIndex( std::size_t copyNo ) const   << 102 GetMaterialIndex( size_t copyNo ) const
 84 {                                                 103 {
 85   CheckCopyNo( copyNo );                          104   CheckCopyNo( copyNo );
 86                                                   105 
 87   if( fMaterialIndices == nullptr ) { return 0 << 106   if( !fMaterialIndices ) { return 0; }
 88                                                   107 
 89   return *(fMaterialIndices+copyNo);              108   return *(fMaterialIndices+copyNo);
 90 }                                                 109 }
 91                                                   110 
 92                                                   111 
 93 //--------------------------------------------    112 //------------------------------------------------------------------
 94 size_t G4PartialPhantomParameterisation::         113 size_t G4PartialPhantomParameterisation::
 95 GetMaterialIndex( std::size_t nx, std::size_t  << 114 GetMaterialIndex( size_t nx, size_t ny, size_t nz ) const
 96 {                                                 115 {
 97   std::size_t copyNo = nx + fNoVoxelsX*ny + fN << 116   size_t copyNo = nx + fNoVoxelX*ny + fNoVoxelXY*nz;
 98   return GetMaterialIndex( copyNo );              117   return GetMaterialIndex( copyNo );
 99 }                                                 118 }
100                                                   119 
101                                                   120 
102 //--------------------------------------------    121 //------------------------------------------------------------------
103 G4Material* G4PartialPhantomParameterisation::    122 G4Material* G4PartialPhantomParameterisation::
104 GetMaterial( std::size_t nx, std::size_t ny, s << 123 GetMaterial( size_t nx, size_t ny, size_t nz) const
105 {                                                 124 {
106   return fMaterials[GetMaterialIndex(nx,ny,nz)    125   return fMaterials[GetMaterialIndex(nx,ny,nz)];
107 }                                                 126 }
108                                                   127 
109                                                   128 
110 //--------------------------------------------    129 //------------------------------------------------------------------
111 G4Material* G4PartialPhantomParameterisation::    130 G4Material* G4PartialPhantomParameterisation::
112 GetMaterial( std::size_t copyNo ) const        << 131 GetMaterial( size_t copyNo ) const
113 {                                                 132 {
114   return fMaterials[GetMaterialIndex(copyNo)];    133   return fMaterials[GetMaterialIndex(copyNo)];
115 }                                                 134 }
116                                                   135 
117                                                   136 
118 //--------------------------------------------    137 //------------------------------------------------------------------
119 void G4PartialPhantomParameterisation::           138 void G4PartialPhantomParameterisation::
120 ComputeVoxelIndices(const G4int copyNo, std::s << 139 ComputeVoxelIndices(const G4int copyNo, size_t& nx,
121                           std::size_t& ny, std << 140                             size_t& ny, size_t& nz ) const
122 {                                                 141 {
123   CheckCopyNo( copyNo );                          142   CheckCopyNo( copyNo );
124                                                   143 
125   auto ite = fFilledIDs.lower_bound(copyNo);   << 144   std::multimap<G4int,G4int>::const_iterator ite =
126   G4long dist = std::distance( fFilledIDs.cbeg << 145     fFilledIDs.lower_bound(size_t(copyNo));
127   nz = std::size_t( dist/fNoVoxelsY );         << 146   G4int dist = std::distance( fFilledIDs.begin(), ite );
128   ny = std::size_t( dist%fNoVoxelsY );         << 147   nz = size_t(dist/fNoVoxelY);
                                                   >> 148   ny = size_t( dist%fNoVoxelY );
129                                                   149 
130   G4int ifmin = (*ite).second;                    150   G4int ifmin = (*ite).second;
131   G4int nvoxXprev;                                151   G4int nvoxXprev;
132   if( dist != 0 )                              << 152   if( dist != 0 ) {
133   {                                            << 
134     ite--;                                        153     ite--;
135     nvoxXprev = (*ite).first;                     154     nvoxXprev = (*ite).first;
136   }                                            << 155   } else {
137   else                                         << 
138   {                                            << 
139     nvoxXprev = -1;                               156     nvoxXprev = -1;
140   }                                               157   } 
141                                                   158 
142   nx = ifmin+copyNo-nvoxXprev-1;                  159   nx = ifmin+copyNo-nvoxXprev-1;
143 }                                                 160 }
144                                                   161 
145                                                   162 
146 //--------------------------------------------    163 //------------------------------------------------------------------
147 G4int G4PartialPhantomParameterisation::          164 G4int G4PartialPhantomParameterisation::
148 GetReplicaNo( const G4ThreeVector& localPoint,    165 GetReplicaNo( const G4ThreeVector& localPoint, const G4ThreeVector& localDir )
149 {                                                 166 {
150   // Check the voxel numbers corresponding to     167   // Check the voxel numbers corresponding to localPoint
151   // When a particle is on a surface, it may b    168   // When a particle is on a surface, it may be between -kCarTolerance and
152   // +kCartolerance. By a simple distance as:     169   // +kCartolerance. By a simple distance as:
153   //   G4int nx = G4int( (localPoint.x()+)/fVo    170   //   G4int nx = G4int( (localPoint.x()+)/fVoxelHalfX/2.);
154   // those between -kCartolerance and 0 will b    171   // those between -kCartolerance and 0 will be placed on voxel N-1 and those
155   // between 0 and kCarTolerance on voxel N.      172   // between 0 and kCarTolerance on voxel N.
156   // To avoid precision problems place the tra    173   // To avoid precision problems place the tracks that are on the surface on
157   // voxel N-1 if they have negative direction    174   // voxel N-1 if they have negative direction and on voxel N if they have
158   // positive direction.                          175   // positive direction.
159   // Add +kCarTolerance so that they are first    176   // Add +kCarTolerance so that they are first placed on voxel N, and then
160   // if the direction is negative substract 1     177   // if the direction is negative substract 1
161                                                   178 
162   G4double fx = (localPoint.x()+fContainerWall    179   G4double fx = (localPoint.x()+fContainerWallX+kCarTolerance)/(fVoxelHalfX*2.);
163   auto  nx = G4int(fx);                        << 180   G4int nx = G4int(fx);
164                                                   181 
165   G4double fy = (localPoint.y()+fContainerWall    182   G4double fy = (localPoint.y()+fContainerWallY+kCarTolerance)/(fVoxelHalfY*2.);
166   auto  ny = G4int(fy);                        << 183   G4int ny = G4int(fy);
167                                                   184 
168   G4double fz = (localPoint.z()+fContainerWall    185   G4double fz = (localPoint.z()+fContainerWallZ+kCarTolerance)/(fVoxelHalfZ*2.);
169   auto  nz = G4int(fz);                        << 186   G4int nz = G4int(fz);
170                                                   187 
171   // If it is on the surface side, check the d    188   // If it is on the surface side, check the direction: if direction is
172   // negative place it on the previous voxel (    189   // negative place it on the previous voxel (if direction is positive it is
173   // already in the next voxel...).               190   // already in the next voxel...). 
174   // Correct also cases where n = -1 or n = fN << 191   // Correct also cases where n = -1 or n = fNoVoxel. It is always traced to be
175   // due to multiple scattering: track is ente    192   // due to multiple scattering: track is entering a voxel but multiple
176   // scattering changes the angle towards outs    193   // scattering changes the angle towards outside
177   //                                              194   //
178   if( fx - nx < kCarTolerance/fVoxelHalfX )       195   if( fx - nx < kCarTolerance/fVoxelHalfX )
179   {                                               196   {
180     if( localDir.x() < 0 )                        197     if( localDir.x() < 0 )
181     {                                             198     {
182       if( nx != 0 )                               199       if( nx != 0 )
183       {                                           200       {
184         nx -= 1;                                  201         nx -= 1;
185       }                                           202       }
186     }                                             203     }
187     else                                          204     else
188     {                                             205     {
189       if( nx == G4int(fNoVoxelsX) )            << 206       if( nx == G4int(fNoVoxelX) )  
190       {                                           207       {
191         nx -= 1;                                  208         nx -= 1;       
192       }                                           209       }
193     }                                             210     }
194   }                                               211   }
195   if( fy - ny < kCarTolerance/fVoxelHalfY )       212   if( fy - ny < kCarTolerance/fVoxelHalfY )
196   {                                               213   {
197     if( localDir.y() < 0 )                        214     if( localDir.y() < 0 )
198     {                                             215     {
199       if( ny != 0 )                               216       if( ny != 0 )
200       {                                           217       {
201         ny -= 1;                                  218         ny -= 1;
202       }                                           219       }
203     }                                             220     }
204     else                                          221     else
205     {                                             222     {
206       if( ny == G4int(fNoVoxelsY) )            << 223       if( ny == G4int(fNoVoxelY) )  
207       {                                           224       {
208         ny -= 1;                                  225         ny -= 1;       
209       }                                           226       }
210     }                                             227     }
211   }                                               228   }
212   if( fz - nz < kCarTolerance/fVoxelHalfZ )       229   if( fz - nz < kCarTolerance/fVoxelHalfZ )
213   {                                               230   {
214     if( localDir.z() < 0 )                        231     if( localDir.z() < 0 )
215     {                                             232     {
216       if( nz != 0 )                               233       if( nz != 0 )
217       {                                           234       {
218         nz -= 1;                                  235         nz -= 1;
219       }                                           236       }
220     }                                             237     }
221     else                                          238     else
222     {                                             239     {
223       if( nz == G4int(fNoVoxelsZ) )            << 240       if( nz == G4int(fNoVoxelZ) )  
224       {                                           241       {
225         nz -= 1;                                  242         nz -= 1;       
226       }                                           243       }
227     }                                             244     }
228   }                                               245   }
229                                                   246   
230   // Check if there are still errors              247   // Check if there are still errors 
231   //                                              248   //
232   G4bool isOK = true;                             249   G4bool isOK = true;
233   if( nx < 0 )                                    250   if( nx < 0 )
234   {                                               251   {
235     nx = 0;                                       252     nx = 0;
236     isOK = false;                                 253     isOK = false;
237   }                                               254   }
238   else if( nx >= G4int(fNoVoxelsX) )           << 255   else if( nx >= G4int(fNoVoxelX) )
239   {                                               256   {
240     nx = G4int(fNoVoxelsX)-1;                  << 257     nx = fNoVoxelX-1;
241     isOK = false;                                 258     isOK = false;
242   }                                               259   }
243   if( ny < 0 )                                    260   if( ny < 0 )
244   {                                               261   {
245     ny = 0;                                       262     ny = 0;
246     isOK = false;                                 263     isOK = false;
247   }                                               264   }
248   else if( ny >= G4int(fNoVoxelsY) )           << 265   else if( ny >= G4int(fNoVoxelY) )
249   {                                               266   {
250     ny = G4int(fNoVoxelsY)-1;                  << 267     ny = fNoVoxelY-1;
251     isOK = false;                                 268     isOK = false;
252   }                                               269   }
253   if( nz < 0 )                                    270   if( nz < 0 )
254   {                                               271   {
255     nz = 0;                                       272     nz = 0;
256     isOK = false;                                 273     isOK = false;
257   }                                               274   }
258   else if( nz >= G4int(fNoVoxelsZ) )           << 275   else if( nz >= G4int(fNoVoxelZ) )
259   {                                               276   {
260     nz = G4int(fNoVoxelsZ)-1;                  << 277     nz = fNoVoxelZ-1;
261     isOK = false;                                 278     isOK = false;
262   }                                               279   }
263   if( !isOK )                                     280   if( !isOK )
264   {                                               281   {
265     std::ostringstream message;                   282     std::ostringstream message;
266     message << "Corrected the copy number! It     283     message << "Corrected the copy number! It was negative or too big."
267             << G4endl                             284             << G4endl
268             << "          LocalPoint: " << loc    285             << "          LocalPoint: " << localPoint << G4endl
269             << "          LocalDir: " << local    286             << "          LocalDir: " << localDir << G4endl
270             << "          Voxel container size    287             << "          Voxel container size: " << fContainerWallX
271             << " " << fContainerWallY << " " <    288             << " " << fContainerWallY << " " << fContainerWallZ << G4endl
272             << "          LocalPoint - wall: "    289             << "          LocalPoint - wall: "
273             << localPoint.x()-fContainerWallX     290             << localPoint.x()-fContainerWallX << " "
274             << localPoint.y()-fContainerWallY     291             << localPoint.y()-fContainerWallY << " "
275             << localPoint.z()-fContainerWallZ;    292             << localPoint.z()-fContainerWallZ;
276     G4Exception("G4PartialPhantomParameterisat    293     G4Exception("G4PartialPhantomParameterisation::GetReplicaNo()",
277                 "GeomNav1002", JustWarning, me    294                 "GeomNav1002", JustWarning, message);
278   }                                               295   }
279                                                   296 
280   auto  nyz = G4int(nz*fNoVoxelsY+ny);         << 297   G4int nyz = nz*fNoVoxelY+ny;
281   auto ite = fFilledIDs.cbegin();              << 298   std::multimap<G4int,G4int>::iterator ite = fFilledIDs.begin();
282 /*                                                299 /*
283   for( ite = fFilledIDs.cbegin(); ite != fFill << 300   for( ite = fFilledIDs.begin(); ite != fFilledIDs.end(); ite++ )
284   {                                               301   {
285     G4cout << " G4PartialPhantomParameterisati    302     G4cout << " G4PartialPhantomParameterisation::GetReplicaNo filled "
286            << (*ite).first << " , " << (*ite).    303            << (*ite).first << " , " << (*ite).second << std::endl;
287   }                                               304   }
288 */                                                305 */
                                                   >> 306   ite = fFilledIDs.begin();
289                                                   307 
290   advance(ite,nyz);                               308   advance(ite,nyz);
291   auto iteant = ite; iteant--;                 << 309   std::multimap<G4int,G4int>::iterator iteant = ite; iteant--;
292   G4int copyNo = (*iteant).first + 1 + ( nx -     310   G4int copyNo = (*iteant).first + 1 + ( nx - (*ite).second );
293 /*                                                311 /*
294   G4cout << " G4PartialPhantomParameterisation    312   G4cout << " G4PartialPhantomParameterisation::GetReplicaNo getting copyNo "
295          << copyNo << "  nyz " << nyz << "  (*    313          << copyNo << "  nyz " << nyz << "  (*iteant).first "
296          << (*iteant).first << "  (*ite).secon    314          << (*iteant).first << "  (*ite).second " <<  (*ite).second << G4endl;
297                                                   315 
298   G4cout << " G4PartialPhantomParameterisation    316   G4cout << " G4PartialPhantomParameterisation::GetReplicaNo " << copyNo
299          << " nx " << nx << " ny " << ny << "     317          << " nx " << nx << " ny " << ny << " nz " << nz
300          << " localPoint " << localPoint << "     318          << " localPoint " << localPoint << " localDir " << localDir << G4endl;
301 */                                                319 */
302   return copyNo;                                  320   return copyNo;
303 }                                                 321 }
304                                                   322 
305                                                   323 
306 //--------------------------------------------    324 //------------------------------------------------------------------
307 void G4PartialPhantomParameterisation::CheckCo << 325 void G4PartialPhantomParameterisation::CheckCopyNo( const G4int copyNo ) const
308 {                                                 326 { 
309   if( copyNo < 0 || copyNo >= G4int(fNoVoxels) << 327   if( copyNo < 0 || copyNo >= G4int(fNoVoxel) )
310   {                                               328   {
311     std::ostringstream message;                   329     std::ostringstream message;
312     message << "Copy number is negative or too    330     message << "Copy number is negative or too big!" << G4endl
313             << "        Copy number: " << copy    331             << "        Copy number: " << copyNo << G4endl
314             << "        Total number of voxels << 332             << "        Total number of voxels: " << fNoVoxel;
315     G4Exception("G4PartialPhantomParameterisat    333     G4Exception("G4PartialPhantomParameterisation::CheckCopyNo()",
316                 "GeomNav0002", FatalErrorInArg    334                 "GeomNav0002", FatalErrorInArgument, message);
317   }                                               335   }
318 }                                                 336 }
319                                                   337 
320                                                   338 
321 //--------------------------------------------    339 //------------------------------------------------------------------
322 void G4PartialPhantomParameterisation::BuildCo    340 void G4PartialPhantomParameterisation::BuildContainerWalls()
323 {                                                 341 {
324   fContainerWallX = fNoVoxelsX * fVoxelHalfX;  << 342   fContainerWallX = fNoVoxelX * fVoxelHalfX;
325   fContainerWallY = fNoVoxelsY * fVoxelHalfY;  << 343   fContainerWallY = fNoVoxelY * fVoxelHalfY;
326   fContainerWallZ = fNoVoxelsZ * fVoxelHalfZ;  << 344   fContainerWallZ = fNoVoxelZ * fVoxelHalfZ;
327 }                                                 345 }
328                                                   346