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 5.2.p1)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                    <<   3 // * DISCLAIMER                                                       *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th <<   5 // * The following disclaimer summarizes all the specific disclaimers *
  6 // * the Geant4 Collaboration.  It is provided <<   6 // * of contributors to this software. The specific disclaimers,which *
  7 // * conditions of the Geant4 Software License <<   7 // * govern, are listed with their locations in:                      *
  8 // * LICENSE and available at  http://cern.ch/ <<   8 // *   http://cern.ch/geant4/license                                  *
  9 // * include a list of copyright holders.      << 
 10 // *                                                9 // *                                                                  *
 11 // * Neither the authors of this software syst     10 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     11 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     12 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     13 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file  <<  14 // * use.                                                             *
 16 // * for the full disclaimer and the limitatio << 
 17 // *                                               15 // *                                                                  *
 18 // * This  code  implementation is the result  <<  16 // * This  code  implementation is the  intellectual property  of the *
 19 // * technical work of the GEANT4 collaboratio <<  17 // * GEANT4 collaboration.                                            *
 20 // * By using,  copying,  modifying or  distri <<  18 // * By copying,  distributing  or modifying the Program (or any work *
 21 // * any work based  on the software)  you  ag <<  19 // * based  on  the Program)  you indicate  your  acceptance of  this *
 22 // * use  in  resulting  scientific  publicati <<  20 // * statement, and all its terms.                                    *
 23 // * acceptance of all terms of the Geant4 Sof << 
 24 // *******************************************     21 // ********************************************************************
 25 //                                                 22 //
 26 // G4QuadrupoleMagField implementation         << 
 27 //                                             << 
 28 // 03.02.1997, V.Grichine - Created            << 
 29 // 11.05.2012, B.Riese  - Allow displaced orig << 
 30 // ------------------------------------------- << 
 31                                                << 
 32 #include "G4QuadrupoleMagField.hh"                 23 #include "G4QuadrupoleMagField.hh"
 33 #include "G4RotationMatrix.hh"                 <<  24 #include "globals.hh"
                                                   >>  25 #include "geomdefs.hh"
                                                   >>  26 
 34                                                    27 
 35 namespace                                      << 
 36 {                                              << 
 37    G4RotationMatrix IdentityMatrix;            << 
 38 }                                              << 
 39                                                    28 
 40 G4QuadrupoleMagField::G4QuadrupoleMagField(G4d     29 G4QuadrupoleMagField::G4QuadrupoleMagField(G4double pGradient)
 41 {                                                  30 {
 42    fGradient = pGradient;                      <<  31    fGradient = pGradient ;
 43    fpMatrix  = &IdentityMatrix;                << 
 44 }                                                  32 }
 45                                                    33 
 46 // ------------------------------------------- <<  34 /////////////////////////////////////////////////////////////////////////
 47                                                    35 
 48 G4QuadrupoleMagField::G4QuadrupoleMagField(G4d <<  36 G4QuadrupoleMagField::~G4QuadrupoleMagField()
 49                                            con << 
 50                                            G4R << 
 51 {                                                  37 {
 52    fGradient = pGradient ;                     <<  38    ;
 53    fOrigin   = pOrigin ;                       << 
 54    fpMatrix  = pMatrix ;                       << 
 55 }                                                  39 }
 56                                                    40 
 57 // ------------------------------------------- <<  41 ////////////////////////////////////////////////////////////////////////
                                                   >>  42 
 58                                                    43 
 59 G4Field* G4QuadrupoleMagField::Clone() const   <<  44 void
                                                   >>  45    G4QuadrupoleMagField::GetFieldValue( const G4double y[7],
                                                   >>  46                                               G4double B[3]  ) const  
 60 {                                                  47 {
 61    return new G4QuadrupoleMagField(fGradient,  <<  48    //   G4double fGradient = 0.001 ;   // Tesla/mm
                                                   >>  49    B[0] = fGradient*y[1] ;
                                                   >>  50    B[1] = fGradient*y[0] ;
                                                   >>  51    B[2] = 0 ;
                                                   >>  52    return ;
 62 }                                                  53 }
 63                                                    54 
 64 // ------------------------------------------- << 
 65                                                << 
 66 G4QuadrupoleMagField::~G4QuadrupoleMagField()  << 
 67                                                    55 
 68 // ------------------------------------------- << 
 69                                                    56 
 70 void G4QuadrupoleMagField::GetFieldValue( cons << 
 71                                                << 
 72 {                                              << 
 73   //  with displaced origin and rotation       << 
 74                                                << 
 75   G4ThreeVector r_global = G4ThreeVector(y[0]  << 
 76                                          y[1]  << 
 77                                          y[2]  << 
 78                                                << 
 79   const G4ThreeVector r_local = (*fpMatrix) *  << 
 80   const G4ThreeVector B_local( fGradient * r_l << 
 81                                fGradient * r_l << 
 82   const G4ThreeVector B_global = fpMatrix->inv << 
 83                                                << 
 84   B[0] = B_global.x();                         << 
 85   B[1] = B_global.y();                         << 
 86   B[2] = B_global.z();                         << 
 87 }                                              << 
 88                                                    57