lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 4.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:39:52 +02:00
parent 921d3b1cda
commit 330b82b769
4524 changed files with 178689 additions and 43575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
+92 -47
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4MagIntegratorDriver.cc,v 1.20 2001/11/21 16:43:16 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
// $Id: G4MagIntegratorDriver.cc,v 1.25 2002/05/07 17:18:49 japost Exp $
// GEANT4 tag $Name: geant4-04-01 $
//
//
//
@@ -30,16 +30,17 @@
// Tracking in space dependent magnetic field
//
// History of major changes:
// 7 Oct 96 V. Grichine First version
// 28 Jan 98 W. Wander: Added ability for low order integrators
// 30 Jan 98 J. Apostolakis: Made method parameters into instance variables
// 8 Nov 01 J. Apostolakis: Respect minimum step in AccurateAdvance
// 27 Jul 99 J. Apostolakis: Ensured that AccurateAdvance does not loop
// due to very small eps & step size (precision)
// 28 Jan 98 W. Wander: Added ability for low order integrators
// 7 Oct 96 V. Grichine First version
#include <math.h>
#include "G4ios.hh"
#include "G4MagIntegratorDriver.hh"
#include "G4FieldTrack.hh"
#include "geomdefs.hh" // for kCarTolerance
#include "g4std/iomanip"
// Stepsize can increase by no more than 5.0
// and decrease by no more than 1/10. = 0.1
@@ -49,7 +50,7 @@ const G4double G4MagInt_Driver::max_stepping_decrease = 0.1;
// The (default) maximum number of steps is Base divided by the order of Stepper
//
const G4int G4MagInt_Driver::fMaxStepBase = 500; // Was 5000
const G4int G4MagInt_Driver::fMaxStepBase = 250; // Was 5000
// Constructor
//
@@ -62,6 +63,9 @@ G4MagInt_Driver::G4MagInt_Driver( G4double hminimum,
RenewStepperAndAdjust( pItsStepper );
hminimum_val= hminimum;
fMaxNoSteps = fMaxStepBase / pIntStepper->IntegratorOrder();
#ifdef G4DEBUG_FIELD
fVerboseLevel=2;
#endif
}
// Destructor
@@ -92,9 +96,9 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
G4int no_warnings=0;
#ifdef G4DEBUG_FIELD
static G4int dbg=0;
dbg=1;
fVerboseLevel=2;
static G4int dbg=1;
G4double ySubStepStart[G4FieldTrack::ncompSVEC];
G4FieldTrack yFldTrkStart(y_current);
#endif
// G4double yscal[ncompSVEC];
@@ -129,19 +133,24 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
do{
G4ThreeVector StartPos( y[0], y[1], y[2] );
# ifdef G4DEBUG_FIELD
for(i=0;i<nvar;i++) ySubStepStart[i] = y[i] ;
yFldTrkStart.LoadFromArray(y);
yFldTrkStart.SetCurveLength(x);
# endif
pIntStepper->RightHandSide( y, dydx );
if( x+h > x2 ) {
h = x2 - x ; // When stepsize overshoots, decrease it!
}
if( h < eps * hstep) {
lastStep = true; // Ensure that this must be the last step
// because otherwise numerical (im)precision
// could otherwise force lots of small last steps.
h = x2 - x ; // When stepsize overshoots, decrease it!
if( h < eps * hstep) {
lastStep = true; // Ensure that this must be the last step
// - since otherwise numerical (im)precision
// could force lots of small last steps
}
}
// static G4int nStpPr=50; // For debug printing of integrations with many steps
static G4int nStpPr=50; // For debug printing of integrations with many steps
// Perform the Integration
//
@@ -150,41 +159,44 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
OneGoodStep(y,dydx,x,h,eps,hdid,hnext) ;
//--------------------------------------
lastStepSucceeded= (hdid == h);
# ifdef G4DEBUG_FIELD
if(dbg>2) PrintStatus( ySubStepStart, x1, y, x, h, nstp); // Only
# endif
}else{
#if 0
OneGoodStep(y,dydx,x,h,2*eps,hdid,hnext) ;
//--------------------------------------
lastStepSucceeded= (hdid == h);
#else
G4FieldTrack yFldTrk( G4ThreeVector(0,0,0),
G4ThreeVector(0,0,0), 0., 0., 0., 0. );
G4double dchord_step, dyerr, dyerr_len; // Must figure what to do with these
yFldTrk.LoadFromArray(y);
yFldTrk.SetCurveLength( x );
// G4double s_start = yFldTrk.GetCurveLength();
QuickAdvance( yFldTrk, dydx, h, dchord_step, dyerr_len );
//-----------------------------------------------------
# ifdef G4DEBUG_FIELD
if(dbg>1) OneGoodStep(y,dydx,x,h,2*eps,hdid,hnext) ;
if(dbg>1) PrintStatus( ystart, x1, y, x, h, -nstp);
// if(dbg>1) OneGoodStep(y,dydx,x,h,2*eps,hdid,hnext) ;
// if(dbg>1) PrintStatus( ystart, x1, y, x, h, -nstp);
# endif
yFldTrk.DumpToArray(y);
if(dbg>1) PrintStatus( ystart, x1, y, x, h, nstp); // Only this
# ifdef G4DEBUG_FIELD
if(dbg>1) PrintStatus( ySubStepStart, x1, y, x, h, nstp); // Only this
# endif
dyerr = dyerr_len / hstep;
dyerr = dyerr_len / h; // was dyerr_len / hstep;
hdid= h;
x += hdid;
// Compute suggested new step
hnext= ComputeNewStepSize( dyerr/eps, h);
// .. hnext= ComputeNewStepSize_WithinLimits( dyerr/eps, h);
lastStepSucceeded= (dyerr<= eps);
#endif
}
// #ifdef G4DEBUG_FIELD
if(lastStepSucceeded) noFullIntegr++ ; else noSmallIntegr++ ;
G4ThreeVector EndPos( y[0], y[1], y[2] );
#ifdef G4DEBUG_FIELD
if(nstp>nStpPr) {
G4cout << "hdid=" << hdid << "hnext =" << hnext << " " << endl;
PrintStatus( ystart, x1, y, x, h, nstp==nStpPr ? -nstp: nstp);
G4cout << "hdid=" << G4std::setw(12) << hdid << " "
<< "hnext=" << G4std::setw(12) << hnext << " " << endl;
PrintStatus( ystart, x1, y, x, h, (nstp==nStpPr) ? -nstp: nstp);
}
#endif
@@ -199,7 +211,7 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
WarnEndPointTooFar ( endPointDist, hdid, eps, dbg );
G4cerr << " Total steps: bad" << noBadSteps << " good " << noGoodSteps << endl;
// G4cerr << "Mid:EndPtFar> ";
PrintStatus( ystart, x1, y, x, hstep, no_warnings?nstp:-nstp);
if(dbg>1) PrintStatus( ystart, x1, y, x, hstep, no_warnings?nstp:-nstp);
// Potentially add as arguments: <dydx> - as Initial Force
#endif
no_warnings++;
@@ -221,7 +233,7 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
// Issue WARNING
WarnSmallStepSize( hnext, hstep, h, x-x1, nstp );
// G4cerr << "Mid:SmallStep> ";
PrintStatus( ystart, x1, y, x, hstep, no_warnings?nstp:-nstp);
if(dbg>1) PrintStatus( ystart, x1, y, x, hstep, no_warnings?nstp:-nstp);
no_warnings++;
}
#endif
@@ -255,7 +267,7 @@ G4MagInt_Driver::AccurateAdvance(G4FieldTrack& y_current,
succeeded = false;
#ifdef G4DEBUG_FIELD
WarnTooManyStep( x1, x2, x ); // Issue WARNING
PrintStatus( yEnd, x1, y, x, hstep, -nstp);
if( dbg>1) PrintStatus( yEnd, x1, y, x, hstep, -nstp);
#endif
}
@@ -596,7 +608,7 @@ void G4MagInt_Driver::PrintStatus( const G4double* StartArr,
PrintStatus(StartFT, CurrentFT, requestStep, subStepNo );
}
#include "g4std/iomanip"
void G4MagInt_Driver::PrintStatus(
const G4FieldTrack& StartFT,
@@ -615,9 +627,12 @@ void G4MagInt_Driver::PrintStatus(
const G4ThreeVector CurrentPosition= CurrentFT.GetPosition();
const G4ThreeVector CurrentUnitVelocity= CurrentFT.GetMomentumDir();
G4double DotStartCurrentVeloc= StartUnitVelocity.dot(CurrentUnitVelocity);
G4double step_len= CurrentFT.GetCurveLength()
- StartFT.GetCurveLength();
G4double subStepSize = step_len;
if( (subStepNo <= 0) && (verboseLevel <= 3) )
{
subStepNo = - subStepNo; // To allow printing banner
@@ -630,22 +645,28 @@ void G4MagInt_Driver::PrintStatus(
<< G4std::setw( 9) << "X(mm)" << " "
<< G4std::setw( 9) << "Y(mm)" << " "
<< G4std::setw( 9) << "Z(mm)" << " "
<< G4std::setw( 7) << " N_x " << " "
<< G4std::setw( 7) << " N_y " << " "
<< G4std::setw( 7) << " N_z " << " "
<< G4std::setw( 8) << " N_x " << " "
<< G4std::setw( 8) << " N_y " << " "
<< G4std::setw( 8) << " N_z " << " "
<< G4std::setw( 7) << " N^2-1 " << " "
<< G4std::setw(10) << " N(0).N " << " "
<< G4std::setw( 7) << "KinEner " << " "
<< G4std::setw( 9) << "StepLen" << " " // Add the Sub-step ??
<< G4std::setw(12) << "Track-l" << " " // Add the Sub-step ??
<< G4std::setw(12) << "Step-len" << " "
<< G4std::setw(12) << "Step-len" << " "
<< G4std::setw( 9) << "ReqStep" << " "
<< G4endl;
PrintStat_Aux( StartFT, requestStep, 0., 0);
PrintStat_Aux( StartFT, requestStep, 0.,
0, 0.0, 1.0);
//*************
}
if( verboseLevel <= 3 )
{
G4cout.precision(noPrecision);
PrintStat_Aux( CurrentFT, requestStep, step_len, subStepNo);
PrintStat_Aux( CurrentFT, requestStep, step_len,
subStepNo, subStepSize, DotStartCurrentVeloc );
//*************
}
@@ -669,7 +690,9 @@ void G4MagInt_Driver::PrintStat_Aux(
const G4FieldTrack& aFieldTrack,
G4double requestStep,
G4double step_len,
G4int subStepNo)
G4int subStepNo,
G4double subStepSize,
G4double dotVeloc_StartCurr)
{
const G4ThreeVector Position= aFieldTrack.GetPosition();
const G4ThreeVector UnitVelocity= aFieldTrack.GetMomentumDir();
@@ -678,15 +701,37 @@ void G4MagInt_Driver::PrintStat_Aux(
G4cout << G4std::setw( 5) << subStepNo << " ";
else
G4cout << G4std::setw( 5) << "Start" << " ";
G4cout << G4std::setw( 7) << aFieldTrack.GetCurveLength();
G4double curveLen= aFieldTrack.GetCurveLength();
G4cout << G4std::setw( 7) << curveLen;
G4cout << G4std::setw( 9) << Position.x() << " "
<< G4std::setw( 9) << Position.y() << " "
<< G4std::setw( 9) << Position.z() << " "
<< G4std::setw( 7) << UnitVelocity.x() << " "
<< G4std::setw( 7) << UnitVelocity.y() << " "
<< G4std::setw( 7) << UnitVelocity.z() << " ";
<< G4std::setw( 8) << UnitVelocity.x() << " "
<< G4std::setw( 8) << UnitVelocity.y() << " "
<< G4std::setw( 8) << UnitVelocity.z() << " ";
G4int oldprec= G4cout.precision(3);
G4cout << G4std::setw( 7) << UnitVelocity.mag2()-1.0 << " ";
G4cout.precision(6);
G4cout << G4std::setw(10) << dotVeloc_StartCurr << " ";
G4cout.precision(oldprec);
G4cout << G4std::setw( 7) << aFieldTrack.GetKineticEnergy();
G4cout << G4std::setw( 9) << step_len << " ";
G4cout << G4std::setw(12) << step_len << " ";
static G4double oldCurveLength= 0.0;
static G4double oldSubStepLength= 0.0;
static int oldSubStepNo= -1;
G4double subStep_len=0.0;
if( curveLen > oldCurveLength )
subStep_len= curveLen - oldCurveLength;
else if (subStepNo == oldSubStepNo)
subStep_len= oldSubStepLength;
// else subStepLen_NotAvail;
oldCurveLength= curveLen;
oldSubStepLength= subStep_len;
G4cout << G4std::setw(12) << subStep_len << " ";
G4cout << G4std::setw(12) << subStepSize << " ";
if( requestStep != -1.0 )
G4cout << G4std::setw( 9) << requestStep << " ";
else