Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/include/G4MagIntegratorStepper.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/magneticfield/include/G4MagIntegratorStepper.icc (Version 11.3.0) and /geometry/magneticfield/include/G4MagIntegratorStepper.icc (Version 10.5)


  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 // G4MagIntegratorStepper inline methods imple << 
 27 //                                                 26 //
 28 // Author: J.Apostolakis, CERN - 15.01.1997    << 
 29 // ------------------------------------------- << 
 30                                                    27 
 31 inline                                             28 inline
 32 G4int G4MagIntegratorStepper::IntegrationOrder << 
 33 {                                              << 
 34   return fIntegrationOrder;                    << 
 35 }                                              << 
 36                                                << 
 37 inline                                         << 
 38 G4EquationOfMotion* G4MagIntegratorStepper::Ge     29 G4EquationOfMotion* G4MagIntegratorStepper::GetEquationOfMotion()
 39 {                                                  30 {
 40   return fEquation_Rhs;                            31   return fEquation_Rhs;
 41 }                                                  32 } 
 42                                                    33 
 43 inline                                             34 inline
 44 const G4EquationOfMotion* G4MagIntegratorStepp     35 const G4EquationOfMotion* G4MagIntegratorStepper::GetEquationOfMotion() const
 45 {                                                  36 {
 46   return fEquation_Rhs;                            37   return fEquation_Rhs;
 47 }                                                  38 }
 48                                                    39 
 49 inline                                         <<  40 inline void
 50 void G4MagIntegratorStepper::SetEquationOfMoti <<  41  G4MagIntegratorStepper::SetEquationOfMotion(G4EquationOfMotion* newEquation)
 51 {                                                  42 {
 52   if( newEq != nullptr )                       <<  43   if( newEquation != 0 )
 53   {                                                44   {
 54     fEquation_Rhs = newEq;                     <<  45     fEquation_Rhs= newEquation;
 55   }                                                46   }
 56 }                                                  47 } 
 57                                                    48 
 58 inline                                             49 inline
 59 unsigned long G4MagIntegratorStepper::GetfNoRH << 
 60 {                                              << 
 61   return fNoRHSCalls;                          << 
 62 }                                              << 
 63                                                << 
 64 inline                                         << 
 65 void G4MagIntegratorStepper::ResetfNORHSCalls( << 
 66 {                                              << 
 67   fNoRHSCalls = 0;                             << 
 68 }                                              << 
 69                                                << 
 70 inline                                         << 
 71 G4bool G4MagIntegratorStepper::IsFSAL() const  << 
 72 {                                              << 
 73   return fIsFSAL;                              << 
 74 }                                              << 
 75                                                << 
 76 inline                                         << 
 77 void G4MagIntegratorStepper::SetIntegrationOrd << 
 78 {                                              << 
 79   fIntegrationOrder = order;                   << 
 80 }                                              << 
 81                                                << 
 82 inline                                         << 
 83 void G4MagIntegratorStepper::SetFSAL(G4bool fl << 
 84 {                                              << 
 85   fIsFSAL = flag;                              << 
 86 }                                              << 
 87                                                << 
 88 inline                                         << 
 89 G4int G4MagIntegratorStepper::GetNumberOfVaria     50 G4int G4MagIntegratorStepper::GetNumberOfVariables() const
 90 {                                                  51 {
 91   return fNoIntegrationVariables;                  52   return fNoIntegrationVariables;
 92 }                                                  53 }
 93                                                    54 
 94                                                    55 
 95 inline                                             56 inline
 96 G4int G4MagIntegratorStepper::GetNumberOfState     57 G4int G4MagIntegratorStepper::GetNumberOfStateVariables() const
 97 {                                                  58 {
 98   return fNoStateVariables;                        59   return fNoStateVariables;
 99 }                                                  60 }
100                                                    61 
101 inline                                             62 inline
102 void G4MagIntegratorStepper::RightHandSide(con <<  63 void G4MagIntegratorStepper::RightHandSide( const  double y[], double dydx[] ) const
103                                                << 
104 {                                                  64 {
105   fEquation_Rhs->RightHandSide(y, dydx);       <<  65   fEquation_Rhs-> RightHandSide(y, dydx);
106   ++fNoRHSCalls; // IncrementRHSCalls();       <<  66   fNoRHSCalls++; // IncrementRHSCalls();
107 }                                                  67 }
108                                                    68 
109 inline                                             69 inline
110 void G4MagIntegratorStepper::RightHandSide(con     70 void G4MagIntegratorStepper::RightHandSide(const G4double y[],
111                                                <<  71                                            G4double dydx[],
112                                                <<  72                                            G4double field[]) const
113 {                                                  73 {
114   fEquation_Rhs->EvaluateRhsReturnB(y, dydx, f     74   fEquation_Rhs->EvaluateRhsReturnB(y, dydx, field);
115   ++fNoRHSCalls;                               <<  75   fNoRHSCalls++;
116 }                                                  76 }
117                                                    77 
118 inline                                             78 inline
119 void G4MagIntegratorStepper::NormaliseTangentV     79 void G4MagIntegratorStepper::NormaliseTangentVector( G4double vec[6] )
120 {                                                  80 {
121   G4double drds2 = vec[3]*vec[3]+vec[4]*vec[4]     81   G4double drds2 = vec[3]*vec[3]+vec[4]*vec[4]+vec[5]*vec[5];
122                                                    82 
123   if( std::fabs(drds2 - 1.0) > 1.e-14 )            83   if( std::fabs(drds2 - 1.0) > 1.e-14 )
124   {                                                84   {
125     G4double normx = 1.0 / std::sqrt(drds2);       85     G4double normx = 1.0 / std::sqrt(drds2);
126     for(auto i=3; i<6; ++i) { vec[i] *= normx; <<  86     for(G4int i=3;i<6;i++) { vec[i] *= normx; }
127   }                                                87   }
128 }                                                  88 }
129                                                    89 
130 inline                                             90 inline
131 void G4MagIntegratorStepper::NormalisePolariza     91 void G4MagIntegratorStepper::NormalisePolarizationVector( G4double vec[12] )
132 {                                                  92 {
133   G4double drds2 = vec[9]*vec[9]+vec[10]*vec[1     93   G4double drds2 = vec[9]*vec[9]+vec[10]*vec[10]+vec[11]*vec[11];
134                                                    94 
135   if( drds2 > 0. )                                 95   if( drds2 > 0. )
136   {                                                96   {
137     if( std::fabs(drds2 - 1.0) > 1.e-14 )          97     if( std::fabs(drds2 - 1.0) > 1.e-14 )
138     {                                              98     {
139       G4double normx = 1.0 / std::sqrt(drds2);     99       G4double normx = 1.0 / std::sqrt(drds2);
140       for(auto i=9; i<12; ++i)  { vec[i] *= no << 100       for(G4int i=9;i<12;i++)  { vec[i] *= normx; }
141     }                                             101     }
142   }                                               102   }
143 }                                                 103 }
144                                                   104