Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4EqMagElectricField.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/magneticfield/src/G4EqMagElectricField.cc (Version 11.3.0) and /geometry/magneticfield/src/G4EqMagElectricField.cc (Version 8.1.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 // G4EqMagElectricField implementation         << 
 27 //                                                 26 //
 28 // This is the standard right-hand side for eq <<  27 // $Id: G4EqMagElectricField.cc,v 1.13 2006/06/29 18:23:46 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
 29 //                                                 29 //
 30 // The only case another is required is when u << 
 31 // frame ... or extending the class to include << 
 32 // e.g., an electric field                     << 
 33 //                                                 30 //
 34 // Created: V.Grichine, 10.11.1998             <<  31 //  This is the standard right-hand side for equation of motion.
                                                   >>  32 //
                                                   >>  33 //  The only case another is required is when using a moving reference
                                                   >>  34 //  frame ... or extending the class to include additional Forces,
                                                   >>  35 //  eg an electric field
                                                   >>  36 //
                                                   >>  37 //  10.11.98   V.Grichine
                                                   >>  38 //
 35 // -------------------------------------------     39 // -------------------------------------------------------------------
 36                                                    40 
 37 #include "G4EqMagElectricField.hh"                 41 #include "G4EqMagElectricField.hh"
 38 #include "globals.hh"                              42 #include "globals.hh"
 39 #include "G4PhysicalConstants.hh"              << 
 40 #include "G4SystemOfUnits.hh"                  << 
 41                                                << 
 42 G4EqMagElectricField::G4EqMagElectricField(G4E << 
 43   : G4EquationOfMotion( emField )              << 
 44 {                                              << 
 45 }                                              << 
 46                                                << 
 47 G4EqMagElectricField::~G4EqMagElectricField()  << 
 48                                                    43 
 49 void                                               44 void  
 50 G4EqMagElectricField::SetChargeMomentumMass(G4 <<  45 G4EqMagElectricField::SetChargeMomentumMass(G4double particleCharge, // e+ units
 51                                             G4 <<  46                                 G4double,
 52                                             G4     47                                             G4double particleMass)
 53 {                                                  48 {
 54    G4double pcharge = particleCharge.GetCharge <<  49    fElectroMagCof =  eplus*particleCharge*c_light ;
 55    fElectroMagCof =  eplus*pcharge*c_light ;   << 
 56    fMassCof = particleMass*particleMass ;          50    fMassCof = particleMass*particleMass ; 
 57 }                                                  51 }
 58                                                    52 
                                                   >>  53 
                                                   >>  54 
 59 void                                               55 void
 60 G4EqMagElectricField::EvaluateRhsGivenB(const      56 G4EqMagElectricField::EvaluateRhsGivenB(const G4double y[],
 61                                         const  <<  57                       const G4double Field[],
 62                                                <<  58                       G4double dydx[] ) const
 63 {                                                  59 {
                                                   >>  60 
 64    // Components of y:                             61    // Components of y:
 65    //    0-2 dr/ds,                                62    //    0-2 dr/ds, 
 66    //    3-5 dp/ds - momentum derivatives          63    //    3-5 dp/ds - momentum derivatives 
 67                                                    64 
 68    G4double pSquared = y[3]*y[3] + y[4]*y[4] +     65    G4double pSquared = y[3]*y[3] + y[4]*y[4] + y[5]*y[5] ;
 69                                                    66 
 70    G4double Energy   = std::sqrt( pSquared + f     67    G4double Energy   = std::sqrt( pSquared + fMassCof );
 71    G4double cof2     = Energy/c_light ;            68    G4double cof2     = Energy/c_light ;
 72                                                    69 
 73    G4double pModuleInverse  = 1.0/std::sqrt(pS     70    G4double pModuleInverse  = 1.0/std::sqrt(pSquared) ;
 74                                                    71 
                                                   >>  72    //  G4double inverse_velocity = Energy * c_light * pModuleInverse;
 75    G4double inverse_velocity = Energy * pModul     73    G4double inverse_velocity = Energy * pModuleInverse / c_light;
 76                                                    74 
 77    G4double cof1     = fElectroMagCof*pModuleI     75    G4double cof1     = fElectroMagCof*pModuleInverse ;
 78                                                    76 
                                                   >>  77    //  G4double vDotE = y[3]*Field[3] + y[4]*Field[4] + y[5]*Field[5] ;
                                                   >>  78 
                                                   >>  79 
 79    dydx[0] = y[3]*pModuleInverse ;                 80    dydx[0] = y[3]*pModuleInverse ;                         
 80    dydx[1] = y[4]*pModuleInverse ;                 81    dydx[1] = y[4]*pModuleInverse ;                         
 81    dydx[2] = y[5]*pModuleInverse ;                 82    dydx[2] = y[5]*pModuleInverse ;                        
 82                                                    83 
 83    dydx[3] = cof1*(cof2*Field[3] + (y[4]*Field     84    dydx[3] = cof1*(cof2*Field[3] + (y[4]*Field[2] - y[5]*Field[1])) ;
 84                                                    85    
 85    dydx[4] = cof1*(cof2*Field[4] + (y[5]*Field     86    dydx[4] = cof1*(cof2*Field[4] + (y[5]*Field[0] - y[3]*Field[2])) ; 
 86                                                    87  
 87    dydx[5] = cof1*(cof2*Field[5] + (y[3]*Field     88    dydx[5] = cof1*(cof2*Field[5] + (y[3]*Field[1] - y[4]*Field[0])) ;  
 88                                                    89 
 89    dydx[6] = 0.;//not used                     << 
 90                                                << 
 91    // Lab Time of flight                           90    // Lab Time of flight
 92    //                                          << 
 93    dydx[7] = inverse_velocity;                     91    dydx[7] = inverse_velocity;
 94                                                <<  92    return ;
 95    return;                                     << 
 96 }                                                  93 }
 97                                                    94