Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4QuadrupoleMagField.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/G4QuadrupoleMagField.cc (Version 11.3.0) and /geometry/magneticfield/src/G4QuadrupoleMagField.cc (Version 9.6.p4)


  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 // G4QuadrupoleMagField implementation         << 
 27 //                                                 26 //
 28 // 03.02.1997, V.Grichine - Created            <<  27 // $Id: G4QuadrupoleMagField.cc 69786 2013-05-15 09:38:51Z gcosmo $
 29 // 11.05.2012, B.Riese  - Allow displaced orig <<  28 //
 30 // -------------------------------------------     29 // -------------------------------------------------------------------
 31                                                    30 
 32 #include "G4QuadrupoleMagField.hh"                 31 #include "G4QuadrupoleMagField.hh"
 33 #include "G4RotationMatrix.hh"                     32 #include "G4RotationMatrix.hh"
 34                                                    33 
 35 namespace                                      <<  34 static G4RotationMatrix IdentityMatrix; 
 36 {                                              << 
 37    G4RotationMatrix IdentityMatrix;            << 
 38 }                                              << 
 39                                                    35 
 40 G4QuadrupoleMagField::G4QuadrupoleMagField(G4d     36 G4QuadrupoleMagField::G4QuadrupoleMagField(G4double pGradient)
 41 {                                                  37 {
 42    fGradient = pGradient;                      << 
 43    fpMatrix  = &IdentityMatrix;                << 
 44 }                                              << 
 45                                                << 
 46 // ------------------------------------------- << 
 47                                                    38 
 48 G4QuadrupoleMagField::G4QuadrupoleMagField(G4d << 
 49                                            con << 
 50                                            G4R << 
 51 {                                              << 
 52    fGradient = pGradient ;                         39    fGradient = pGradient ;
 53    fOrigin   = pOrigin ;                       <<  40    fOrigin      = G4ThreeVector( 0.0, 0.0, 0.0) ;
 54    fpMatrix  = pMatrix ;                       <<  41    fpMatrix      = &IdentityMatrix;
 55 }                                                  42 }
 56                                                    43 
 57 // ------------------------------------------- <<  44 /////////////////////////////////////////////////////////////////////////
 58                                                    45 
 59 G4Field* G4QuadrupoleMagField::Clone() const   <<  46 G4QuadrupoleMagField::G4QuadrupoleMagField(G4double pGradient, G4ThreeVector
                                                   >>  47 pOrigin, G4RotationMatrix* pMatrix)
 60 {                                                  48 {
 61    return new G4QuadrupoleMagField(fGradient,  <<  49    fGradient    = pGradient ;
                                                   >>  50    fOrigin      = pOrigin ;
                                                   >>  51    fpMatrix      = pMatrix ;
 62 }                                                  52 }
 63                                                    53 
 64 // ------------------------------------------- <<  54 /////////////////////////////////////////////////////////////////////////
 65                                                    55 
 66 G4QuadrupoleMagField::~G4QuadrupoleMagField()  <<  56 G4QuadrupoleMagField::~G4QuadrupoleMagField()
                                                   >>  57 {
                                                   >>  58 }
 67                                                    59 
 68 // ------------------------------------------- <<  60 ////////////////////////////////////////////////////////////////////////
                                                   >>  61 //  Allow displaced origin and rotation 
                                                   >>  62 //  Extensions by Björn Riese (GSI)
 69                                                    63 
 70 void G4QuadrupoleMagField::GetFieldValue( cons <<  64 void G4QuadrupoleMagField::GetFieldValue( const G4double y[7],
 71                                                <<  65                                                 G4double B[3]  ) const  
 72 {                                                  66 {
 73   //  with displaced origin and rotation       << 
 74                                                    67 
 75   G4ThreeVector r_global = G4ThreeVector(y[0]  <<  68    G4ThreeVector r_global = G4ThreeVector(
 76                                          y[1]  <<  69         y[0] - fOrigin.x(), 
 77                                          y[2]  <<  70         y[1] - fOrigin.y(), 
 78                                                <<  71         y[2] - fOrigin.z());
 79   const G4ThreeVector r_local = (*fpMatrix) *  <<  72 
 80   const G4ThreeVector B_local( fGradient * r_l <<  73    G4ThreeVector r_local = G4ThreeVector(
 81                                fGradient * r_l <<  74            fpMatrix->colX() * r_global,
 82   const G4ThreeVector B_global = fpMatrix->inv <<  75            fpMatrix->colY() * r_global,
 83                                                <<  76            fpMatrix->colZ() * r_global);
 84   B[0] = B_global.x();                         <<  77 
 85   B[1] = B_global.y();                         <<  78    G4ThreeVector B_local = G4ThreeVector(
 86   B[2] = B_global.z();                         <<  79            fGradient * r_local.y(),
                                                   >>  80         fGradient * r_local.x(),
                                                   >>  81         0);
                                                   >>  82 
                                                   >>  83    G4ThreeVector B_global = G4ThreeVector(
                                                   >>  84            fpMatrix->inverse().rowX() * B_local,
                                                   >>  85            fpMatrix->inverse().rowY() * B_local,
                                                   >>  86            fpMatrix->inverse().rowZ() * B_local);
                                                   >>  87 
                                                   >>  88    B[0] = B_global.x() ;
                                                   >>  89    B[1] = B_global.y() ;
                                                   >>  90    B[2] = B_global.z() ;
 87 }                                                  91 }
 88                                                    92