Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/navigation/src/G4PropagatorInField.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/navigation/src/G4PropagatorInField.cc (Version 11.3.0) and /geometry/navigation/src/G4PropagatorInField.cc (Version 10.1)


  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 // class G4PropagatorInField Implementation    <<  26 //
                                                   >>  27 // 
 27 //                                                 28 // 
 28 //  This class implements an algorithm to trac     29 //  This class implements an algorithm to track a particle in a
 29 //  non-uniform magnetic field. It utilises an     30 //  non-uniform magnetic field. It utilises an ODE solver (with
 30 //  the Runge - Kutta method) to evolve the pa     31 //  the Runge - Kutta method) to evolve the particle, and drives it
 31 //  until the particle has traveled a set dist     32 //  until the particle has traveled a set distance or it enters a new 
 32 //  volume.                                        33 //  volume.
 33 //                                                 34 //                                                                     
 34 // 14.10.96 John Apostolakis, design and imple <<  35 // 14.10.96 John Apostolakis,   design and implementation
 35 // 17.03.97 John Apostolakis, renaming new set <<  36 // 17.03.97 John Apostolakis,   renaming new set functions being added
                                                   >>  37 //
                                                   >>  38 // $Id: G4PropagatorInField.cc 69711 2013-05-13 09:22:17Z gcosmo $
                                                   >>  39 // GEANT4 tag $ Name:  $
 36 // -------------------------------------------     40 // ---------------------------------------------------------------------------
 37                                                    41 
 38 #include <iomanip>                                 42 #include <iomanip>
 39                                                    43 
 40 #include "G4PropagatorInField.hh"                  44 #include "G4PropagatorInField.hh"
 41 #include "G4ios.hh"                                45 #include "G4ios.hh"
 42 #include "G4SystemOfUnits.hh"                      46 #include "G4SystemOfUnits.hh"
 43 #include "G4ThreeVector.hh"                        47 #include "G4ThreeVector.hh"
 44 #include "G4Material.hh"                       << 
 45 #include "G4VPhysicalVolume.hh"                    48 #include "G4VPhysicalVolume.hh"
 46 #include "G4Navigator.hh"                          49 #include "G4Navigator.hh"
 47 #include "G4GeometryTolerance.hh"                  50 #include "G4GeometryTolerance.hh"
 48 #include "G4VCurvedTrajectoryFilter.hh"            51 #include "G4VCurvedTrajectoryFilter.hh"
 49 #include "G4ChordFinder.hh"                        52 #include "G4ChordFinder.hh"
 50 #include "G4MultiLevelLocator.hh"                  53 #include "G4MultiLevelLocator.hh"
 51                                                    54 
 52                                                <<  55 ///////////////////////////////////////////////////////////////////////////
 53 // ------------------------------------------- << 
 54 // Constructors and destructor                 << 
 55 //                                                 56 //
 56 G4PropagatorInField::G4PropagatorInField( G4Na <<  57 // Constructors and destructor
 57                                           G4Fi <<  58 
 58                                           G4VI <<  59 G4PropagatorInField::G4PropagatorInField( G4Navigator    *theNavigator, 
 59   : fDetectorFieldMgr(detectorFieldMgr),       <<  60                                           G4FieldManager *detectorFieldMgr,
                                                   >>  61                                           G4VIntersectionLocator *vLocator  )
                                                   >>  62   : 
                                                   >>  63     fMax_loop_count(1000),
                                                   >>  64     fUseSafetyForOptimisation(true),   // (false) is less sensitive to incorrect safety
                                                   >>  65     fZeroStepThreshold( 0.0 ),         // length of what is recognised as 'zero' step
                                                   >>  66     fDetectorFieldMgr(detectorFieldMgr), 
                                                   >>  67     fpTrajectoryFilter( 0 ),
 60     fNavigator(theNavigator),                      68     fNavigator(theNavigator),
 61     fCurrentFieldMgr(detectorFieldMgr),            69     fCurrentFieldMgr(detectorFieldMgr),
                                                   >>  70     fSetFieldMgr(false),
 62     End_PointAndTangent(G4ThreeVector(0.,0.,0.     71     End_PointAndTangent(G4ThreeVector(0.,0.,0.),
 63                         G4ThreeVector(0.,0.,0. <<  72                         G4ThreeVector(0.,0.,0.),0.0,0.0,0.0,0.0,0.0),
 64 {                                              <<  73     fParticleIsLooping(false),
 65   fEpsilonStep = (fDetectorFieldMgr != nullptr <<  74     fNoZeroStep(0), 
 66                ? fDetectorFieldMgr->GetMaximum <<  75     fVerboseLevel(0)
 67                                                <<  76 {
                                                   >>  77   if(fDetectorFieldMgr) { fEpsilonStep = fDetectorFieldMgr->GetMaximumEpsilonStep();}
                                                   >>  78   else                  { fEpsilonStep= 1.0e-5; } 
                                                   >>  79   fActionThreshold_NoZeroSteps = 2; 
                                                   >>  80   fSevereActionThreshold_NoZeroSteps = 10; 
                                                   >>  81   fAbandonThreshold_NoZeroSteps = 50; 
                                                   >>  82   fFull_CurveLen_of_LastAttempt = -1; 
                                                   >>  83   fLast_ProposedStepLength = -1;
                                                   >>  84   fLargestAcceptableStep = 1000.0 * meter;
 68                                                    85 
 69   fPreviousSftOrigin = G4ThreeVector(0.,0.,0.) <<  86   fPreviousSftOrigin= G4ThreeVector(0.,0.,0.);
                                                   >>  87   fPreviousSafety= 0.0;
 70   kCarTolerance = G4GeometryTolerance::GetInst     88   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
 71   fZeroStepThreshold = std::max( 1.0e5 * kCarT <<  89   fZeroStepThreshold= std::max( 1.0e5 * kCarTolerance, 1.0e-1 * micrometer );
 72                                                    90 
 73   fLargestAcceptableStep = 100.0 * meter;  //  << 
 74   fMaxStepSizeMultiplier=   0.1 ;   // 0.1 in  << 
 75   fMinBigDistance= 100. * CLHEP::mm;           << 
 76 #ifdef G4DEBUG_FIELD                               91 #ifdef G4DEBUG_FIELD
 77   G4cout << " PiF: Zero Step Threshold set to      92   G4cout << " PiF: Zero Step Threshold set to "
 78          << fZeroStepThreshold / millimeter        93          << fZeroStepThreshold / millimeter
 79          << " mm." << G4endl;                  <<  94    << " mm." << G4endl;
 80   G4cout << " PiF:   Value of kCarTolerance =      95   G4cout << " PiF:   Value of kCarTolerance = "
 81          << kCarTolerance / millimeter             96          << kCarTolerance / millimeter 
 82          << " mm. " << G4endl;                 <<  97    << " mm. " << G4endl;
 83   fVerboseLevel = 2;                           << 
 84   fVerbTracePiF = true;                        << 
 85 #endif                                             98 #endif 
 86                                                    99 
 87   // Defining Intersection Locator and his par << 100   // Definding Intersection Locator and his parameters
 88   if ( vLocator == nullptr )                   << 101   if(vLocator==0){
 89   {                                            << 102     fIntersectionLocator= new G4MultiLevelLocator(theNavigator);
 90     fIntersectionLocator = new G4MultiLevelLoc << 103     fAllocatedLocator=true;
 91     fAllocatedLocator = true;                  << 104   }else{
                                                   >> 105     fIntersectionLocator=vLocator;
                                                   >> 106     fAllocatedLocator=false;
 92   }                                               107   }
 93   else                                         << 108   RefreshIntersectionLocator();  //  Copy all relevant parameters 
 94   {                                            << 
 95     fIntersectionLocator = vLocator;           << 
 96     fAllocatedLocator = false;                 << 
 97   }                                            << 
 98   RefreshIntersectionLocator();  //  Copy all  << 
 99 }                                                 109 }
100                                                   110 
101 // ------------------------------------------- << 
102 //                                             << 
103 G4PropagatorInField::~G4PropagatorInField()       111 G4PropagatorInField::~G4PropagatorInField()
104 {                                                 112 {
105   if(fAllocatedLocator)  { delete  fIntersecti << 113   if(fAllocatedLocator)delete  fIntersectionLocator; 
106 }                                                 114 }
107                                                   115 
108 // ------------------------------------------- << 
109 // Update the IntersectionLocator with current    116 // Update the IntersectionLocator with current parameters
110 //                                             << 117 void
111 void G4PropagatorInField::RefreshIntersectionL << 118 G4PropagatorInField::RefreshIntersectionLocator()
112 {                                                 119 {
113   fIntersectionLocator->SetEpsilonStepFor(fEps    120   fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
114   fIntersectionLocator->SetDeltaIntersectionFo    121   fIntersectionLocator->SetDeltaIntersectionFor(fCurrentFieldMgr->GetDeltaIntersection());
115   fIntersectionLocator->SetChordFinderFor(GetC    122   fIntersectionLocator->SetChordFinderFor(GetChordFinder());
116   fIntersectionLocator->SetSafetyParametersFor    123   fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
117 }                                                 124 }
118                                                << 125 ///////////////////////////////////////////////////////////////////////////
119 // ------------------------------------------- << 
120 // Compute the next geometric Step             << 
121 //                                                126 //
122 G4double G4PropagatorInField::ComputeStep(     << 127 // Compute the next geometric Step
                                                   >> 128 
                                                   >> 129 G4double
                                                   >> 130 G4PropagatorInField::ComputeStep(
123                 G4FieldTrack&      pFieldTrack    131                 G4FieldTrack&      pFieldTrack,
124                 G4double           CurrentProp    132                 G4double           CurrentProposedStepLength,
125                 G4double&          currentSafe    133                 G4double&          currentSafety,                // IN/OUT
126                 G4VPhysicalVolume* pPhysVol,   << 134                 G4VPhysicalVolume* pPhysVol)
127                 G4bool             canRelaxDel << 
128 {                                                 135 {  
129   GetChordFinder()->OnComputeStep(&pFieldTrack << 
130   const G4double deltaChord = GetChordFinder() << 
131                                                << 
132   // If CurrentProposedStepLength is too small    136   // If CurrentProposedStepLength is too small for finding Chords
133   // then return with no action (for now - TOD    137   // then return with no action (for now - TODO: some action)
134   //                                              138   //
135   const char* methodName = "G4PropagatorInFiel << 139   if(CurrentProposedStepLength<kCarTolerance)
136   if (CurrentProposedStepLength<kCarTolerance) << 
137   {                                               140   {
138     return kInfinity;                             141     return kInfinity;
139   }                                               142   }
140                                                   143 
141   // Introducing smooth trajectory display (ja    144   // Introducing smooth trajectory display (jacek 01/11/2002)
142   //                                              145   //
143   if (fpTrajectoryFilter != nullptr)           << 146   if (fpTrajectoryFilter)
144   {                                               147   {
145     fpTrajectoryFilter->CreateNewTrajectorySeg    148     fpTrajectoryFilter->CreateNewTrajectorySegment();
146   }                                               149   }
147                                                   150 
148   fFirstStepInVolume = fNewTrack ? true : fLas << 
149   fLastStepInVolume = false;                   << 
150   fNewTrack = false;                           << 
151                                                << 
152   if( fVerboseLevel > 2 )                      << 
153   {                                            << 
154     G4cout << methodName << " called" << G4end << 
155     G4cout << "   Starting FT: " << pFieldTrac << 
156     G4cout << "   Requested length = " << Curr << 
157     G4cout << "   PhysVol = ";                 << 
158     if( pPhysVol != nullptr )                  << 
159     {                                          << 
160        G4cout << pPhysVol->GetName() << G4endl << 
161     }                                          << 
162     else                                       << 
163     {                                          << 
164        G4cout << " N/A ";                      << 
165     }                                          << 
166     G4cout << G4endl;                          << 
167   }                                            << 
168                                                << 
169   // Parameters for adaptive Runge-Kutta integ    151   // Parameters for adaptive Runge-Kutta integration
170                                                   152   
171   G4double h_TrialStepSize;        // 1st Step << 153   G4double      h_TrialStepSize;        // 1st Step Size 
172   G4double TruePathLength = CurrentProposedSte << 154   G4double      TruePathLength = CurrentProposedStepLength;
173   G4double StepTaken = 0.0;                    << 155   G4double      StepTaken = 0.0; 
174   G4double s_length_taken, epsilon;            << 156   G4double      s_length_taken, epsilon ; 
175   G4bool   intersects;                         << 157   G4bool        intersects;
176   G4bool   first_substep = true;               << 158   G4bool        first_substep = true;
177                                                   159 
178   G4double NewSafety;                          << 160   G4double      NewSafety;
179   fParticleIsLooping = false;                     161   fParticleIsLooping = false;
180                                                   162 
181   // If not yet done,                             163   // If not yet done, 
182   //   Set the field manager to the local  one    164   //   Set the field manager to the local  one if the volume has one, 
183   //                      or to the global one    165   //                      or to the global one if not
184   //                                              166   //
185   if( !fSetFieldMgr )                          << 167   if( !fSetFieldMgr ) fCurrentFieldMgr= FindAndSetFieldManager( pPhysVol ); 
186   {                                            << 168   // For the next call, the field manager must again be set
187     fCurrentFieldMgr = FindAndSetFieldManager( << 169   fSetFieldMgr= false;
188   }                                            << 
189   fSetFieldMgr = false; // For next call, the  << 
190                                                   170 
191   G4FieldTrack CurrentState(pFieldTrack);      << 171  // Values for Intersection Locator has to be updated on each call for the
192   G4FieldTrack OriginalState = CurrentState;   << 172  // case that CurrentFieldManager has changed from the one of previous step
                                                   >> 173   RefreshIntersectionLocator();
                                                   >> 174 
                                                   >> 175   G4FieldTrack  CurrentState(pFieldTrack);
                                                   >> 176   G4FieldTrack  OriginalState = CurrentState;
193                                                   177 
194   // If the Step length is "infinite", then an    178   // If the Step length is "infinite", then an approximate-maximum Step
195   // length (used to calculate the relative ac << 179   // length (used to calculate the relative accuracy) must be guessed.
196   //                                              180   //
197   if( CurrentProposedStepLength >= fLargestAcc    181   if( CurrentProposedStepLength >= fLargestAcceptableStep )
198   {                                               182   {
199     G4ThreeVector StartPointA, VelocityUnit;      183     G4ThreeVector StartPointA, VelocityUnit;
200     StartPointA  = pFieldTrack.GetPosition();     184     StartPointA  = pFieldTrack.GetPosition();
201     VelocityUnit = pFieldTrack.GetMomentumDir(    185     VelocityUnit = pFieldTrack.GetMomentumDir();
202                                                   186 
203     G4double trialProposedStep = fMaxStepSizeM << 187     G4double trialProposedStep = 1.e2 * ( 10.0 * cm + 
204       fNavigator->GetWorldVolume()->GetLogical    188       fNavigator->GetWorldVolume()->GetLogicalVolume()->
205                   GetSolid()->DistanceToOut(St    189                   GetSolid()->DistanceToOut(StartPointA, VelocityUnit) );
206     CurrentProposedStepLength = std::min( tria << 190     CurrentProposedStepLength= std::min( trialProposedStep,
207                                           fLar << 191                                            fLargestAcceptableStep ); 
208   }                                               192   }
209   epsilon = fCurrentFieldMgr->GetDeltaOneStep(    193   epsilon = fCurrentFieldMgr->GetDeltaOneStep() / CurrentProposedStepLength;
                                                   >> 194   // G4double raw_epsilon= epsilon;
210   G4double epsilonMin= fCurrentFieldMgr->GetMi    195   G4double epsilonMin= fCurrentFieldMgr->GetMinimumEpsilonStep();
211   G4double epsilonMax= fCurrentFieldMgr->GetMa << 196   G4double epsilonMax= fCurrentFieldMgr->GetMaximumEpsilonStep();; 
212   if( epsilon < epsilonMin )  { epsilon = epsi << 197   if( epsilon < epsilonMin ) epsilon = epsilonMin;
213   if( epsilon > epsilonMax )  { epsilon = epsi << 198   if( epsilon > epsilonMax ) epsilon = epsilonMax;
214   SetEpsilonStep( epsilon );                      199   SetEpsilonStep( epsilon );
215                                                   200 
216   // Values for Intersection Locator has to be << 201   // G4cout << "G4PiF: Epsilon of current step - raw= " << raw_epsilon
217   // case that CurrentFieldManager has changed << 202   //        << " final= " << epsilon << G4endl;
218   //                                           << 
219   RefreshIntersectionLocator();                << 
220                                                   203 
221   // Shorten the proposed step in case of earl << 204   //  Shorten the proposed step in case of earlier problems (zero steps)
222   //                                              205   // 
223   if( fNoZeroStep > fActionThreshold_NoZeroSte    206   if( fNoZeroStep > fActionThreshold_NoZeroSteps )
224   {                                               207   {
225     G4double stepTrial;                           208     G4double stepTrial;
226                                                   209 
227     stepTrial = fFull_CurveLen_of_LastAttempt; << 210     stepTrial= fFull_CurveLen_of_LastAttempt; 
228     if( (stepTrial <= 0.0) && (fLast_ProposedS << 211     if( (stepTrial <= 0.0) && (fLast_ProposedStepLength > 0.0) ) 
229     {                                          << 212       stepTrial= fLast_ProposedStepLength; 
230       stepTrial = fLast_ProposedStepLength;    << 
231     }                                          << 
232                                                   213 
233     G4double decreaseFactor = 0.9; // Unused d    214     G4double decreaseFactor = 0.9; // Unused default
234     if(   (fNoZeroStep < fSevereActionThreshol    215     if(   (fNoZeroStep < fSevereActionThreshold_NoZeroSteps)
235        && (stepTrial > 100.0*fZeroStepThreshol    216        && (stepTrial > 100.0*fZeroStepThreshold) )
236     {                                             217     {
237       // Attempt quick convergence                218       // Attempt quick convergence
238       //                                          219       //
239       decreaseFactor= 0.25;                       220       decreaseFactor= 0.25;
240     }                                             221     } 
241     else                                          222     else
242     {                                             223     {
243       // We are in significant difficulties, p    224       // We are in significant difficulties, probably at a boundary that
244       // is either geometrically sharp or betw    225       // is either geometrically sharp or between very different materials.
245       // Careful decreases to cope with tolera << 226       // Careful decreases to cope with tolerance are required.
246       //                                          227       //
247       if( stepTrial > 100.0*fZeroStepThreshold << 228       if( stepTrial > 100.0*fZeroStepThreshold )
248         decreaseFactor = 0.35;     // Try decr    229         decreaseFactor = 0.35;     // Try decreasing slower
249       } else if( stepTrial > 30.0*fZeroStepThr << 230       else if( stepTrial > 30.0*fZeroStepThreshold )
250         decreaseFactor= 0.5;       // Try yet     231         decreaseFactor= 0.5;       // Try yet slower decrease
251       } else if( stepTrial > 10.0*fZeroStepThr << 232       else if( stepTrial > 10.0*fZeroStepThreshold )
252         decreaseFactor= 0.75;      // Try even    233         decreaseFactor= 0.75;      // Try even slower decreases
253       } else {                                 << 234       else
254         decreaseFactor= 0.9;       // Try very    235         decreaseFactor= 0.9;       // Try very slow decreases
255       }                                        << 
256      }                                            236      }
257      stepTrial *= decreaseFactor;                 237      stepTrial *= decreaseFactor;
258                                                   238 
259 #ifdef G4DEBUG_FIELD                              239 #ifdef G4DEBUG_FIELD
260      if( fVerboseLevel > 2                     << 240      G4cout << " G4PropagatorInField::ComputeStep(): " << G4endl
261       || (fNoZeroStep >= fSevereActionThreshol << 241       << "  Decreasing step -  " 
262      {                                         << 242       << " decreaseFactor= " << std::setw(8) << decreaseFactor 
263         G4cerr << " " << methodName            << 243       << " stepTrial = "     << std::setw(18) << stepTrial << " "
264                << "  Decreasing step after " < << 244       << " fZeroStepThreshold = " << fZeroStepThreshold << G4endl;
265                << " - in volume " << pPhysVol; << 245      PrintStepLengthDiagnostic(CurrentProposedStepLength, decreaseFactor,
266         if( pPhysVol )                         << 246                                stepTrial, pFieldTrack);
267            G4cerr << " with name " << pPhysVol << 
268         else                                   << 
269            G4cerr << " i.e. *unknown* volume." << 
270         G4cerr << G4endl;                      << 
271         PrintStepLengthDiagnostic(CurrentPropo << 
272                                   stepTrial, p << 
273      }                                         << 
274 #endif                                            247 #endif
275      if( stepTrial == 0.0 )  //  Change to mak    248      if( stepTrial == 0.0 )  //  Change to make it < 0.1 * kCarTolerance ??
276      {                                            249      {
277        std::ostringstream message;                250        std::ostringstream message;
278        message << "Particle abandoned due to l    251        message << "Particle abandoned due to lack of progress in field."
279                << G4endl                          252                << G4endl
280                << "  Properties : " << pFieldT    253                << "  Properties : " << pFieldTrack << G4endl
281                << "  Attempting a zero step =     254                << "  Attempting a zero step = " << stepTrial << G4endl
282                << "  while attempting to progr    255                << "  while attempting to progress after " << fNoZeroStep
283                << " trial steps. Will abandon     256                << " trial steps. Will abandon step.";
284        G4Exception(methodName, "GeomNav1002",  << 257        G4Exception("G4PropagatorInField::ComputeStep()", "GeomNav1002",
285        fParticleIsLooping = true;              << 258                    JustWarning, message);
                                                   >> 259        fParticleIsLooping= true;
286        return 0;  // = stepTrial;                 260        return 0;  // = stepTrial;
287      }                                            261      }
288      if( stepTrial < CurrentProposedStepLength    262      if( stepTrial < CurrentProposedStepLength )
289      {                                         << 
290        CurrentProposedStepLength = stepTrial;     263        CurrentProposedStepLength = stepTrial;
291      }                                         << 
292   }                                               264   }
293   fLast_ProposedStepLength = CurrentProposedSt    265   fLast_ProposedStepLength = CurrentProposedStepLength;
294                                                   266 
295   G4int do_loop_count = 0;                        267   G4int do_loop_count = 0; 
296   do  // Loop checking, 07.10.2016, JA         << 268   do
297   {                                               269   { 
298     G4FieldTrack SubStepStartState = CurrentSt    270     G4FieldTrack SubStepStartState = CurrentState;
299     G4ThreeVector SubStartPoint = CurrentState    271     G4ThreeVector SubStartPoint = CurrentState.GetPosition(); 
300                                                << 272 
301     if(!first_substep)                         << 273     if( !first_substep) {
302     {                                          << 
303       if( fVerboseLevel > 4 )                  << 
304       {                                        << 
305         G4cout << " PiF: Calling Nav/Locate Gl << 
306                << G4endl;                      << 
307       }                                        << 
308       fNavigator->LocateGlobalPointWithinVolum    274       fNavigator->LocateGlobalPointWithinVolume( SubStartPoint );
309     }                                             275     }
310                                                   276 
311     // How far to attempt to move the particle    277     // How far to attempt to move the particle !
312     //                                            278     //
313     h_TrialStepSize = CurrentProposedStepLengt    279     h_TrialStepSize = CurrentProposedStepLength - StepTaken;
314                                                   280 
315     if (canRelaxDeltaChord &&                  << 
316         fIncreaseChordDistanceThreshold > 0  & << 
317         do_loop_count > fIncreaseChordDistance << 
318         do_loop_count % fIncreaseChordDistance << 
319     {                                          << 
320         GetChordFinder()->SetDeltaChord(       << 
321           GetChordFinder()->GetDeltaChord() *  << 
322         );                                     << 
323     }                                          << 
324                                                << 
325     // Integrate as far as "chord miss" rule a    281     // Integrate as far as "chord miss" rule allows.
326     //                                            282     //
327     s_length_taken = GetChordFinder()->Advance    283     s_length_taken = GetChordFinder()->AdvanceChordLimited( 
328                              CurrentState,        284                              CurrentState,    // Position & velocity
329                              h_TrialStepSize,     285                              h_TrialStepSize,
330                              fEpsilonStep,        286                              fEpsilonStep,
331                              fPreviousSftOrigi    287                              fPreviousSftOrigin,
332                              fPreviousSafety ) << 288                              fPreviousSafety
333       // CurrentState is now updated with the  << 289                              );
                                                   >> 290     //  CurrentState is now updated with the final position and velocity. 
334                                                   291 
335     fFull_CurveLen_of_LastAttempt = s_length_t    292     fFull_CurveLen_of_LastAttempt = s_length_taken;
336                                                   293 
337     G4ThreeVector EndPointB = CurrentState.Get << 294     G4ThreeVector  EndPointB = CurrentState.GetPosition(); 
338     G4ThreeVector InterSectionPointE;          << 295     G4ThreeVector  InterSectionPointE;
339     G4double      LinearStepLength;            << 296     G4double       LinearStepLength;
340                                                   297  
341     // Intersect chord AB with geometry           298     // Intersect chord AB with geometry
342     //                                         << 
343     intersects= IntersectChord( SubStartPoint,    299     intersects= IntersectChord( SubStartPoint, EndPointB, 
344                                 NewSafety, Lin << 300                                 NewSafety,     LinearStepLength, 
345                                 InterSectionPo    301                                 InterSectionPointE );
346       // E <- Intersection Point of chord AB a << 302     // E <- Intersection Point of chord AB and either volume A's surface 
347       //                                  or a << 303     //                                  or a daughter volume's surface ..
348                                                   304 
349     if( first_substep )                        << 305     if( first_substep ) { 
350     {                                          << 
351        currentSafety = NewSafety;                 306        currentSafety = NewSafety;
352     } // Updating safety in other steps is pot    307     } // Updating safety in other steps is potential future extention
353                                                   308 
354     if( intersects )                              309     if( intersects )
355     {                                             310     {
356        G4FieldTrack IntersectPointVelct_G(Curr    311        G4FieldTrack IntersectPointVelct_G(CurrentState);  // FT-Def-Construct
357                                                   312 
358        // Find the intersection point of AB tr    313        // Find the intersection point of AB true path with the surface
359        //   of vol(A), if it exists. Start wit    314        //   of vol(A), if it exists. Start with point E as first "estimate".
360        G4bool recalculatedEndPt = false;       << 315        G4bool recalculatedEndPt= false;
361                                                   316        
362        G4bool found_intersection = fIntersecti << 317          G4bool found_intersection = fIntersectionLocator->
363          EstimateIntersectionPoint( SubStepSta    318          EstimateIntersectionPoint( SubStepStartState, CurrentState, 
364                                     InterSecti << 319                                   InterSectionPointE, IntersectPointVelct_G,
365                                     recalculat << 320                                   recalculatedEndPt,fPreviousSafety,fPreviousSftOrigin);
366                                     fPreviousS << 321        intersects = intersects && found_intersection;
367        intersects = found_intersection;        << 322        if( found_intersection ) {        
368        if( found_intersection )                << 
369        {                                       << 
370           End_PointAndTangent= IntersectPointV    323           End_PointAndTangent= IntersectPointVelct_G;  // G is our EndPoint ...
371           StepTaken = TruePathLength = Interse    324           StepTaken = TruePathLength = IntersectPointVelct_G.GetCurveLength()
372                                      - Origina << 325                                       - OriginalState.GetCurveLength();
373        }                                       << 326        } else {
374        else                                    << 327           // intersects= false;          // "Minor" chords do not intersect
375        {                                       << 328           if( recalculatedEndPt ){
376           // Either "minor" chords do not inte << 329              CurrentState= IntersectPointVelct_G; 
377           // or else stopped (due to too many  << 
378           //                                   << 
379           if( recalculatedEndPt )              << 
380           {                                    << 
381              G4double endAchieved = IntersectP << 
382              G4double endExpected = CurrentSta << 
383                                                << 
384              // Detect failure - due to too ma << 
385              G4bool shortEnd = endAchieved     << 
386                              < (endExpected*(1 << 
387                                                << 
388              G4double stepAchieved = endAchiev << 
389                                    - SubStepSt << 
390                                                << 
391              // Update remaining state - must  << 
392              // abandonned intersection        << 
393              //                                << 
394              CurrentState = IntersectPointVelc << 
395              s_length_taken = stepAchieved;    << 
396              if( shortEnd )                    << 
397              {                                 << 
398                 fParticleIsLooping = true;     << 
399              }                                 << 
400           }                                       330           }
401        }                                          331        }
402     }                                             332     }
403     if( !intersects )                             333     if( !intersects )
404     {                                             334     {
405       StepTaken += s_length_taken;             << 335       StepTaken += s_length_taken; 
406                                                << 336       // For smooth trajectory display (jacek 01/11/2002)
407       if (fpTrajectoryFilter != nullptr) // Fo << 337       if (fpTrajectoryFilter) {
408       {                                        << 
409         fpTrajectoryFilter->TakeIntermediatePo    338         fpTrajectoryFilter->TakeIntermediatePoint(CurrentState.GetPosition());
410       }                                           339       }
411     }                                             340     }
412     first_substep = false;                        341     first_substep = false;
413                                                   342 
414 #ifdef G4DEBUG_FIELD                              343 #ifdef G4DEBUG_FIELD
415     if( fNoZeroStep > fActionThreshold_NoZeroS << 344     if( fNoZeroStep > fActionThreshold_NoZeroSteps ) {
416     {                                          << 
417       if( fNoZeroStep > fSevereActionThreshold << 
418         G4cout << " Above 'Severe Action' thre << 
419       else                                     << 
420         G4cout << " Above 'action' threshold - << 
421       G4cout << " Number of zero steps = " <<  << 
422       printStatus( SubStepStartState,  // or O    345       printStatus( SubStepStartState,  // or OriginalState,
423                    CurrentState, CurrentPropos << 346                    CurrentState,  CurrentProposedStepLength, 
424                    NewSafety, do_loop_count, p << 347                    NewSafety,     do_loop_count,  pPhysVol );
425     }                                             348     }
426     if( (fVerboseLevel > 1) && (do_loop_count  << 349     if( (fVerboseLevel > 1) && (do_loop_count > fMax_loop_count-10 )) {
427     {                                          << 350       if( do_loop_count == fMax_loop_count-9 ){
428       if( do_loop_count == fMax_loop_count-9 ) << 
429       {                                        << 
430         G4cout << " G4PropagatorInField::Compu    351         G4cout << " G4PropagatorInField::ComputeStep(): " << G4endl
431                << "  Difficult track - taking     352                << "  Difficult track - taking many sub steps." << G4endl;
432         printStatus( SubStepStartState, SubSte << 
433                      NewSafety, 0, pPhysVol ); << 
434       }                                           353       }
435       printStatus( SubStepStartState, CurrentS    354       printStatus( SubStepStartState, CurrentState, CurrentProposedStepLength, 
436                    NewSafety, do_loop_count, p    355                    NewSafety, do_loop_count, pPhysVol );
437     }                                             356     }
438 #endif                                            357 #endif
439                                                   358 
440     ++do_loop_count;                           << 359     do_loop_count++;
441                                                   360 
442   } while( (!intersects )                         361   } while( (!intersects )
443         && (!fParticleIsLooping)               << 
444         && (StepTaken + kCarTolerance < Curren    362         && (StepTaken + kCarTolerance < CurrentProposedStepLength)  
445         && ( do_loop_count < fMax_loop_count )    363         && ( do_loop_count < fMax_loop_count ) );
446                                                   364 
447   if(  do_loop_count >= fMax_loop_count        << 365   if( do_loop_count >= fMax_loop_count  )
448     && (StepTaken + kCarTolerance < CurrentPro << 
449   {                                               366   {
450     fParticleIsLooping = true;                    367     fParticleIsLooping = true;
                                                   >> 368 
                                                   >> 369     if ( fVerboseLevel > 0 )
                                                   >> 370     {
                                                   >> 371        G4cout << " G4PropagateInField::ComputeStep(): " << G4endl
                                                   >> 372               << "  Killing looping particle " 
                                                   >> 373               // << " of " << energy  << " energy "
                                                   >> 374               << " after " << do_loop_count << " field substeps "
                                                   >> 375               << " totaling " << StepTaken / mm << " mm " ;
                                                   >> 376        if( pPhysVol )
                                                   >> 377           G4cout << " in volume " << pPhysVol->GetName() ; 
                                                   >> 378        else
                                                   >> 379          G4cout << " in unknown or null volume. " ; 
                                                   >> 380        G4cout << G4endl;
                                                   >> 381     }
451   }                                               382   }
452   if ( ( fParticleIsLooping ) && (fVerboseLeve << 383 
453   {                                            << 
454     ReportLoopingParticle( do_loop_count, Step << 
455                            CurrentProposedStep << 
456                            CurrentState.GetMom << 
457   }                                            << 
458                                                << 
459   if( !intersects )                               384   if( !intersects )
460   {                                               385   {
461     // Chord AB or "minor chords" do not inter    386     // Chord AB or "minor chords" do not intersect
462     // B is the endpoint Step of the current S    387     // B is the endpoint Step of the current Step.
463     //                                            388     //
464     End_PointAndTangent = CurrentState;           389     End_PointAndTangent = CurrentState; 
465     TruePathLength = StepTaken;   //  Original << 390     TruePathLength = StepTaken;
466                                                << 
467     // Tried the following to avoid potential  << 
468     // - but has issues... Suppressing this ch << 
469     // TruePathLength = CurrentProposedStepLen << 
470   }                                               391   }
471   fLastStepInVolume = intersects;              << 
472                                                   392   
473   // Set pFieldTrack to the return value          393   // Set pFieldTrack to the return value
474   //                                              394   //
475   pFieldTrack = End_PointAndTangent;              395   pFieldTrack = End_PointAndTangent;
476                                                   396 
477 #ifdef G4VERBOSE                                  397 #ifdef G4VERBOSE
478   // Check that "s" is correct                    398   // Check that "s" is correct
479   //                                              399   //
480   if( std::fabs(OriginalState.GetCurveLength()    400   if( std::fabs(OriginalState.GetCurveLength() + TruePathLength 
481       - End_PointAndTangent.GetCurveLength())     401       - End_PointAndTangent.GetCurveLength()) > 3.e-4 * TruePathLength )
482   {                                               402   {
483     std::ostringstream message;                   403     std::ostringstream message;
484     message << "Curve length mis-match between    404     message << "Curve length mis-match between original state "
485             << "and proposed endpoint of propa    405             << "and proposed endpoint of propagation." << G4endl
486             << "  The curve length of the endp    406             << "  The curve length of the endpoint should be: " 
487             << OriginalState.GetCurveLength()     407             << OriginalState.GetCurveLength() + TruePathLength << G4endl
488             << "  and it is instead: "            408             << "  and it is instead: "
489             << End_PointAndTangent.GetCurveLen    409             << End_PointAndTangent.GetCurveLength() << "." << G4endl
490             << "  A difference of: "              410             << "  A difference of: "
491             << OriginalState.GetCurveLength()     411             << OriginalState.GetCurveLength() + TruePathLength 
492                - End_PointAndTangent.GetCurveL    412                - End_PointAndTangent.GetCurveLength() << G4endl
493             << "  Original state = " << Origin    413             << "  Original state = " << OriginalState   << G4endl
494             << "  Proposed state = " << End_Po    414             << "  Proposed state = " << End_PointAndTangent;
495     G4Exception(methodName, "GeomNav0003", Fat << 415     G4Exception("G4PropagatorInField::ComputeStep()",
                                                   >> 416                 "GeomNav0003", FatalException, message);
496   }                                               417   }
497 #endif                                            418 #endif
498                                                   419 
499   if( TruePathLength+kCarTolerance >= CurrentP << 420   // In particular anomalous cases, we can get repeated zero steps
                                                   >> 421   // In order to correct this efficiently, we identify these cases
                                                   >> 422   // and only take corrective action when they occur.
                                                   >> 423   // 
                                                   >> 424   if( ( (TruePathLength < fZeroStepThreshold) 
                                                   >> 425   && ( TruePathLength+kCarTolerance < CurrentProposedStepLength  ) 
                                                   >> 426   ) 
                                                   >> 427       || ( TruePathLength < 0.5*kCarTolerance )
                                                   >> 428     )
500   {                                               429   {
501      fNoZeroStep = 0;                          << 430     fNoZeroStep++;
502   }                                               431   }
503   else                                         << 432   else{
504   {                                            << 433     fNoZeroStep = 0;
505      // In particular anomalous cases, we can  << 
506      // We identify these cases and take corre << 
507      //                                        << 
508      if( TruePathLength < std::max( fZeroStepT << 
509      {                                         << 
510         ++fNoZeroStep;                         << 
511      }                                         << 
512      else                                      << 
513      {                                         << 
514         fNoZeroStep = 0;                       << 
515      }                                         << 
516   }                                               434   }
                                                   >> 435 
517   if( fNoZeroStep > fAbandonThreshold_NoZeroSt    436   if( fNoZeroStep > fAbandonThreshold_NoZeroSteps )
518   {                                               437   { 
519      fParticleIsLooping = true;                   438      fParticleIsLooping = true;
520      ReportStuckParticle( fNoZeroStep, Current << 439      std::ostringstream message;
521                           fFull_CurveLen_of_La << 440      message << "Particle is stuck; it will be killed." << G4endl
                                                   >> 441              << "  Zero progress for "  << fNoZeroStep << " attempted steps." 
                                                   >> 442              << G4endl
                                                   >> 443              << "  Proposed Step is " << CurrentProposedStepLength
                                                   >> 444              << " but Step Taken is "<< fFull_CurveLen_of_LastAttempt << G4endl;
                                                   >> 445      if( pPhysVol )
                                                   >> 446        message << " in volume " << pPhysVol->GetName() ; 
                                                   >> 447      else
                                                   >> 448        message << " in unknown or null volume. " ; 
                                                   >> 449      G4Exception("G4PropagatorInField::ComputeStep()",
                                                   >> 450                  "GeomNav1002", JustWarning, message);
522      fNoZeroStep = 0;                             451      fNoZeroStep = 0; 
523   }                                               452   }
524                                                   453  
525   GetChordFinder()->SetDeltaChord(deltaChord); << 
526   return TruePathLength;                          454   return TruePathLength;
527 }                                                 455 }
528                                                   456 
529 // ------------------------------------------- << 457 ///////////////////////////////////////////////////////////////////////////
530 // Dumps status of propagator                  << 
531 //                                                458 //
                                                   >> 459 // Dumps status of propagator.
                                                   >> 460 
532 void                                              461 void
533 G4PropagatorInField::printStatus( const G4Fiel << 462 G4PropagatorInField::printStatus( const G4FieldTrack&        StartFT,
534                                   const G4Fiel << 463                                   const G4FieldTrack&        CurrentFT, 
535                                         G4doub << 464                                         G4double             requestStep, 
536                                         G4doub << 465                                         G4double             safety,
537                                         G4int  << 466                                         G4int                stepNo, 
538                                         G4VPhy << 467                                         G4VPhysicalVolume*   startVolume)
539 {                                                 468 {
540   const G4int verboseLevel = fVerboseLevel;    << 469   const G4int verboseLevel=fVerboseLevel;
541   const G4ThreeVector StartPosition       = St    470   const G4ThreeVector StartPosition       = StartFT.GetPosition();
542   const G4ThreeVector StartUnitVelocity   = St    471   const G4ThreeVector StartUnitVelocity   = StartFT.GetMomentumDir();
543   const G4ThreeVector CurrentPosition     = Cu    472   const G4ThreeVector CurrentPosition     = CurrentFT.GetPosition();
544   const G4ThreeVector CurrentUnitVelocity = Cu    473   const G4ThreeVector CurrentUnitVelocity = CurrentFT.GetMomentumDir();
545                                                   474 
546   G4double step_len = CurrentFT.GetCurveLength    475   G4double step_len = CurrentFT.GetCurveLength() - StartFT.GetCurveLength();
547                                                   476 
548   G4long oldprec;   // cout/cerr precision set << 477   G4int oldprec;   // cout/cerr precision settings
549                                                   478       
550   if( ((stepNo == 0) && (verboseLevel <3)) ||     479   if( ((stepNo == 0) && (verboseLevel <3)) || (verboseLevel >= 3) )
551   {                                               480   {
552     oldprec = G4cout.precision(4);                481     oldprec = G4cout.precision(4);
                                                   >> 482     G4cout << std::setw( 6)  << " " 
                                                   >> 483            << std::setw( 25) << " Current Position  and  Direction" << " "
                                                   >> 484            << G4endl; 
553     G4cout << std::setw( 5) << "Step#"            485     G4cout << std::setw( 5) << "Step#" 
554            << std::setw(10) << "  s  " << " "     486            << std::setw(10) << "  s  " << " "
555            << std::setw(10) << "X(mm)" << " "     487            << std::setw(10) << "X(mm)" << " "
556            << std::setw(10) << "Y(mm)" << " "     488            << std::setw(10) << "Y(mm)" << " "  
557            << std::setw(10) << "Z(mm)" << " "     489            << std::setw(10) << "Z(mm)" << " "
558            << std::setw( 7) << " N_x " << " "     490            << std::setw( 7) << " N_x " << " "
559            << std::setw( 7) << " N_y " << " "     491            << std::setw( 7) << " N_y " << " "
560            << std::setw( 7) << " N_z " << " "     492            << std::setw( 7) << " N_z " << " " ;
561     G4cout << std::setw( 7) << " Delta|N|" <<     493     G4cout << std::setw( 7) << " Delta|N|" << " "
562            << std::setw( 9) << "StepLen" << "     494            << std::setw( 9) << "StepLen" << " "  
563            << std::setw(12) << "StartSafety" <    495            << std::setw(12) << "StartSafety" << " "  
564            << std::setw( 9) << "PhsStep" << "     496            << std::setw( 9) << "PhsStep" << " ";  
565     if( startVolume != nullptr )               << 497     if( startVolume )
566       { G4cout << std::setw(18) << "NextVolume    498       { G4cout << std::setw(18) << "NextVolume" << " "; }
567     G4cout.precision(oldprec);                    499     G4cout.precision(oldprec);
568     G4cout << G4endl;                             500     G4cout << G4endl;
569   }                                               501   }
570   if((stepNo == 0) && (verboseLevel <=3))         502   if((stepNo == 0) && (verboseLevel <=3))
571   {                                               503   {
572     // Recurse to print the start values          504     // Recurse to print the start values
573     //                                            505     //
574     printStatus( StartFT, StartFT, -1.0, safet    506     printStatus( StartFT, StartFT, -1.0, safety, -1, startVolume);
575   }                                               507   }
576   if( verboseLevel <= 3 )                         508   if( verboseLevel <= 3 )
577   {                                               509   {
578     if( stepNo >= 0)                              510     if( stepNo >= 0)
579       { G4cout << std::setw( 4) << stepNo << "    511       { G4cout << std::setw( 4) << stepNo << " "; }
580     else                                          512     else
581       { G4cout << std::setw( 5) << "Start" ; }    513       { G4cout << std::setw( 5) << "Start" ; }
582     oldprec = G4cout.precision(8);                514     oldprec = G4cout.precision(8);
583     G4cout << std::setw(10) << CurrentFT.GetCu    515     G4cout << std::setw(10) << CurrentFT.GetCurveLength() << " "; 
584     G4cout.precision(8);                          516     G4cout.precision(8);
585     G4cout << std::setw(10) << CurrentPosition    517     G4cout << std::setw(10) << CurrentPosition.x() << " "
586            << std::setw(10) << CurrentPosition    518            << std::setw(10) << CurrentPosition.y() << " "
587            << std::setw(10) << CurrentPosition    519            << std::setw(10) << CurrentPosition.z() << " ";
588     G4cout.precision(4);                          520     G4cout.precision(4);
589     G4cout << std::setw( 7) << CurrentUnitVelo    521     G4cout << std::setw( 7) << CurrentUnitVelocity.x() << " "
590            << std::setw( 7) << CurrentUnitVelo    522            << std::setw( 7) << CurrentUnitVelocity.y() << " "
591            << std::setw( 7) << CurrentUnitVelo    523            << std::setw( 7) << CurrentUnitVelocity.z() << " ";
592     G4cout.precision(3);                          524     G4cout.precision(3); 
593     G4cout << std::setw( 7)                       525     G4cout << std::setw( 7)
594            << CurrentFT.GetMomentum().mag()-St    526            << CurrentFT.GetMomentum().mag()-StartFT.GetMomentum().mag() << " "; 
595     G4cout << std::setw( 9) << step_len << " "    527     G4cout << std::setw( 9) << step_len << " "; 
596     G4cout << std::setw(12) << safety << " ";     528     G4cout << std::setw(12) << safety << " ";
597     if( requestStep != -1.0 )                     529     if( requestStep != -1.0 ) 
598       { G4cout << std::setw( 9) << requestStep    530       { G4cout << std::setw( 9) << requestStep << " "; }
599     else                                          531     else
600       { G4cout << std::setw( 9) << "Init/NotKn    532       { G4cout << std::setw( 9) << "Init/NotKnown" << " "; }
601     if( startVolume != nullptr)                << 533     if( startVolume != 0)
602       { G4cout << std::setw(12) << startVolume    534       { G4cout << std::setw(12) << startVolume->GetName() << " "; }
603     G4cout.precision(oldprec);                    535     G4cout.precision(oldprec);
604     G4cout << G4endl;                             536     G4cout << G4endl;
605   }                                               537   }
606   else // if( verboseLevel > 3 )                  538   else // if( verboseLevel > 3 )
607   {                                               539   {
608     //  Multi-line output                         540     //  Multi-line output
609                                                   541       
610     G4cout << "Step taken was " << step_len       542     G4cout << "Step taken was " << step_len  
611            << " out of PhysicalStep = " <<  re    543            << " out of PhysicalStep = " <<  requestStep << G4endl;
612     G4cout << "Final safety is: " << safety <<    544     G4cout << "Final safety is: " << safety << G4endl;
613     G4cout << "Chord length = " << (CurrentPos    545     G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
614            << G4endl;                             546            << G4endl;
615     G4cout << G4endl;                             547     G4cout << G4endl; 
616   }                                               548   }
617 }                                                 549 }
618                                                   550 
619 // ------------------------------------------- << 551 ///////////////////////////////////////////////////////////////////////////
620 // Prints Step diagnostics                     << 
621 //                                                552 //
                                                   >> 553 // Prints Step diagnostics
                                                   >> 554 
622 void                                              555 void 
623 G4PropagatorInField::PrintStepLengthDiagnostic    556 G4PropagatorInField::PrintStepLengthDiagnostic(
624                           G4double CurrentProp    557                           G4double CurrentProposedStepLength,
625                           G4double decreaseFac    558                           G4double decreaseFactor,
626                           G4double stepTrial,     559                           G4double stepTrial,
627                     const G4FieldTrack& )         560                     const G4FieldTrack& )
628 {                                                 561 {
629   G4long iprec= G4cout.precision(8);           << 562   G4int  iprec= G4cout.precision(8); 
630   G4cout << " " << std::setw(12) << " PiF: NoZ    563   G4cout << " " << std::setw(12) << " PiF: NoZeroStep " 
631          << " " << std::setw(20) << " CurrentP    564          << " " << std::setw(20) << " CurrentProposed len " 
632          << " " << std::setw(18) << " Full_cur    565          << " " << std::setw(18) << " Full_curvelen_last" 
633          << " " << std::setw(18) << " last pro    566          << " " << std::setw(18) << " last proposed len " 
634          << " " << std::setw(18) << " decrease    567          << " " << std::setw(18) << " decrease factor   " 
635          << " " << std::setw(15) << " step tri    568          << " " << std::setw(15) << " step trial  " 
636          << G4endl;                               569          << G4endl;
637                                                   570 
638   G4cout << " " << std::setw(10) << fNoZeroSte    571   G4cout << " " << std::setw(10) << fNoZeroStep << "  "
639          << " " << std::setw(20) << CurrentPro    572          << " " << std::setw(20) << CurrentProposedStepLength
640          << " " << std::setw(18) << fFull_Curv    573          << " " << std::setw(18) << fFull_CurveLen_of_LastAttempt
641          << " " << std::setw(18) << fLast_Prop    574          << " " << std::setw(18) << fLast_ProposedStepLength 
642          << " " << std::setw(18) << decreaseFa    575          << " " << std::setw(18) << decreaseFactor
643          << " " << std::setw(15) << stepTrial     576          << " " << std::setw(15) << stepTrial
644          << G4endl;                               577          << G4endl;
645   G4cout.precision( iprec );                   << 578   G4cout.precision( iprec ); 
                                                   >> 579 
646 }                                                 580 }
647                                                   581 
648 // Access the points which have passed through    582 // Access the points which have passed through the filter. The
649 // points are stored as ThreeVectors for the i    583 // points are stored as ThreeVectors for the initial impelmentation
650 // only (jacek 30/10/2002)                        584 // only (jacek 30/10/2002)
651 // Responsibility for deleting the points lies    585 // Responsibility for deleting the points lies with
652 // SmoothTrajectoryPoint, which is the points'    586 // SmoothTrajectoryPoint, which is the points' final
653 // destination. The points pointer is set to N    587 // destination. The points pointer is set to NULL, to ensure that
654 // the points are not re-used in subsequent st    588 // the points are not re-used in subsequent steps, therefore THIS
655 // METHOD MUST BE CALLED EXACTLY ONCE PER STEP    589 // METHOD MUST BE CALLED EXACTLY ONCE PER STEP. (jacek 08/11/2002)
656                                                   590 
657 std::vector<G4ThreeVector>*                       591 std::vector<G4ThreeVector>*
658 G4PropagatorInField::GimmeTrajectoryVectorAndF    592 G4PropagatorInField::GimmeTrajectoryVectorAndForgetIt() const
659 {                                                 593 {
660   // NB, GimmeThePointsAndForgetThem really fo    594   // NB, GimmeThePointsAndForgetThem really forgets them, so it can
661   // only be called (exactly) once for each st    595   // only be called (exactly) once for each step.
662                                                   596 
663   if (fpTrajectoryFilter != nullptr)           << 597   if (fpTrajectoryFilter)
664   {                                               598   {
665     return fpTrajectoryFilter->GimmeThePointsA    599     return fpTrajectoryFilter->GimmeThePointsAndForgetThem();
666   }                                               600   }
667   return nullptr;                              << 601   else
                                                   >> 602   {
                                                   >> 603     return 0;
                                                   >> 604   }
668 }                                                 605 }
669                                                   606 
670 // ------------------------------------------- << 
671 //                                             << 
672 void                                              607 void 
673 G4PropagatorInField::SetTrajectoryFilter(G4VCu    608 G4PropagatorInField::SetTrajectoryFilter(G4VCurvedTrajectoryFilter* filter)
674 {                                                 609 {
675   fpTrajectoryFilter = filter;                    610   fpTrajectoryFilter = filter;
676 }                                                 611 }
677                                                   612 
678 // ------------------------------------------- << 
679 //                                             << 
680 void G4PropagatorInField::ClearPropagatorState    613 void G4PropagatorInField::ClearPropagatorState()
681 {                                                 614 {
682   // Goal: Clear all memory of previous steps,    615   // Goal: Clear all memory of previous steps,  cached information
683                                                   616 
684   fParticleIsLooping = false;                  << 617   fParticleIsLooping= false;
685   fNoZeroStep = 0;                             << 618   fNoZeroStep= 0;
686                                                   619 
687   fSetFieldMgr = false;  // Has field-manager  << 
688   fEpsilonStep= 1.0e-5;  // Relative accuracy  << 
689                                                << 
690   End_PointAndTangent= G4FieldTrack( G4ThreeVe    620   End_PointAndTangent= G4FieldTrack( G4ThreeVector(0.,0.,0.),
691                                      G4ThreeVe    621                                      G4ThreeVector(0.,0.,0.),
692                                      0.0,0.0,0    622                                      0.0,0.0,0.0,0.0,0.0); 
693   fFull_CurveLen_of_LastAttempt = -1;             623   fFull_CurveLen_of_LastAttempt = -1; 
694   fLast_ProposedStepLength = -1;                  624   fLast_ProposedStepLength = -1;
695                                                   625 
696   fPreviousSftOrigin= G4ThreeVector(0.,0.,0.);    626   fPreviousSftOrigin= G4ThreeVector(0.,0.,0.);
697   fPreviousSafety= 0.0;                           627   fPreviousSafety= 0.0;
698                                                << 
699   fNewTrack = true;                            << 
700 }                                                 628 }
701                                                   629 
702 // ------------------------------------------- << 
703 //                                             << 
704 G4FieldManager* G4PropagatorInField::             630 G4FieldManager* G4PropagatorInField::
705 FindAndSetFieldManager( G4VPhysicalVolume* pCu << 631 FindAndSetFieldManager( G4VPhysicalVolume* pCurrentPhysicalVolume)
706 {                                                 632 {
707   G4FieldManager* currentFieldMgr;                633   G4FieldManager* currentFieldMgr;
708                                                   634 
709   currentFieldMgr = fDetectorFieldMgr;            635   currentFieldMgr = fDetectorFieldMgr;
710   if( pCurrentPhysicalVolume != nullptr )      << 636   if( pCurrentPhysicalVolume)
711   {                                               637   {
712      G4FieldManager *pRegionFieldMgr = nullptr << 638      G4FieldManager *pRegionFieldMgr= 0, *localFieldMgr = 0;
713      G4LogicalVolume* pLogicalVol = pCurrentPh << 639      G4LogicalVolume* pLogicalVol= pCurrentPhysicalVolume->GetLogicalVolume();
714                                                   640 
715      if( pLogicalVol != nullptr )              << 641      if( pLogicalVol ) { 
716      {                                         << 642   // Value for Region, if any, Overrides 
717         // Value for Region, if any, overrides << 643   G4Region*  pRegion= pLogicalVol->GetRegion();
718         //                                     << 644   if( pRegion ) { 
719         G4Region*  pRegion = pLogicalVol->GetR << 645      pRegionFieldMgr= pRegion->GetFieldManager();
720         if( pRegion != nullptr )               << 646      if( pRegionFieldMgr ) 
721         {                                      << 647        currentFieldMgr= pRegionFieldMgr;
722            pRegionFieldMgr = pRegion->GetField << 648   }
723            if( pRegionFieldMgr != nullptr )    << 649 
724            {                                   << 650   // 'Local' Value from logical volume, if any, Overrides 
725               currentFieldMgr= pRegionFieldMgr << 651   localFieldMgr= pLogicalVol->GetFieldManager();
726            }                                   << 652   if ( localFieldMgr ) 
727         }                                      << 653      currentFieldMgr = localFieldMgr;
728                                                << 
729         // 'Local' Value from logical volume,  << 
730         //                                     << 
731         localFieldMgr = pLogicalVol->GetFieldM << 
732         if ( localFieldMgr != nullptr )        << 
733         {                                      << 
734            currentFieldMgr = localFieldMgr;    << 
735         }                                      << 
736      }                                            654      }
737   }                                               655   }
738   fCurrentFieldMgr = currentFieldMgr;          << 656   fCurrentFieldMgr= currentFieldMgr;
739                                                   657 
740   // Flag that field manager has been set      << 658   // Flag that field manager has been set.
741   //                                           << 659   fSetFieldMgr= true;
742   fSetFieldMgr = true;                         << 
743                                                   660 
744   return currentFieldMgr;                         661   return currentFieldMgr;
745 }                                                 662 }
746                                                   663 
747 // ------------------------------------------- << 
748 //                                             << 
749 G4int G4PropagatorInField::SetVerboseLevel( G4    664 G4int G4PropagatorInField::SetVerboseLevel( G4int level )
750 {                                                 665 {
751   G4int oldval = fVerboseLevel;                << 666   G4int oldval= fVerboseLevel;
752   fVerboseLevel = level;                       << 667   fVerboseLevel= level;
753                                                   668 
754   // Forward the verbose level 'reduced' to Ch    669   // Forward the verbose level 'reduced' to ChordFinder,
755   // MagIntegratorDriver ... ?                    670   // MagIntegratorDriver ... ? 
756   //                                              671   //
757   auto integrDriver = GetChordFinder()->GetInt << 672   G4MagInt_Driver* integrDriver= GetChordFinder()->GetIntegrationDriver(); 
758   integrDriver->SetVerboseLevel( fVerboseLevel    673   integrDriver->SetVerboseLevel( fVerboseLevel - 2 );
759   G4cout << "Set Driver verbosity to " << fVer    674   G4cout << "Set Driver verbosity to " << fVerboseLevel - 2 << G4endl;
760                                                   675 
761   return oldval;                                  676   return oldval;
762 }                                              << 
763                                                << 
764 // ------------------------------------------- << 
765 //                                             << 
766 void G4PropagatorInField::ReportLoopingParticl << 
767                                                << 
768                                                << 
769                                                << 
770                                                << 
771                                                << 
772 {                                              << 
773    std::ostringstream message;                 << 
774    G4double fraction = StepTaken / StepRequest << 
775    message << " Unfinished integration of trac << 
776            << " of momentum " << momentumVec < << 
777            << momentumVec.mag() << " ) " << G4 << 
778            << " after " << count << " field su << 
779            << " totaling " << std::setprecisio << 
780            << " out of requested step " << std << 
781            << StepRequested / mm << " mm ";    << 
782    message << " a fraction of ";               << 
783    G4int prec = 4;                             << 
784    if( fraction > 0.99 )                       << 
785    {                                           << 
786      prec = 7;                                 << 
787    }                                           << 
788    else                                        << 
789    {                                           << 
790      if (fraction > 0.97 )  { prec = 5; }      << 
791    }                                           << 
792    message << std::setprecision(prec)          << 
793            << 100. * StepTaken / StepRequested << 
794    if( pPhysVol != nullptr )                   << 
795    {                                           << 
796      message << " in volume " << pPhysVol->Get << 
797      auto material = pPhysVol->GetLogicalVolum << 
798      if( material != nullptr )                 << 
799      {                                         << 
800        message << " with material " << materia << 
801                << " ( density = "              << 
802                << material->GetDensity() / ( g << 
803      }                                         << 
804    }                                           << 
805    else                                        << 
806    {                                           << 
807      message << " in unknown (null) volume. "  << 
808    }                                           << 
809    G4Exception(methodName, "GeomNav1002", Just << 
810 }                                              << 
811                                                << 
812 // ------------------------------------------- << 
813 //                                             << 
814 void G4PropagatorInField::ReportStuckParticle( << 
815                                                << 
816                                                << 
817                                                << 
818 {                                              << 
819    std::ostringstream message;                 << 
820    message << "Particle is stuck; it will be k << 
821            << "  Zero progress for " << noZero << 
822            << G4endl                           << 
823            << "  Proposed Step is " << propose << 
824            << " but Step Taken is "<< lastTrie << 
825    if( physVol != nullptr )                    << 
826    {                                           << 
827       message << " in volume " << physVol->Get << 
828    }                                           << 
829    else                                        << 
830    {                                           << 
831       message << " in unknown or null volume.  << 
832    }                                           << 
833    G4Exception("G4PropagatorInField::ComputeSt << 
834                "GeomNav1002", JustWarning, mes << 
835 }                                              << 
836                                                << 
837 // ------------------------------------------- << 
838                                                << 
839 // ------------------------------------------- << 
840 // Methods to alter Parameters                 << 
841 // ------------------------------------------- << 
842                                                << 
843 // Was a data member (of an object) -- now mov << 
844 G4double  G4PropagatorInField::GetLargestAccep << 
845 {                                              << 
846   return fLargestAcceptableStep;               << 
847 }                                              << 
848                                                << 
849 // ------------------------------------------- << 
850 //                                             << 
851 void G4PropagatorInField::SetLargestAcceptable << 
852 {                                              << 
853   if( fLargestAcceptableStep>0.0 )             << 
854   {                                            << 
855     fLargestAcceptableStep = newBigDist;       << 
856   }                                            << 
857 }                                              << 
858                                                << 
859 // ------------------------------------------- << 
860                                                << 
861 G4double G4PropagatorInField::GetMaxStepSizeMu << 
862 {                                              << 
863   return fMaxStepSizeMultiplier;               << 
864 }                                              << 
865                                                << 
866 // ------------------------------------------- << 
867                                                << 
868 void     G4PropagatorInField::SetMaxStepSizeMu << 
869 {                                              << 
870   fMaxStepSizeMultiplier=vm;                   << 
871 }                                              << 
872                                                << 
873 // ------------------------------------------- << 
874                                                << 
875 G4double G4PropagatorInField::GetMinBigDistanc << 
876 {                                              << 
877   return fMinBigDistance;                      << 
878 }                                              << 
879                                                << 
880 // ------------------------------------------- << 
881                                                << 
882 void     G4PropagatorInField::SetMinBigDistanc << 
883 {                                              << 
884   fMinBigDistance= val;                        << 
885 }                                                 677 }
886                                                   678