Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4HarmonicPolMagField.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/G4HarmonicPolMagField.cc (Version 11.3.0) and /geometry/magneticfield/src/G4HarmonicPolMagField.cc (Version 8.3.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 // G4HarmonicPolMagField implementation        << 
 27 //                                                 26 //
 28 // Author: V.Grichine, 03.02.1997              <<  27 // $Id: G4HarmonicPolMagField.cc,v 1.6 2006/06/29 18:24:00 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-03-patch-01 $
                                                   >>  29 //
 29 // -------------------------------------------     30 // -------------------------------------------------------------------
 30                                                    31 
 31 #include "G4HarmonicPolMagField.hh"                32 #include "G4HarmonicPolMagField.hh"
 32 #include "globals.hh"                              33 #include "globals.hh"
 33                                                    34 
 34 G4HarmonicPolMagField::G4HarmonicPolMagField() <<  35 G4HarmonicPolMagField::G4HarmonicPolMagField()
 35                                                << 
 36 G4HarmonicPolMagField* G4HarmonicPolMagField:: << 
 37 {                                                  36 {
 38   return new G4HarmonicPolMagField;            << 
 39 }                                                  37 }
 40                                                    38 
 41 // ------------------------------------------- <<  39 /////////////////////////////////////////////////////////////////////////  
 42                                                    40 
 43 G4HarmonicPolMagField::~G4HarmonicPolMagField( <<  41 G4HarmonicPolMagField::~G4HarmonicPolMagField()
                                                   >>  42 {
                                                   >>  43 }
                                                   >>  44 
                                                   >>  45 /////////////////////////////////////////////////////////////////////////
 44                                                    46 
 45 // ------------------------------------------- << 
 46                                                    47 
 47 void G4HarmonicPolMagField::GetFieldValue(cons <<  48 void G4HarmonicPolMagField::GetFieldValue(const G4double yTrack[7],
 48                                                <<  49                                                 G4double B[3]     ) const  
 49 {                                                  50 {
                                                   >>  51    G4int i ;
 50    G4double a = 1.00 ;   // mm -> m                52    G4double a = 1.00 ;   // mm -> m 
 51    G4double x = a*yTrack[0], y = a*yTrack[1],      53    G4double x = a*yTrack[0], y = a*yTrack[1], z = a*yTrack[2] ;
 52    G4double x2 = x*x, y2 = y*y, z2 = z*z ;         54    G4double x2 = x*x, y2 = y*y, z2 = z*z ;
 53    G4double x3 = x2*x, y3 = y2*y, z3 = z2*z ;      55    G4double x3 = x2*x, y3 = y2*y, z3 = z2*z ;
 54    G4double xy = x*y, xz = x*z, yz = y*z, xyz      56    G4double xy = x*y, xz = x*z, yz = y*z, xyz = x*y*z ;
 55    static G4ThreadLocal G4double               <<  57    static G4double
 56    c[24] = {                                       58    c[24] = {
 57              .010, .010, .010,                     59              .010, .010, .010,                                       // 3(0)
 58              .0001, .0001, .0001, .0001, .0001 <<  60        .0001, .0001, .0001, .0001, .0001,                      // 5(1)
 59              .00001, .00001, .00001, .00001, . <<  61        .00001, .00001, .00001, .00001, .00001, .00001, .00001, // 7(2)
 60              .000001, .000001, .000001, .00000 <<  62        .000001, .000001, .000001, .000001, .000001, .000001,
 61              .0000001, .0000001, .0000001      <<  63        .0000001, .0000001, .0000001                            // 9(3)
 62             } ;                                    64             } ;                                            // total :   24
 63                                                    65    
 64    //   for(auto i=0;i<24; ++i)                <<  66    //   for(i=0;i<24;i++)
 65    //   {                                          67    //   {
 66    //      c[i] = 1.0*c[i] ;                       68    //      c[i] = 1.0*c[i] ;
 67    //   }                                          69    //   }
 68    B[0] =  c[1]                                    70    B[0] =  c[1]
 69           -2*c[3]*x + c[4]*z +c[6]*y -2*c[7]*x     71           -2*c[3]*x + c[4]*z +c[6]*y -2*c[7]*x
 70           -6*c[8]*xz + c[9]*(z2-x2) -2*c[10]*x     72           -6*c[8]*xz + c[9]*(z2-x2) -2*c[10]*xy + c[11]*yz - 2*c[12]*xz
 71           +c[13]*(y2-x2) - 6*c[14]*xy              73           +c[13]*(y2-x2) - 6*c[14]*xy
 72           -4*c[15]*(3*x*z2-x3) +c[16]*(z3-3*x2     74           -4*c[15]*(3*x*z2-x3) +c[16]*(z3-3*x2*z) - 6*c[17]*xyz +c[18]*y*(z2-x2)
 73           -2*c[19]*(x*z2+x*y2-2*x3/3) + c[20]*     75           -2*c[19]*(x*z2+x*y2-2*x3/3) + c[20]*z*(y2-x2) - 6*c[21]*xyz
 74           +c[22]*(y3-3*x2*y) - 4*c[23]*(3*x*y2     76           +c[22]*(y3-3*x2*y) - 4*c[23]*(3*x*y2-x3) ;
 75                                                    77    
 76    B[1] =  c[2]                                    78    B[1] =  c[2]
 77           +c[5]*z + c[6]*x + 2*c[7]*y              79           +c[5]*z + c[6]*x + 2*c[7]*y
 78           +c[10]*(z2-x2) + c[11]*xz +2*c[12]*y     80           +c[10]*(z2-x2) + c[11]*xz +2*c[12]*yz +2*c[13]*xy + 3*c[14]*(y2-x2)
 79           +c[17]*(z3-3*x2*z) + c[18]*(x*z2-x3/ <<  81     +c[17]*(z3-3*x2*z) + c[18]*(x*z2-x3/3) +2*c[19]*y*(z2-x2)
 80           +2*c[20]*xyz                             82           +2*c[20]*xyz
 81           +3*c[21]*z*(y2-x2) + c[22]*(3*x*y2-x     83           +3*c[21]*z*(y2-x2) + c[22]*(3*x*y2-x3) + 4*c[23]*(y3-3*x2*y) ;
 82                                                    84    
 83    B[2] =  c[0]                                    85    B[2] =  c[0]
 84           +c[3]*z + c[4]*x + c[5]*y                86           +c[3]*z + c[4]*x + c[5]*y
 85           +3*c[8]*(z2-x2) + 2*c[9]*xz + 2*c[10     87           +3*c[8]*(z2-x2) + 2*c[9]*xz + 2*c[10]*yz + c[11]*xy + c[12]*(y2-x2)
 86           +4*c[15]*(z3-3*x2*z) + c[16]*(3*x*z2     88           +4*c[15]*(z3-3*x2*z) + c[16]*(3*x*z2-x3) + 3*c[17]*(y*z2-x2*y)
 87           +2*c[18]*xyz                             89           +2*c[18]*xyz
 88           +2*c[19]*z*(y2-x2) + c[20]*(x*y2-x3/     90           +2*c[19]*z*(y2-x2) + c[20]*(x*y2-x3/3) + c[21]*(y3-3*x2*y) ;
 89    for(auto i=0; i<3 ; ++i)                    <<  91    for(i=0;i<3;i++)
 90    {                                               92    {
 91       B[i] = 0.1*B[i] ;                            93       B[i] = 0.1*B[i] ;
 92    }                                               94    }
 93 }                                                  95 }
 94                                                    96 
 95 // -------------------------------------------     97 // -----------------------------------------------------------------
 96                                                    98