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