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 10.5.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 // G4MagInt_Driver inline methods implementati << 
 27 //                                                 26 //
 28 // V.Grichine, 07.10.1996 - Created            <<  27 //
 29 // -------------------------------------------     28 // --------------------------------------------------------------------
 30                                                    29 
 31 inline                                             30 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          31 G4double G4MagInt_Driver::GetHmin() const
 48 {                                                  32 {
 49   return fMinimumStep;                         <<  33       return fMinimumStep;
 50 }                                                  34 } 
 51                                                    35 
 52 inline                                             36 inline
 53 G4double G4MagInt_Driver::Hmin() const             37 G4double G4MagInt_Driver::Hmin() const
 54 {                                                  38 {
 55   return fMinimumStep;                         <<  39       return fMinimumStep;
 56 }                                                  40 }
 57                                                    41 
 58 inline                                             42 inline
 59 G4double G4MagInt_Driver::GetSafety() const        43 G4double G4MagInt_Driver::GetSafety() const
 60 {                                                  44 {
 61   return safety;                               <<  45       return safety;
 62 }                                                  46 }
 63                                                    47 
 64 inline                                             48 inline
 65 G4double G4MagInt_Driver::GetPshrnk() const        49 G4double G4MagInt_Driver::GetPshrnk() const
 66 {                                                  50 {
 67   return pshrnk;                               <<  51       return pshrnk;
 68 }                                                  52 } 
 69                                                    53 
 70 inline                                             54 inline
 71 G4double G4MagInt_Driver::GetPgrow() const         55 G4double G4MagInt_Driver::GetPgrow() const
 72 {                                                  56 {
 73   return pgrow;                                <<  57       return pgrow;
 74 }                                                  58 }
 75                                                    59  
 76 inline                                             60 inline
 77 G4double G4MagInt_Driver::GetErrcon() const        61 G4double G4MagInt_Driver::GetErrcon() const
 78 {                                                  62 {
 79   return errcon;                               <<  63       return errcon;
 80 }                                                  64 }
 81                                                    65 
 82 inline                                             66 inline
 83 void G4MagInt_Driver::SetHmin(G4double newval)     67 void G4MagInt_Driver::SetHmin(G4double newval)
 84 {                                                  68 {
 85   fMinimumStep = newval;                       <<  69       fMinimumStep = newval;
 86 }                                                  70 } 
 87                                                    71 
 88 inline                                             72 inline
 89 G4double G4MagInt_Driver::ComputeAndSetErrcon(     73 G4double G4MagInt_Driver::ComputeAndSetErrcon()
 90 {                                                  74 {
 91   errcon = std::pow(max_stepping_increase/GetS <<  75       errcon = std::pow(max_stepping_increase/GetSafety(),1.0/GetPgrow());
 92   return errcon;                               <<  76       return errcon;
 93 }                                                  77 } 
 94                                                    78 
 95 inline                                             79 inline
 96 void G4MagInt_Driver::ReSetParameters(G4double     80 void G4MagInt_Driver::ReSetParameters(G4double new_safety)
 97 {                                                  81 {
 98   safety = new_safety;                         <<  82       safety = new_safety;
 99   pshrnk = -1.0 / pIntStepper->IntegratorOrder <<  83       pshrnk = -1.0 / pIntStepper->IntegratorOrder();
100   pgrow  = -1.0 / (1.0 + pIntStepper->Integrat <<  84       pgrow  = -1.0 / (1.0 + pIntStepper->IntegratorOrder());
101   ComputeAndSetErrcon();                       <<  85       ComputeAndSetErrcon();
102 }                                                  86 }
103                                                    87 
104 inline                                             88 inline
105 void G4MagInt_Driver::SetSafety(G4double val)      89 void G4MagInt_Driver::SetSafety(G4double val)
106 {                                                  90 { 
107   safety = val;                                <<  91       safety=val;
108   ComputeAndSetErrcon();                       <<  92       ComputeAndSetErrcon();
109 }                                                  93 }
110                                                    94 
111 inline                                             95 inline
112 void G4MagInt_Driver::SetPgrow(G4double  val)      96 void G4MagInt_Driver::SetPgrow(G4double  val)
113 {                                                  97 { 
114   pgrow = val;                                 <<  98       pgrow=val;
115   ComputeAndSetErrcon();                       <<  99       ComputeAndSetErrcon(); 
116 }                                                 100 }
117                                                   101 
118 inline                                            102 inline
119 void G4MagInt_Driver::SetErrcon(G4double val)     103 void G4MagInt_Driver::SetErrcon(G4double val)
120 {                                                 104 { 
121   errcon = val;                                << 105       errcon=val;
122 }                                                 106 }
123                                                   107 
124 inline                                            108 inline
125 G4int G4MagInt_Driver::GetMaxNoSteps() const      109 G4int G4MagInt_Driver::GetMaxNoSteps() const
126 {                                                 110 {
127   return fMaxNoSteps;                             111   return fMaxNoSteps;
128 }                                                 112 }
129                                                   113 
130 inline                                            114 inline
131 void G4MagInt_Driver::SetMaxNoSteps(G4int val)    115 void G4MagInt_Driver::SetMaxNoSteps(G4int val)
132 {                                                 116 {
133   fMaxNoSteps = val;                           << 117   fMaxNoSteps= val;
134 }                                                 118 }
135                                                   119 
136 inline                                            120 inline
137 G4int G4MagInt_Driver::GetVerboseLevel() const    121 G4int G4MagInt_Driver::GetVerboseLevel() const
138 {                                                 122 {
139   return fVerboseLevel;                        << 123       return fVerboseLevel;
140 }                                                 124 } 
141                                                   125 
142 inline                                            126 inline 
143 void G4MagInt_Driver::SetVerboseLevel(G4int ne    127 void G4MagInt_Driver::SetVerboseLevel(G4int newLevel)
144 {                                                 128 {
145   fVerboseLevel = newLevel;                    << 129       fVerboseLevel= newLevel;
146 }                                                 130 }
147                                                   131 
148 inline                                            132 inline
149 G4double G4MagInt_Driver::GetSmallestFraction(    133 G4double G4MagInt_Driver::GetSmallestFraction() const
150 {                                                 134 {
151   return fSmallestFraction;                    << 135       return fSmallestFraction; 
152 }                                                 136 }
                                                   >> 137 
153                                                   138