Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4HelixHeum.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/G4HelixHeum.cc (Version 11.3.0) and /geometry/magneticfield/src/G4HelixHeum.cc (Version 9.6.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 // G4HelixHeum implementation                  << 
 27 //                                                 26 //
 28 // Simple Heum:                                <<  27 // $Id$
                                                   >>  28 //
                                                   >>  29 //
                                                   >>  30 //  Simple Heum:
 29 //        x_1 = x_0 + h *                          31 //        x_1 = x_0 + h *
 30 //                1/4 * dx(t0,x0)  +               32 //                1/4 * dx(t0,x0)  +
 31 //                3/4 * dx(t0+2/3*h, x0+2/3*h*     33 //                3/4 * dx(t0+2/3*h, x0+2/3*h*(dx(t0+h/3,x0+h/3*dx(t0,x0)))) 
 32 //                                                 34 //
 33 //  Third order solver.                            35 //  Third order solver.
 34 //                                                 36 //
 35 // Author: W.Wander <wwc@mit.edu>, 03/11/1998  <<  37 //  W.Wander <wwc@mit.edu> 12/09/97 
 36 // -------------------------------------------     38 // -------------------------------------------------------------------
 37                                                    39 
 38 #include "G4HelixHeum.hh"                          40 #include "G4HelixHeum.hh"
 39 #include "G4ThreeVector.hh"                        41 #include "G4ThreeVector.hh"
 40                                                    42 
 41 G4HelixHeum::G4HelixHeum(G4Mag_EqRhs* EqRhs)   << 
 42   : G4MagHelicalStepper(EqRhs)                 << 
 43 {                                              << 
 44 }                                              << 
 45                                                << 
 46 G4HelixHeum::~G4HelixHeum() = default;         << 
 47                                                << 
 48 void                                               43 void
 49 G4HelixHeum::DumbStepper( const G4double  yIn[     44 G4HelixHeum::DumbStepper( const G4double  yIn[],
 50                           G4ThreeVector   Bfld <<  45         G4ThreeVector   Bfld,
 51                           G4double        h,   <<  46         G4double        h,
 52                           G4double        yOut <<  47         G4double        yOut[])
 53 {                                                  48 {
 54   const G4int nvar = 6 ;                           49   const G4int nvar = 6 ;
 55                                                    50 
 56   G4ThreeVector Bfield_Temp, Bfield_Temp2;         51   G4ThreeVector Bfield_Temp, Bfield_Temp2;
 57   G4double yTemp[6], yAdd1[6], yAdd2[6] , yTem     52   G4double yTemp[6], yAdd1[6], yAdd2[6] , yTemp2[6];
 58                                                    53 
                                                   >>  54   G4int i;
                                                   >>  55 
 59   AdvanceHelix( yIn, Bfld, h, yAdd1 );             56   AdvanceHelix( yIn, Bfld, h, yAdd1 );
 60                                                    57   
 61   AdvanceHelix( yIn, Bfld, h/3.0, yTemp );         58   AdvanceHelix( yIn, Bfld, h/3.0, yTemp );
 62   MagFieldEvaluate(yTemp,Bfield_Temp);             59   MagFieldEvaluate(yTemp,Bfield_Temp);
 63                                                    60 
 64   AdvanceHelix( yIn, Bfield_Temp, (2.0 / 3.0)      61   AdvanceHelix( yIn, Bfield_Temp, (2.0 / 3.0) * h, yTemp2 );
 65                                                    62   
 66   MagFieldEvaluate(yTemp2,Bfield_Temp2);           63   MagFieldEvaluate(yTemp2,Bfield_Temp2);
 67                                                    64 
 68   AdvanceHelix( yIn, Bfield_Temp2, h, yAdd2 );     65   AdvanceHelix( yIn, Bfield_Temp2, h, yAdd2 );
 69                                                    66 
 70   for( G4int i = 0; i < nvar; ++i )            <<  67   for( i = 0; i < nvar; i++ ) {
 71   {                                            << 
 72     yOut[i] = ( 0.25 * yAdd1[i] + 0.75 * yAdd2     68     yOut[i] = ( 0.25 * yAdd1[i] + 0.75 * yAdd2[i]);
 73   }                                                69   }
 74                                                    70 
 75   // NormaliseTangentVector( yOut );               71   // NormaliseTangentVector( yOut );           
 76 }                                                  72 }  
 77                                                    73