Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/management/include/G4AffineTransform.icc

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/management/include/G4AffineTransform.icc (Version 11.3.0) and /geometry/management/include/G4AffineTransform.icc (Version 10.4.p2)


  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: G4AffineTransform.icc 98309 2016-07-06 10:30:15Z gcosmo $
                                                   >>  28 //
                                                   >>  29 //
 26 // G4AffineTransformation Inline implementatio     30 // G4AffineTransformation Inline implementation
 27 //                                                 31 //
 28 // -------------------------------------------     32 // --------------------------------------------------------------------
 29                                                    33 
 30 inline G4AffineTransform::G4AffineTransform()      34 inline G4AffineTransform::G4AffineTransform()
 31  : rxx(1),rxy(0),rxz(0),                           35  : rxx(1),rxy(0),rxz(0),
 32    ryx(0),ryy(1),ryz(0),                           36    ryx(0),ryy(1),ryz(0),
 33    rzx(0),rzy(0),rzz(1),                           37    rzx(0),rzy(0),rzz(1),
 34    tx(0),ty(0),tz(0)                               38    tx(0),ty(0),tz(0)
 35 {}                                                 39 {}
 36                                                    40 
 37 inline G4AffineTransform::G4AffineTransform(co     41 inline G4AffineTransform::G4AffineTransform(const G4ThreeVector& tlate)
 38  : rxx(1),rxy(0),rxz(0),                           42  : rxx(1),rxy(0),rxz(0),
 39    ryx(0),ryy(1),ryz(0),                           43    ryx(0),ryy(1),ryz(0),
 40    rzx(0),rzy(0),rzz(1),                           44    rzx(0),rzy(0),rzz(1),
 41    tx(tlate.x()),ty(tlate.y()),tz(tlate.z())       45    tx(tlate.x()),ty(tlate.y()),tz(tlate.z())
 42 {}                                                 46 {}
 43                                                    47 
 44 inline G4AffineTransform::G4AffineTransform(co     48 inline G4AffineTransform::G4AffineTransform(const G4RotationMatrix& rot)
 45  : rxx(rot.xx()),rxy(rot.xy()),rxz(rot.xz()),      49  : rxx(rot.xx()),rxy(rot.xy()),rxz(rot.xz()),
 46    ryx(rot.yx()),ryy(rot.yy()),ryz(rot.yz()),      50    ryx(rot.yx()),ryy(rot.yy()),ryz(rot.yz()),
 47    rzx(rot.zx()),rzy(rot.zy()),rzz(rot.zz()),      51    rzx(rot.zx()),rzy(rot.zy()),rzz(rot.zz()),
 48    tx(0),ty(0),tz(0)                               52    tx(0),ty(0),tz(0)
 49 {}                                                 53 {}
 50                                                    54 
 51 inline G4AffineTransform::G4AffineTransform( c     55 inline G4AffineTransform::G4AffineTransform( const G4RotationMatrix& rot,
 52                                              c <<  56                                              const G4ThreeVector& tlate   )
 53  : rxx(rot.xx()),rxy(rot.xy()),rxz(rot.xz()),      57  : rxx(rot.xx()),rxy(rot.xy()),rxz(rot.xz()),
 54    ryx(rot.yx()),ryy(rot.yy()),ryz(rot.yz()),      58    ryx(rot.yx()),ryy(rot.yy()),ryz(rot.yz()),
 55    rzx(rot.zx()),rzy(rot.zy()),rzz(rot.zz()),      59    rzx(rot.zx()),rzy(rot.zy()),rzz(rot.zz()),
 56    tx(tlate.x()),ty(tlate.y()),tz(tlate.z())       60    tx(tlate.x()),ty(tlate.y()),tz(tlate.z())
 57 {}                                                 61 {}
 58                                                    62 
 59 inline G4AffineTransform::G4AffineTransform( c     63 inline G4AffineTransform::G4AffineTransform( const G4RotationMatrix* rot,
 60                                              c <<  64                                              const G4ThreeVector& tlate)
 61  : tx(tlate.x()),ty(tlate.y()),tz(tlate.z())       65  : tx(tlate.x()),ty(tlate.y()),tz(tlate.z())
 62 {                                                  66 {
 63   if (rot != nullptr)                          <<  67   if (rot)
 64   {                                            <<  68     {
 65     rxx=rot->xx();rxy=rot->xy();rxz=rot->xz(); <<  69       rxx=rot->xx();rxy=rot->xy();rxz=rot->xz();
 66     ryx=rot->yx();ryy=rot->yy();ryz=rot->yz(); <<  70       ryx=rot->yx();ryy=rot->yy();ryz=rot->yz();
 67     rzx=rot->zx();rzy=rot->zy();rzz=rot->zz(); <<  71       rzx=rot->zx();rzy=rot->zy();rzz=rot->zz();
 68   }                                            <<  72     }
 69   else                                             73   else
 70   {                                            <<  74     {
 71     rxx=1; rxy=0; rxz=0;                       <<  75       rxx=1; rxy=0; rxz=0;
 72     ryx=0; ryy=1; ryz=0;                       <<  76       ryx=0; ryy=1; ryz=0;
 73     rzx=0; rzy=0; rzz=1;                       <<  77       rzx=0; rzy=0; rzz=1;
 74   }                                            <<  78     }
 75 }                                                  79 }
 76                                                    80 
 77 inline                                         <<  81 inline 
 78 G4AffineTransform::                                82 G4AffineTransform::
 79 G4AffineTransform( const G4double prxx,const G     83 G4AffineTransform( const G4double prxx,const G4double prxy,const G4double prxz,
 80                    const G4double pryx,const G     84                    const G4double pryx,const G4double pryy,const G4double pryz,
 81                    const G4double przx,const G     85                    const G4double przx,const G4double przy,const G4double przz,
 82                    const G4double ptx,const G4 <<  86                    const G4double ptx,const G4double pty,const G4double ptz)
 83  : rxx(prxx),rxy(prxy),rxz(prxz),                  87  : rxx(prxx),rxy(prxy),rxz(prxz),
 84    ryx(pryx),ryy(pryy),ryz(pryz),                  88    ryx(pryx),ryy(pryy),ryz(pryz),
 85    rzx(przx),rzy(przy),rzz(przz),                  89    rzx(przx),rzy(przy),rzz(przz),
 86    tx(ptx),ty(pty),tz(ptz)                         90    tx(ptx),ty(pty),tz(ptz)
 87 {}                                                 91 {}
 88                                                    92 
 89 inline G4AffineTransform&                      << 
 90 G4AffineTransform::operator = (const G4AffineT << 
 91 {                                              << 
 92   if (this == &rhs)  { return *this; }         << 
 93   rxx = rhs.rxx; rxy = rhs.rxy; rxz = rhs.rxz; << 
 94   ryx = rhs.ryx; ryy = rhs.ryy; ryz = rhs.ryz; << 
 95   rzx = rhs.rzx; rzy = rhs.rzy; rzz = rhs.rzz; << 
 96   tx = rhs.tx; ty = rhs.ty; tz = rhs.tz;       << 
 97   return *this;                                << 
 98 }                                              << 
 99                                                << 
100 inline G4AffineTransform                           93 inline G4AffineTransform
101 G4AffineTransform::operator * (const G4AffineT     94 G4AffineTransform::operator * (const G4AffineTransform& tf) const
102 {                                                  95 {
103   return G4AffineTransform(rxx*tf.rxx+rxy*tf.r <<  96         return G4AffineTransform(
104                            rxx*tf.rxy+rxy*tf.r <<  97         rxx*tf.rxx+rxy*tf.ryx+rxz*tf.rzx,
105                            rxx*tf.rxz+rxy*tf.r <<  98         rxx*tf.rxy+rxy*tf.ryy+rxz*tf.rzy,
106                                                <<  99         rxx*tf.rxz+rxy*tf.ryz+rxz*tf.rzz,
107                            ryx*tf.rxx+ryy*tf.r << 100 
108                            ryx*tf.rxy+ryy*tf.r << 101         ryx*tf.rxx+ryy*tf.ryx+ryz*tf.rzx,
109                            ryx*tf.rxz+ryy*tf.r << 102         ryx*tf.rxy+ryy*tf.ryy+ryz*tf.rzy,
110                                                << 103         ryx*tf.rxz+ryy*tf.ryz+ryz*tf.rzz,
111                            rzx*tf.rxx+rzy*tf.r << 104 
112                            rzx*tf.rxy+rzy*tf.r << 105         rzx*tf.rxx+rzy*tf.ryx+rzz*tf.rzx,
113                            rzx*tf.rxz+rzy*tf.r << 106         rzx*tf.rxy+rzy*tf.ryy+rzz*tf.rzy,
114                                                << 107         rzx*tf.rxz+rzy*tf.ryz+rzz*tf.rzz,
115                            tx*tf.rxx+ty*tf.ryx << 108         
116                            tx*tf.rxy+ty*tf.ryy << 109         tx*tf.rxx+ty*tf.ryx+tz*tf.rzx+tf.tx,
117                            tx*tf.rxz+ty*tf.ryz << 110         tx*tf.rxy+ty*tf.ryy+tz*tf.rzy+tf.ty,
                                                   >> 111         tx*tf.rxz+ty*tf.ryz+tz*tf.rzz+tf.tz);
118 }                                                 112 }
119                                                   113 
120 inline G4AffineTransform&                         114 inline G4AffineTransform&
121 G4AffineTransform::operator *= (const G4Affine    115 G4AffineTransform::operator *= (const G4AffineTransform& tf)
122 {                                                 116 {
123   // Use temporaries for `in place' compound t << 117          // Use temporaries for `in place' compound transform computation
124   //                                           << 118 
125   G4double nrxx=rxx*tf.rxx+rxy*tf.ryx+rxz*tf.r << 119         G4double nrxx=rxx*tf.rxx+rxy*tf.ryx+rxz*tf.rzx;
126   G4double nrxy=rxx*tf.rxy+rxy*tf.ryy+rxz*tf.r << 120         G4double nrxy=rxx*tf.rxy+rxy*tf.ryy+rxz*tf.rzy;
127   G4double nrxz=rxx*tf.rxz+rxy*tf.ryz+rxz*tf.r << 121         G4double nrxz=rxx*tf.rxz+rxy*tf.ryz+rxz*tf.rzz;
128                                                << 122 
129   G4double nryx=ryx*tf.rxx+ryy*tf.ryx+ryz*tf.r << 123         G4double nryx=ryx*tf.rxx+ryy*tf.ryx+ryz*tf.rzx;
130   G4double nryy=ryx*tf.rxy+ryy*tf.ryy+ryz*tf.r << 124         G4double nryy=ryx*tf.rxy+ryy*tf.ryy+ryz*tf.rzy;
131   G4double nryz=ryx*tf.rxz+ryy*tf.ryz+ryz*tf.r << 125         G4double nryz=ryx*tf.rxz+ryy*tf.ryz+ryz*tf.rzz;
132                                                << 126 
133   G4double nrzx=rzx*tf.rxx+rzy*tf.ryx+rzz*tf.r << 127         G4double nrzx=rzx*tf.rxx+rzy*tf.ryx+rzz*tf.rzx;
134   G4double nrzy=rzx*tf.rxy+rzy*tf.ryy+rzz*tf.r << 128         G4double nrzy=rzx*tf.rxy+rzy*tf.ryy+rzz*tf.rzy;
135   G4double nrzz=rzx*tf.rxz+rzy*tf.ryz+rzz*tf.r << 129         G4double nrzz=rzx*tf.rxz+rzy*tf.ryz+rzz*tf.rzz;
136                                                   130         
137   G4double ntx=tx*tf.rxx+ty*tf.ryx+tz*tf.rzx+t << 131         G4double ntx=tx*tf.rxx+ty*tf.ryx+tz*tf.rzx+tf.tx;
138   G4double nty=tx*tf.rxy+ty*tf.ryy+tz*tf.rzy+t << 132         G4double nty=tx*tf.rxy+ty*tf.ryy+tz*tf.rzy+tf.ty;
139   G4double ntz=tx*tf.rxz+ty*tf.ryz+tz*tf.rzz+t << 133         G4double ntz=tx*tf.rxz+ty*tf.ryz+tz*tf.rzz+tf.tz;
140                                                << 134 
141   tx=ntx; ty=nty; tz=ntz;                      << 135         tx=ntx; ty=nty; tz=ntz;
142   rxx=nrxx; rxy=nrxy; rxz=nrxz;                << 136         rxx=nrxx; rxy=nrxy; rxz=nrxz;
143   ryx=nryx; ryy=nryy; ryz=nryz;                << 137         ryx=nryx; ryy=nryy; ryz=nryz;
144   rzx=nrzx; rzy=nrzy; rzz=nrzz;                << 138         rzx=nrzx; rzy=nrzy; rzz=nrzz;
145                                                   139 
146   return *this;                                << 140         return *this;
147 }                                                 141 }
148                                                   142 
149 inline G4AffineTransform&                         143 inline G4AffineTransform&
150 G4AffineTransform::Product( const G4AffineTran << 144 G4AffineTransform::Product(const G4AffineTransform& tf1,
151                             const G4AffineTran << 145                            const G4AffineTransform& tf2)
152 {                                                 146 {
153   rxx = tf1.rxx*tf2.rxx + tf1.rxy*tf2.ryx + tf << 147         rxx=tf1.rxx*tf2.rxx + tf1.rxy*tf2.ryx + tf1.rxz*tf2.rzx;
154   rxy = tf1.rxx*tf2.rxy + tf1.rxy*tf2.ryy + tf << 148         rxy=tf1.rxx*tf2.rxy + tf1.rxy*tf2.ryy + tf1.rxz*tf2.rzy;
155   rxz = tf1.rxx*tf2.rxz + tf1.rxy*tf2.ryz + tf << 149         rxz=tf1.rxx*tf2.rxz + tf1.rxy*tf2.ryz + tf1.rxz*tf2.rzz;
156                                                << 150 
157   ryx = tf1.ryx*tf2.rxx + tf1.ryy*tf2.ryx + tf << 151         ryx=tf1.ryx*tf2.rxx + tf1.ryy*tf2.ryx + tf1.ryz*tf2.rzx;
158   ryy = tf1.ryx*tf2.rxy + tf1.ryy*tf2.ryy + tf << 152         ryy=tf1.ryx*tf2.rxy + tf1.ryy*tf2.ryy + tf1.ryz*tf2.rzy;
159   ryz = tf1.ryx*tf2.rxz + tf1.ryy*tf2.ryz + tf << 153         ryz=tf1.ryx*tf2.rxz + tf1.ryy*tf2.ryz + tf1.ryz*tf2.rzz;
160                                                << 154 
161   rzx = tf1.rzx*tf2.rxx + tf1.rzy*tf2.ryx + tf << 155         rzx=tf1.rzx*tf2.rxx + tf1.rzy*tf2.ryx + tf1.rzz*tf2.rzx;
162   rzy = tf1.rzx*tf2.rxy + tf1.rzy*tf2.ryy + tf << 156         rzy=tf1.rzx*tf2.rxy + tf1.rzy*tf2.ryy + tf1.rzz*tf2.rzy;
163   rzz = tf1.rzx*tf2.rxz + tf1.rzy*tf2.ryz + tf << 157         rzz=tf1.rzx*tf2.rxz + tf1.rzy*tf2.ryz + tf1.rzz*tf2.rzz;
164                                                << 158         
165   tx = tf1.tx*tf2.rxx + tf1.ty*tf2.ryx + tf1.t << 159         tx=tf1.tx*tf2.rxx + tf1.ty*tf2.ryx + tf1.tz*tf2.rzx   + tf2.tx;
166   ty = tf1.tx*tf2.rxy + tf1.ty*tf2.ryy + tf1.t << 160         ty=tf1.tx*tf2.rxy + tf1.ty*tf2.ryy + tf1.tz*tf2.rzy   + tf2.ty;
167   tz = tf1.tx*tf2.rxz + tf1.ty*tf2.ryz + tf1.t << 161         tz=tf1.tx*tf2.rxz + tf1.ty*tf2.ryz + tf1.tz*tf2.rzz   + tf2.tz; 
168                                                << 162         
169   return *this;                                << 163         return *this;
170 }                                                 164 }
171                                                   165 
172 inline G4AffineTransform&                         166 inline G4AffineTransform&
173 G4AffineTransform::InverseProduct( const G4Aff    167 G4AffineTransform::InverseProduct( const G4AffineTransform& tf1,
174                                    const G4Aff << 168                                    const G4AffineTransform& tf2)
175 {                                              << 
176   if ((tf2.rxx + tf2.ryy + tf2.rzz) == 3.)     << 
177   {                                            << 
178     rxx = tf1.rxx;                             << 
179     rxy = tf1.rxy;                             << 
180     rxz = tf1.rxz;                             << 
181                                                << 
182     ryx = tf1.ryx;                             << 
183     ryy = tf1.ryy;                             << 
184     ryz = tf1.ryz;                             << 
185                                                << 
186     rzx = tf1.rzx;                             << 
187     rzy = tf1.rzy;                             << 
188     rzz = tf1.rzz;                             << 
189                                                << 
190     tx = tf1.tx - tf2.tx;                      << 
191     ty = tf1.ty - tf2.ty;                      << 
192     tz = tf1.tz - tf2.tz;                      << 
193   }                                            << 
194   else                                         << 
195   {                                            << 
196     G4double tf1rxx = tf1.rxx, tf1rxy = tf1.rx << 
197     rxx = tf1rxx*tf2.rxx + tf1rxy*tf2.rxy + tf << 
198     rxy = tf1rxx*tf2.ryx + tf1rxy*tf2.ryy + tf << 
199     rxz = tf1rxx*tf2.rzx + tf1rxy*tf2.rzy + tf << 
200                                                << 
201     G4double tf1ryx = tf1.ryx, tf1ryy = tf1.ry << 
202     ryx = tf1ryx*tf2.rxx + tf1ryy*tf2.rxy + tf << 
203     ryy = tf1ryx*tf2.ryx + tf1ryy*tf2.ryy + tf << 
204     ryz = tf1ryx*tf2.rzx + tf1ryy*tf2.rzy + tf << 
205                                                << 
206     G4double tf1rzx = tf1.rzx, tf1rzy = tf1.rz << 
207     rzx = tf1rzx*tf2.rxx + tf1rzy*tf2.rxy + tf << 
208     rzy = tf1rzx*tf2.ryx + tf1rzy*tf2.ryy + tf << 
209     rzz = tf1rzx*tf2.rzx + tf1rzy*tf2.rzy + tf << 
210                                                << 
211     G4double tf1_2tx = tf1.tx - tf2.tx;        << 
212     G4double tf1_2ty = tf1.ty - tf2.ty;        << 
213     G4double tf1_2tz = tf1.tz - tf2.tz;        << 
214     tx = tf1_2tx*tf2.rxx + tf1_2ty*tf2.rxy + t << 
215     ty = tf1_2tx*tf2.ryx + tf1_2ty*tf2.ryy + t << 
216     tz = tf1_2tx*tf2.rzx + tf1_2ty*tf2.rzy + t << 
217   }                                            << 
218   return *this;                                << 
219 }                                              << 
220                                                << 
221 inline G4ThreeVector                           << 
222 G4AffineTransform::TransformPoint(const G4Thre << 
223 {                                                 169 {
224   G4double vecx = vec.x(), vecy = vec.y(), vec << 170         G4double itf2tx = - tf2.tx*tf2.rxx - tf2.ty*tf2.rxy - tf2.tz*tf2.rxz;
225   return { vecx*rxx + vecy*ryx + vecz*rzx + tx << 171         G4double itf2ty = - tf2.tx*tf2.ryx - tf2.ty*tf2.ryy - tf2.tz*tf2.ryz;
226            vecx*rxy + vecy*ryy + vecz*rzy + ty << 172         G4double itf2tz = - tf2.tx*tf2.rzx - tf2.ty*tf2.rzy - tf2.tz*tf2.rzz;
227            vecx*rxz + vecy*ryz + vecz*rzz + tz << 173 
228 }                                              << 174         rxx=tf1.rxx*tf2.rxx+tf1.rxy*tf2.rxy+tf1.rxz*tf2.rxz;
                                                   >> 175         rxy=tf1.rxx*tf2.ryx+tf1.rxy*tf2.ryy+tf1.rxz*tf2.ryz;
                                                   >> 176         rxz=tf1.rxx*tf2.rzx+tf1.rxy*tf2.rzy+tf1.rxz*tf2.rzz;
                                                   >> 177 
                                                   >> 178         ryx=tf1.ryx*tf2.rxx+tf1.ryy*tf2.rxy+tf1.ryz*tf2.rxz;
                                                   >> 179         ryy=tf1.ryx*tf2.ryx+tf1.ryy*tf2.ryy+tf1.ryz*tf2.ryz;
                                                   >> 180         ryz=tf1.ryx*tf2.rzx+tf1.ryy*tf2.rzy+tf1.ryz*tf2.rzz;
                                                   >> 181 
                                                   >> 182         rzx=tf1.rzx*tf2.rxx+tf1.rzy*tf2.rxy+tf1.rzz*tf2.rxz;
                                                   >> 183         rzy=tf1.rzx*tf2.ryx+tf1.rzy*tf2.ryy+tf1.rzz*tf2.ryz;
                                                   >> 184         rzz=tf1.rzx*tf2.rzx+tf1.rzy*tf2.rzy+tf1.rzz*tf2.rzz;
                                                   >> 185         
                                                   >> 186         tx=tf1.tx*tf2.rxx+tf1.ty*tf2.rxy+tf1.tz*tf2.rxz+itf2tx;
                                                   >> 187         ty=tf1.tx*tf2.ryx+tf1.ty*tf2.ryy+tf1.tz*tf2.ryz+itf2ty;
                                                   >> 188         tz=tf1.tx*tf2.rzx+tf1.ty*tf2.rzy+tf1.tz*tf2.rzz+itf2tz;
229                                                   189 
230 inline G4ThreeVector                           << 190         return *this;
231 G4AffineTransform::InverseTransformPoint(const << 
232 {                                              << 
233   G4double vecx = vec.x()-tx, vecy = vec.y()-t << 
234   return { vecx*rxx + vecy*rxy + vecz*rxz,     << 
235            vecx*ryx + vecy*ryy + vecz*ryz,     << 
236            vecx*rzx + vecy*rzy + vecz*rzz };   << 
237 }                                                 191 }
238                                                   192 
239 inline G4ThreeVector                           << 193 inline
240 G4AffineTransform::TransformAxis(const G4Three << 194 G4ThreeVector G4AffineTransform::TransformPoint(const G4ThreeVector& vec) const
241 {                                                 195 {
242   G4double axisx = axis.x(), axisy = axis.y(), << 196         return G4ThreeVector( vec.x()*rxx + vec.y()*ryx + vec.z()*rzx   + tx,
243   return { axisx*rxx + axisy*ryx + axisz*rzx,  << 197                               vec.x()*rxy + vec.y()*ryy + vec.z()*rzy   + ty,
244            axisx*rxy + axisy*ryy + axisz*rzy,  << 198                               vec.x()*rxz + vec.y()*ryz + vec.z()*rzz   + tz  );
245            axisx*rxz + axisy*ryz + axisz*rzz } << 
246 }                                                 199 }
247                                                   200 
248 inline G4ThreeVector                           << 201 inline
249 G4AffineTransform::InverseTransformAxis(const  << 202 G4ThreeVector G4AffineTransform::TransformAxis(const G4ThreeVector& axis) const
250 {                                                 203 {
251   G4double axisx = axis.x(), axisy = axis.y(), << 204         return G4ThreeVector( axis.x()*rxx + axis.y()*ryx + axis.z()*rzx,
252   return { axisx*rxx + axisy*rxy + axisz*rxz,  << 205                               axis.x()*rxy + axis.y()*ryy + axis.z()*rzy,
253            axisx*ryx + axisy*ryy + axisz*ryz,  << 206                               axis.x()*rxz + axis.y()*ryz + axis.z()*rzz  );
254            axisx*rzx + axisy*rzy + axisz*rzz } << 
255 }                                                 207 }
256                                                   208 
257 inline                                            209 inline
258 void G4AffineTransform::ApplyPointTransform(G4    210 void G4AffineTransform::ApplyPointTransform(G4ThreeVector& vec) const
259 {                                                 211 {
260   G4double vecx = vec.x(), vecy = vec.y(), vec << 212         G4double x = vec.x()*rxx + vec.y()*ryx + vec.z()*rzx    + tx;
261   vec.setX( vecx*rxx + vecy*ryx + vecz*rzx + t << 213         G4double y = vec.x()*rxy + vec.y()*ryy + vec.z()*rzy    + ty;
262   vec.setY( vecx*rxy + vecy*ryy + vecz*rzy + t << 214         G4double z = vec.x()*rxz + vec.y()*ryz + vec.z()*rzz    + tz;
263   vec.setZ( vecx*rxz + vecy*ryz + vecz*rzz + t << 215 
                                                   >> 216         vec.setX(x);
                                                   >> 217         vec.setY(y);
                                                   >> 218         vec.setZ(z);
264 }                                                 219 }
265                                                   220 
266 inline                                            221 inline
267 void G4AffineTransform::ApplyAxisTransform(G4T    222 void G4AffineTransform::ApplyAxisTransform(G4ThreeVector& axis) const
268 {                                                 223 {
269   G4double axisx = axis.x(), axisy = axis.y(), << 224         G4double x = axis.x()*rxx + axis.y()*ryx + axis.z()*rzx;
270   axis.setX( axisx*rxx + axisy*ryx + axisz*rzx << 225         G4double y = axis.x()*rxy + axis.y()*ryy + axis.z()*rzy;
271   axis.setY( axisx*rxy + axisy*ryy + axisz*rzy << 226         G4double z = axis.x()*rxz + axis.y()*ryz + axis.z()*rzz;
272   axis.setZ( axisx*rxz + axisy*ryz + axisz*rzz << 227 
                                                   >> 228         axis.setX(x);
                                                   >> 229         axis.setY(y);
                                                   >> 230         axis.setZ(z);
273 }                                                 231 }
274                                                   232 
275 inline                                            233 inline
276 G4AffineTransform G4AffineTransform::Inverse()    234 G4AffineTransform G4AffineTransform::Inverse() const
277 {                                                 235 {
278   G4double ttx = -tx, tty = -ty, ttz = -tz;    << 236         return G4AffineTransform( rxx, ryx, rzx,
279   return G4AffineTransform( rxx, ryx, rzx,     << 237                                   rxy, ryy, rzy,
280                             rxy, ryy, rzy,     << 238                                   rxz, ryz, rzz,
281                             rxz, ryz, rzz,     << 239 
282                             ttx*rxx + tty*rxy  << 240                                  -tx*rxx - ty*rxy - tz*rxz,
283                             ttx*ryx + tty*ryy  << 241                                  -tx*ryx - ty*ryy - tz*ryz,
284                             ttx*rzx + tty*rzy  << 242                                  -tx*rzx - ty*rzy - tz*rzz  );
285 }                                                 243 }
286                                                   244 
287 inline                                            245 inline
288 G4AffineTransform& G4AffineTransform::Invert()    246 G4AffineTransform& G4AffineTransform::Invert()
289 {                                                 247 {
290   G4double ttx = -tx, tty = -ty, ttz = -tz;    << 248         G4double v1 = -tx*rxx - ty*rxy - tz*rxz;
291            tx = ttx*rxx + tty*rxy + ttz*rxz;   << 249         G4double v2 = -tx*ryx - ty*ryy - tz*ryz;
292            ty = ttx*ryx + tty*ryy + ttz*ryz;   << 250         G4double v3 = -tx*rzx - ty*rzy - tz*rzz;
293            tz = ttx*rzx + tty*rzy + ttz*rzz;   << 251 
294                                                << 252         tx=v1; ty=v2; tz=v3;
295   G4double tmp1=ryx; ryx=rxy; rxy=tmp1;        << 253 
296   G4double tmp2=rzx; rzx=rxz; rxz=tmp2;        << 254         G4double tmp1=ryx; ryx=rxy; rxy=tmp1;
297   G4double tmp3=rzy; rzy=ryz; ryz=tmp3;        << 255         G4double tmp2=rzx; rzx=rxz; rxz=tmp2;
                                                   >> 256         G4double tmp3=rzy; rzy=ryz; ryz=tmp3;
                                                   >> 257 
                                                   >> 258         return *this;
298                                                   259 
299   return *this;                                << 
300 }                                                 260 }
301                                                   261 
302 inline                                            262 inline
303 G4AffineTransform& G4AffineTransform::operator    263 G4AffineTransform& G4AffineTransform::operator +=(const G4ThreeVector& tlate)
304 {                                                 264 {
305   tx += tlate.x();                             << 265         tx += tlate.x();
306   ty += tlate.y();                             << 266         ty += tlate.y();
307   tz += tlate.z();                             << 267         tz += tlate.z();
308                                                   268 
309   return *this;                                << 269         return *this;
310 }                                                 270 }
311                                                   271 
312 inline                                            272 inline
313 G4AffineTransform& G4AffineTransform::operator    273 G4AffineTransform& G4AffineTransform::operator -=(const G4ThreeVector& tlate)
314 {                                                 274 {
315   tx -= tlate.x();                             << 275         tx -= tlate.x();
316   ty -= tlate.y();                             << 276         ty -= tlate.y();
317   tz -= tlate.z();                             << 277         tz -= tlate.z();
318                                                   278 
319   return *this;                                << 279         return *this;
320 }                                                 280 }
321                                                   281 
322 inline                                            282 inline
323 G4bool G4AffineTransform::operator == (const G    283 G4bool G4AffineTransform::operator == (const G4AffineTransform& tf) const
324 {                                                 284 {
325   return tx==tf.tx&&ty==tf.ty&&tz==tf.tz&&     << 285         return (tx==tf.tx&&ty==tf.ty&&tz==tf.tz&&
326          rxx==tf.rxx&&rxy==tf.rxy&&rxz==tf.rxz << 286                 rxx==tf.rxx&&rxy==tf.rxy&&rxz==tf.rxz&&
327          ryx==tf.ryx&&ryy==tf.ryy&&ryz==tf.ryz << 287                 ryx==tf.ryx&&ryy==tf.ryy&&ryz==tf.ryz&&
328          rzx==tf.rzx&&rzy==tf.rzy&&rzz==tf.rzz << 288                 rzx==tf.rzx&&rzy==tf.rzy&&rzz==tf.rzz) ? true : false;
329 }                                                 289 }
330                                                << 
331 inline                                            290 inline
332 G4bool G4AffineTransform::operator != (const G    291 G4bool G4AffineTransform::operator != (const G4AffineTransform& tf) const
333 {                                                 292 {
334   return tx!=tf.tx||ty!=tf.ty||tz!=tf.tz||     << 293         return (tx!=tf.tx||ty!=tf.ty||tz!=tf.tz||
335          rxx!=tf.rxx||rxy!=tf.rxy||rxz!=tf.rxz << 294                 rxx!=tf.rxx||rxy!=tf.rxy||rxz!=tf.rxz||
336          ryx!=tf.ryx||ryy!=tf.ryy||ryz!=tf.ryz << 295                 ryx!=tf.ryx||ryy!=tf.ryy||ryz!=tf.ryz||
337          rzx!=tf.rzx||rzy!=tf.rzy||rzz!=tf.rzz << 296                 rzx!=tf.rzx||rzy!=tf.rzy||rzz!=tf.rzz) ? true : false;
338 }                                                 297 }
339                                                   298 
340 inline                                            299 inline
341 G4double G4AffineTransform::operator [] (const    300 G4double G4AffineTransform::operator [] (const G4int n) const
342 {                                                 301 {
343   G4double v = 0.0;                            << 302         G4double v = 0.0;
344   switch(n)                                    << 303         switch(n)
345   {                                            << 304                 {
346     case 0:                                    << 305                 case 0:
347             v=rxx;                             << 306                         v=rxx;
348             break;                             << 307                         break;
349     case 1:                                    << 308                 case 1:
350             v=rxy;                             << 309                         v=rxy;
351             break;                             << 310                         break;
352     case 2:                                    << 311                 case 2:
353             v=rxz;                             << 312                         v=rxz;
354             break;                             << 313                         break;
355     case 4:                                    << 314                 case 4:
356             v=ryx;                             << 315                         v=ryx;
357             break;                             << 316                         break;
358     case 5:                                    << 317                 case 5:
359             v=ryy;                             << 318                         v=ryy;
360             break;                             << 319                         break;
361     case 6:                                    << 320                 case 6:
362             v=ryz;                             << 321                         v=ryz;
363             break;                             << 322                         break;
364     case 8:                                    << 323                 case 8:
365             v=rzx;                             << 324                         v=rzx;
366             break;                             << 325                         break;
367     case 9:                                    << 326                 case 9:
368             v=rzy;                             << 327                         v=rzy;
369             break;                             << 328                         break;
370     case 10:                                   << 329                 case 10:
371             v=rzz;                             << 330                         v=rzz;
372             break;                             << 331                         break;
373     case 12:                                   << 332                 case 12:
374             v=tx;                              << 333                         v=tx;
375             break;                             << 334                         break;
376     case 13:                                   << 335                 case 13:
377             v=ty;                              << 336                         v=ty;
378             break;                             << 337                         break;
379     case 14:                                   << 338                 case 14:
380             v=tz;                              << 339                         v=tz;
381             break;                             << 340                         break;
382     case 3:                                    << 341                 case 3:
383     case 7:                                    << 342                 case 7:
384     case 11:                                   << 343                 case 11:
385             break;                             << 344                         break;
386     case 15:                                   << 345                 case 15:
387             v=1.0;                             << 346                         v=1.0;
388             break;                             << 347                         break;
389   }                                            << 348                 }
390   return v;                                    << 349         return v;
391 }                                                 350 }
392                                                   351 
393 inline                                            352 inline
394 G4bool G4AffineTransform::IsRotated() const       353 G4bool G4AffineTransform::IsRotated() const
395 {                                                 354 {
396   return !(rxx==1.0 && ryy==1.0 && rzz==1.0);  << 355         return (rxx==1.0 && ryy==1.0 && rzz==1.0) ? false : true;
397 }                                                 356 }
398                                                   357 
399 inline                                            358 inline 
400 G4bool G4AffineTransform::IsTranslated() const    359 G4bool G4AffineTransform::IsTranslated() const
401 {                                                 360 {
402   return (tx != 0.0) || (ty != 0.0) || (tz !=  << 361         return (tx || ty || tz) ? true:false;
403 }                                                 362 }
404                                                   363 
405 inline G4RotationMatrix G4AffineTransform::Net    364 inline G4RotationMatrix G4AffineTransform::NetRotation() const
406 {                                                 365 {
407   return G4Rep3x3(rxx,rxy,rxz,                 << 366         return G4Rep3x3(rxx,rxy,rxz,
408                   ryx,ryy,ryz,                 << 367                         ryx,ryy,ryz,
409                   rzx,rzy,rzz);                << 368                         rzx,rzy,rzz);
410 }                                              << 
411                                                << 
412 inline G4RotationMatrix G4AffineTransform::Inv << 
413 {                                              << 
414   return G4Rep3x3(rxx,ryx,rzx,                 << 
415                   rxy,ryy,rzy,                 << 
416                   rxz,ryz,rzz);                << 
417 }                                                 369 }
418                                                   370 
419 inline                                            371 inline
420 G4ThreeVector G4AffineTransform::NetTranslatio    372 G4ThreeVector G4AffineTransform::NetTranslation() const
421 {                                                 373 {
422   return {tx,ty,tz};                           << 374         return G4ThreeVector(tx,ty,tz);
423 }                                              << 
424                                                << 
425 inline                                         << 
426 G4ThreeVector G4AffineTransform::InverseNetTra << 
427 {                                              << 
428   G4double ttx = -tx, tty = -ty, ttz = -tz;    << 
429   G4double invtx = ttx*rxx + tty*rxy + ttz*rxz << 
430   G4double invty = ttx*ryx + tty*ryy + ttz*ryz << 
431   G4double invtz = ttx*rzx + tty*rzy + ttz*rzz << 
432   return {invtx,invty,invtz};                  << 
433 }                                                 375 }
434                                                   376 
435 inline                                            377 inline 
436 void G4AffineTransform::SetNetRotation(const G    378 void G4AffineTransform::SetNetRotation(const G4RotationMatrix& rot)
437 {                                                 379 {
438   rxx=rot.xx();                                << 380         rxx=rot.xx();
439   rxy=rot.xy();                                << 381         rxy=rot.xy();
440   rxz=rot.xz();                                << 382         rxz=rot.xz();
441   ryx=rot.yx();                                << 383         ryx=rot.yx();
442   ryy=rot.yy();                                << 384         ryy=rot.yy();
443   ryz=rot.yz();                                << 385         ryz=rot.yz();
444   rzx=rot.zx();                                << 386         rzx=rot.zx();
445   rzy=rot.zy();                                << 387         rzy=rot.zy();
446   rzz=rot.zz();                                << 388         rzz=rot.zz();
447 }                                                 389 }
448                                                   390 
449 inline                                            391 inline
450 void G4AffineTransform::SetNetTranslation(cons    392 void G4AffineTransform::SetNetTranslation(const G4ThreeVector& tlate)
451 {                                                 393 {
452   tx=tlate.x();                                << 394         tx=tlate.x();
453   ty=tlate.y();                                << 395         ty=tlate.y();
454   tz=tlate.z();                                << 396         tz=tlate.z();
455 }                                                 397 }
456                                                   398 
457 inline                                            399 inline
458 G4AffineTransform::operator G4Transform3D () c    400 G4AffineTransform::operator G4Transform3D () const
459 {                                                 401 {
460   return G4Transform3D(NetRotation().inverse() << 402         return G4Transform3D(NetRotation().inverse(),NetTranslation());
461 }                                                 403 }
462                                                   404 
463 inline                                            405 inline
464 std::ostream& operator << (std::ostream& os, c    406 std::ostream& operator << (std::ostream& os, const G4AffineTransform& transf)
465 {                                                 407 {
466   std::streamsize oldPrec = os.precision(6);   << 408   std::streamsize oldPrec = os.precision(6); 
467   G4double DeviationTolerance = 1.0e-05;          409   G4double DeviationTolerance = 1.0e-05;
468                                                   410 
469   G4double diagDeviation = 0.0;                << 411   G4double diagDeviation = 0.0; 
470   G4double offdDeviationUL = 0.0;                 412   G4double offdDeviationUL = 0.0;
471   G4double offdDeviationDR = 0.0;                 413   G4double offdDeviationDR = 0.0;
472   G4double offdDeviation = 0.0;                << 414   G4double offdDeviation = 0.0; 
473                                                   415 
474   os << "  Transformation: " << G4endl;        << 416   os << "  Transformation: " << G4endl; 
475                                                   417 
476   // double  a = std::max ( 1, 2, 3 ) ;        << 418   // double  a = std::max ( 1, 2, 3 ) ; 
477                                                << 419   
478   G4bool UnitTr = ! transf.IsRotated();        << 420   G4bool UnitTr = ! transf.IsRotated(); 
479   diagDeviation = std::max( std::fabs( transf[    421   diagDeviation = std::max( std::fabs( transf[0] - 1.0 ) ,   //  |rxx - 1|
480                             std::fabs( transf[    422                             std::fabs( transf[5] - 1.0 ) );  //  |ryy - 1|
481   diagDeviation = std::max( diagDeviation,     << 423   diagDeviation = std::max( diagDeviation, 
482                             std::fabs( transf[    424                             std::fabs( transf[10] - 1.0 ) ); //  |rzz - 1|
483                                                   425   
484   offdDeviationUL = std::max( std::fabs( trans    426   offdDeviationUL = std::max( std::fabs( transf[1] ) ,       //  |rxy|
485                               std::fabs( trans    427                               std::fabs( transf[2] ) );      //  |rxz|
486   offdDeviationUL = std::max( offdDeviationUL,    428   offdDeviationUL = std::max( offdDeviationUL, 
487                               std::fabs( trans    429                               std::fabs( transf[4] ) );      //  |ryx|
488                                                   430   
489   offdDeviationDR = std::max( std::fabs( trans    431   offdDeviationDR = std::max( std::fabs( transf[6] ) ,       //  |ryz|
490                               std::fabs( trans    432                               std::fabs( transf[8] ) );      //  |rzx|
491   offdDeviationDR = std::max( offdDeviationDR,    433   offdDeviationDR = std::max( offdDeviationDR, 
492                               std::fabs( trans    434                               std::fabs( transf[9] ) );      //  |rzy|
493   offdDeviation = std::max( offdDeviationUL, o << 435   offdDeviation = std::max( offdDeviationUL, offdDeviationDR ); 
494                                                   436 
495   if( UnitTr || std::max(diagDeviation, offdDe    437   if( UnitTr || std::max(diagDeviation, offdDeviation) < DeviationTolerance )
496   {                                               438   {
497      os << "    UNIT  Rotation " << G4endl;       439      os << "    UNIT  Rotation " << G4endl;
498   }                                               440   }
499   else                                            441   else
500   {                                               442   {
501      os << "rx/x,y,z: "                           443      os << "rx/x,y,z: "
502         << transf[0]  << " " << transf[1] << "    444         << transf[0]  << " " << transf[1] << " " << transf[2] << G4endl
503         << "ry/x,y,z: "                           445         << "ry/x,y,z: "
504         << transf[4]  << " " << transf[5] << "    446         << transf[4]  << " " << transf[5] << " " << transf[6] << G4endl
505         << "rz/x,y,z: "                           447         << "rz/x,y,z: "
506         << transf[8]  << " " << transf[9] << "    448         << transf[8]  << " " << transf[9] << " " << transf[10] << G4endl;
507   }                                               449   }
508                                                   450 
509   os << "tr/x,y,z: " << transf[12]  << " " <<     451   os << "tr/x,y,z: " << transf[12]  << " " << transf[13] << " " << transf[14]
510      << G4endl;                                   452      << G4endl;
511                                                   453   
512   os.precision(oldPrec);                       << 454   os.precision(oldPrec); 
513                                                   455 
514   return os;                                   << 456   return os; 
515 }                                                 457 }
516                                                   458