Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/include/G4MagIntegratorDriver.icc

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/include/G4MagIntegratorDriver.icc (Version 11.3.0) and /geometry/magneticfield/include/G4MagIntegratorDriver.icc (Version 6.2.p2)


  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 // G4MagInt_Driver inline methods implementati << 
 27 //                                                 23 //
 28 // V.Grichine, 07.10.1996 - Created            <<  24 // $Id: G4MagIntegratorDriver.icc,v 1.9 2003/10/31 14:35:52 gcosmo Exp $
                                                   >>  25 // GEANT4 tag $Name: geant4-06-00-patch-01 $
                                                   >>  26 //
 29 // -------------------------------------------     27 // --------------------------------------------------------------------
 30                                                    28 
 31 inline                                             29 inline
 32 G4double G4MagInt_Driver::                     << 
 33 AdvanceChordLimited(G4FieldTrack& track, G4dou << 
 34                     G4double epsStep, G4double << 
 35 {                                              << 
 36   return ChordFinderDelegate::AdvanceChordLimi << 
 37                                                << 
 38 }                                              << 
 39                                                << 
 40 inline                                         << 
 41 void G4MagInt_Driver::OnStartTracking()        << 
 42 {                                              << 
 43   ChordFinderDelegate::ResetStepEstimate();    << 
 44 }                                              << 
 45                                                << 
 46 inline                                         << 
 47 G4double G4MagInt_Driver::GetHmin() const          30 G4double G4MagInt_Driver::GetHmin() const
 48 {                                                  31 {
 49   return fMinimumStep;                         <<  32       return fMinimumStep;
 50 }                                                  33 } 
 51                                                    34 
 52 inline                                             35 inline
 53 G4double G4MagInt_Driver::Hmin() const             36 G4double G4MagInt_Driver::Hmin() const
 54 {                                                  37 {
 55   return fMinimumStep;                         <<  38       return fMinimumStep;
 56 }                                                  39 }
 57                                                    40 
 58 inline                                             41 inline
 59 G4double G4MagInt_Driver::GetSafety() const        42 G4double G4MagInt_Driver::GetSafety() const
 60 {                                                  43 {
 61   return safety;                               <<  44       return safety;
 62 }                                                  45 }
 63                                                    46 
 64 inline                                             47 inline
 65 G4double G4MagInt_Driver::GetPshrnk() const        48 G4double G4MagInt_Driver::GetPshrnk() const
 66 {                                                  49 {
 67   return pshrnk;                               <<  50       return pshrnk;
 68 }                                                  51 } 
 69                                                    52 
 70 inline                                             53 inline
 71 G4double G4MagInt_Driver::GetPgrow() const         54 G4double G4MagInt_Driver::GetPgrow() const
 72 {                                                  55 {
 73   return pgrow;                                <<  56       return pgrow;
 74 }                                                  57 }
 75                                                    58  
 76 inline                                             59 inline
 77 G4double G4MagInt_Driver::GetErrcon() const        60 G4double G4MagInt_Driver::GetErrcon() const
 78 {                                                  61 {
 79   return errcon;                               <<  62       return errcon;
 80 }                                                  63 }
 81                                                    64 
 82 inline                                             65 inline
 83 void G4MagInt_Driver::SetHmin(G4double newval)     66 void G4MagInt_Driver::SetHmin(G4double newval)
 84 {                                                  67 {
 85   fMinimumStep = newval;                       <<  68       fMinimumStep = newval;
 86 }                                                  69 } 
 87                                                    70 
 88 inline                                             71 inline
 89 G4double G4MagInt_Driver::ComputeAndSetErrcon(     72 G4double G4MagInt_Driver::ComputeAndSetErrcon()
 90 {                                                  73 {
 91   errcon = std::pow(max_stepping_increase/GetS <<  74       errcon = pow(max_stepping_increase/GetSafety(),1.0/GetPgrow());
 92   return errcon;                               <<  75       return errcon;
 93 }                                                  76 } 
 94                                                    77 
 95 inline                                             78 inline
 96 void G4MagInt_Driver::ReSetParameters(G4double     79 void G4MagInt_Driver::ReSetParameters(G4double new_safety)
 97 {                                                  80 {
 98   safety = new_safety;                         <<  81       safety = new_safety;
 99   pshrnk = -1.0 / pIntStepper->IntegratorOrder <<  82       pshrnk = -1.0 / pIntStepper->IntegratorOrder();
100   pgrow  = -1.0 / (1.0 + pIntStepper->Integrat <<  83       pgrow  = -1.0 / (1.0 + pIntStepper->IntegratorOrder());
101   ComputeAndSetErrcon();                       <<  84       ComputeAndSetErrcon();
102 }                                                  85 }
103                                                    86 
104 inline                                             87 inline
105 void G4MagInt_Driver::SetSafety(G4double val)      88 void G4MagInt_Driver::SetSafety(G4double val)
106 {                                                  89 { 
107   safety = val;                                <<  90       safety=val;
108   ComputeAndSetErrcon();                       <<  91       ComputeAndSetErrcon();
109 }                                                  92 }
110                                                    93 
111 inline                                             94 inline
112 void G4MagInt_Driver::SetPgrow(G4double  val)      95 void G4MagInt_Driver::SetPgrow(G4double  val)
113 {                                                  96 { 
114   pgrow = val;                                 <<  97       pgrow=val;
115   ComputeAndSetErrcon();                       <<  98       ComputeAndSetErrcon(); 
116 }                                                  99 }
117                                                   100 
118 inline                                            101 inline
119 void G4MagInt_Driver::SetErrcon(G4double val)     102 void G4MagInt_Driver::SetErrcon(G4double val)
120 {                                                 103 { 
121   errcon = val;                                << 104       errcon=val;
                                                   >> 105 }
                                                   >> 106 
                                                   >> 107 inline
                                                   >> 108 void G4MagInt_Driver::RenewStepperAndAdjust(G4MagIntegratorStepper *pItsStepper)
                                                   >> 109 {  
                                                   >> 110       pIntStepper = pItsStepper; 
                                                   >> 111       ReSetParameters();
                                                   >> 112 }
                                                   >> 113 
                                                   >> 114 inline
                                                   >> 115 void G4MagInt_Driver::SetChargeMomentumMass(G4double particleCharge, // e+
                                                   >> 116                                             G4double MomentumXc,
                                                   >> 117                                             G4double Mass )
                                                   >> 118 { 
                                                   >> 119       pIntStepper->GetEquationOfMotion()
                                                   >> 120                  ->SetChargeMomentumMass(particleCharge, MomentumXc, Mass); 
                                                   >> 121 }
                                                   >> 122 
                                                   >> 123 inline
                                                   >> 124 const G4MagIntegratorStepper* G4MagInt_Driver::GetStepper() const
                                                   >> 125 {
                                                   >> 126   return pIntStepper;
122 }                                                 127 }
123                                                   128 
124 inline                                            129 inline
125 G4int G4MagInt_Driver::GetMaxNoSteps() const      130 G4int G4MagInt_Driver::GetMaxNoSteps() const
126 {                                                 131 {
127   return fMaxNoSteps;                             132   return fMaxNoSteps;
128 }                                                 133 }
129                                                   134 
130 inline                                            135 inline
131 void G4MagInt_Driver::SetMaxNoSteps(G4int val)    136 void G4MagInt_Driver::SetMaxNoSteps(G4int val)
132 {                                                 137 {
133   fMaxNoSteps = val;                           << 138   fMaxNoSteps= val;
                                                   >> 139 }
                                                   >> 140 
                                                   >> 141 inline
                                                   >> 142 void G4MagInt_Driver::GetDerivatives(const G4FieldTrack y_curr,  // const, INput
                                                   >> 143                                            G4double     dydx[])  // OUTput
                                                   >> 144 { 
                                                   >> 145   G4double  tmpValArr[G4FieldTrack::ncompSVEC];
                                                   >> 146   y_curr.DumpToArray( tmpValArr  );
                                                   >> 147   pIntStepper -> RightHandSide( tmpValArr , dydx );
134 }                                                 148 }
135                                                   149 
136 inline                                            150 inline
137 G4int G4MagInt_Driver::GetVerboseLevel() const << 151 G4double G4MagInt_Driver::GetVerboseLevel() const
138 {                                                 152 {
139   return fVerboseLevel;                        << 153       return fVerboseLevel;
140 }                                                 154 } 
141                                                   155 
142 inline                                            156 inline 
143 void G4MagInt_Driver::SetVerboseLevel(G4int ne    157 void G4MagInt_Driver::SetVerboseLevel(G4int newLevel)
144 {                                                 158 {
145   fVerboseLevel = newLevel;                    << 159       fVerboseLevel= newLevel;
146 }                                              << 
147                                                << 
148 inline                                         << 
149 G4double G4MagInt_Driver::GetSmallestFraction( << 
150 {                                              << 
151   return fSmallestFraction;                    << 
152 }                                                 160 }
153                                                   161