Import Geant4 1.1.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BlockingList.cc,v 1.1.10.1 1999/12/07 20:48:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4BlockingList.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4BlockingList Implementation
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4GRSSolid.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4GRSSolid.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4GRSSolid Implementation
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4GRSVolume.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4GRSVolume.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4GRSVolume Implementation
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4LogicalBorderSurface.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4LogicalBorderSurface.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// G4LogicalBorderSurface Implementation
|
||||
@@ -97,16 +97,16 @@ void G4LogicalBorderSurface::DumpInfo() // Class method (it is really const)
|
||||
// Dump info for known surfaces
|
||||
|
||||
G4cout << "***** Surface Table : Nb of Surfaces = " <<
|
||||
GetNumberOfBorderSurfaces() << " *****" << endl;
|
||||
GetNumberOfBorderSurfaces() << " *****" << G4endl;
|
||||
|
||||
for (int i=0; i<theBorderSurfaceTable.length(); i++) {
|
||||
G4cout << theBorderSurfaceTable[i]->GetName() << " : " << endl <<
|
||||
" Surface type = " << theBorderSurfaceTable[i]->GetName() << endl;
|
||||
G4cout << theBorderSurfaceTable[i]->GetName() << " : " << G4endl <<
|
||||
" Surface type = " << theBorderSurfaceTable[i]->GetName() << G4endl;
|
||||
#ifdef PRINT_INFO
|
||||
" Surface type = " << theBorderSurfaceTable[i]->GetOpticalSurface()->GetType() << endl;
|
||||
" Surface finish = " << theBorderSurfaceTable[i]->GetFinish() << endl <<
|
||||
" Surface model = " << theBorderSurfaceTable[i]->GetModel() << endl;
|
||||
" Surface type = " << theBorderSurfaceTable[i]->GetOpticalSurface()->GetType() << G4endl;
|
||||
" Surface finish = " << theBorderSurfaceTable[i]->GetFinish() << G4endl <<
|
||||
" Surface model = " << theBorderSurfaceTable[i]->GetModel() << G4endl;
|
||||
#endif
|
||||
}
|
||||
G4cout << endl;
|
||||
G4cout << G4endl;
|
||||
}
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4LogicalSkinSurface.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4LogicalSkinSurface.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
// G4LogicalSkinSurface Implementation
|
||||
@@ -95,35 +95,35 @@ void G4LogicalSkinSurface::DumpInfo()
|
||||
|
||||
G4cout << "***** Surface Table : Nb of Surfaces = " <<
|
||||
// G4LogicalSkinSurface::
|
||||
GetNumberOfSkinSurfaces() << " *****" << endl;
|
||||
GetNumberOfSkinSurfaces() << " *****" << G4endl;
|
||||
|
||||
for (int i=0; i<theSurfaceTable.length(); i++) {
|
||||
G4LogicalSkinSurface *pSkinSurface= theSurfaceTable[i];
|
||||
G4cout << theSurfaceTable[i]->GetName() << " : " << endl <<
|
||||
G4cout << theSurfaceTable[i]->GetName() << " : " << G4endl <<
|
||||
" Skin of logical volume " << pSkinSurface->GetLogicalVolume()->GetName ()
|
||||
<< endl <<
|
||||
<< G4endl <<
|
||||
" Optical Surface Ptr = " << (long) (pSkinSurface->GetOpticalSurface() )
|
||||
<< endl;
|
||||
<< G4endl;
|
||||
|
||||
#ifdef PRINT_INFO
|
||||
// DOES NOT COMPILE without including "G4OpticalSurface.hh"
|
||||
|
||||
// G4cout << pSkinSurface->GetOpticalSurface() << endl ;
|
||||
// G4cout << pSkinSurface->GetOpticalSurface() << G4endl ;
|
||||
G4pticalSurface opticalSurface= pSkinSurface->GetOpticalSurface();
|
||||
G4cout <<
|
||||
" Surface type = " << opticalSurface->GetType() << endl <<
|
||||
" Surface finish = " << opticalSurface->GetFinish() << endl <<
|
||||
" Surface model = " << opticalSurface->GetModel() << endl;
|
||||
" Surface type = " << opticalSurface->GetType() << G4endl <<
|
||||
" Surface finish = " << opticalSurface->GetFinish() << G4endl <<
|
||||
" Surface model = " << opticalSurface->GetModel() << G4endl;
|
||||
|
||||
/*
|
||||
operator << ( G4OpticalSurface opticalSurface ) should exist
|
||||
and do something like:
|
||||
" Surface type = " << opticalSurface->GetType() << endl <<
|
||||
" Surface finish = " << opticalSurface->GetFinish() << endl <<
|
||||
" Surface model = " << opticalSurface->GetModel() << endl;
|
||||
" Surface type = " << opticalSurface->GetType() << G4endl <<
|
||||
" Surface finish = " << opticalSurface->GetFinish() << G4endl <<
|
||||
" Surface model = " << opticalSurface->GetModel() << G4endl;
|
||||
*/
|
||||
#endif
|
||||
|
||||
}
|
||||
G4cout << endl;
|
||||
G4cout << G4endl;
|
||||
}
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4NavigationHistory.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4NavigationHistory.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// G4NavigationHistory Implementation P.Kent August 96
|
||||
@@ -14,9 +14,9 @@
|
||||
#include "G4NavigationHistory.hh"
|
||||
#include "G4ios.hh"
|
||||
|
||||
ostream& operator << (ostream& os, const G4NavigationHistory& nav)
|
||||
G4std::ostream& operator << (G4std::ostream& os, const G4NavigationHistory& nav)
|
||||
{
|
||||
G4cout << "History depth="<<nav.GetDepth()<< endl;
|
||||
G4cout << "History depth="<<nav.GetDepth()<< G4endl;
|
||||
for (G4int i=0;i<=nav.GetDepth();i++)
|
||||
{
|
||||
os << "Level=["<<i<<"]: " ;
|
||||
@@ -39,7 +39,7 @@ ostream& operator << (ostream& os, const G4NavigationHistory& nav)
|
||||
}else{
|
||||
os << "Phys = <Null>";
|
||||
}
|
||||
os << endl;
|
||||
os << G4endl;
|
||||
}
|
||||
return os;
|
||||
}
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Navigator.cc,v 1.7.6.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4Navigator.cc,v 1.7.6.1.2.4 1999/12/14 07:07:52 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4Navigator Implementation Paul Kent July 95/96
|
||||
|
||||
#include "G4Navigator.hh"
|
||||
#include "G4ios.hh"
|
||||
#include <iomanip.h>
|
||||
#include "g4std/iomanip"
|
||||
|
||||
G4Navigator::G4Navigator() :
|
||||
fWasLimitedByGeometry(false),
|
||||
@@ -65,19 +65,19 @@ G4Navigator::LocateGlobalPointAndSetup(const G4ThreeVector& globalPoint,
|
||||
EInside insideCode;
|
||||
|
||||
#ifdef DEBUG_HIST
|
||||
G4cerr << "Upon entering LocateGlobalPointAndSetup " << endl;
|
||||
G4cerr << " History = " << endl << fHistory << endl << endl;
|
||||
G4cerr << "Upon entering LocateGlobalPointAndSetup " << G4endl;
|
||||
G4cerr << " History = " << G4endl << fHistory << G4endl << G4endl;
|
||||
#endif
|
||||
#ifdef G4VERBOSE
|
||||
if( fVerbose > 0 )
|
||||
{
|
||||
G4cout << "*** G4Navigator::LocateGlobalPointAndSetup: ***" << endl;
|
||||
G4cout << "*** G4Navigator::LocateGlobalPointAndSetup: ***" << G4endl;
|
||||
G4cout.precision(8);
|
||||
G4cout << " I was called with the following arguments: " << endl
|
||||
<< " Globalpoint = " << globalPoint << endl
|
||||
<< " relativeSearch = " << relativeSearch << endl;
|
||||
// << " = " << << endl
|
||||
G4cout << " Upon entering my state is: " << endl;
|
||||
G4cout << " I was called with the following arguments: " << G4endl
|
||||
<< " Globalpoint = " << globalPoint << G4endl
|
||||
<< " relativeSearch = " << relativeSearch << G4endl;
|
||||
// << " = " << << G4endl
|
||||
G4cout << " Upon entering my state is: " << G4endl;
|
||||
PrintState();
|
||||
}
|
||||
#endif
|
||||
@@ -330,13 +330,13 @@ G4Navigator::LocateGlobalPointAndSetup(const G4ThreeVector& globalPoint,
|
||||
if (targetPhysical!=0)
|
||||
curPhysVol_Name= targetPhysical->GetName();
|
||||
G4cout << " Return value = new volume = "
|
||||
<< curPhysVol_Name << endl;
|
||||
<< curPhysVol_Name << G4endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_HIST
|
||||
G4cerr << "Upon exiting LocateGlobalPointAndSetup " << endl;
|
||||
G4cerr << " History = " << endl << fHistory << endl << endl;
|
||||
G4cerr << "Upon exiting LocateGlobalPointAndSetup " << G4endl;
|
||||
G4cerr << " History = " << G4endl << fHistory << G4endl << G4endl;
|
||||
#endif
|
||||
return targetPhysical;
|
||||
}
|
||||
@@ -378,22 +378,22 @@ G4double G4Navigator::ComputeStep(const G4ThreeVector &pGlobalpoint,
|
||||
G4LogicalVolume *motherLogical=motherPhysical->GetLogicalVolume();
|
||||
|
||||
#ifdef G4VERBOSE
|
||||
cout.precision(8);
|
||||
G4std::cout.precision(8);
|
||||
if( fVerbose > 1 )
|
||||
{
|
||||
cout << "*** G4Navigator::ComputeStep: ***" << endl;
|
||||
cout.precision(8);
|
||||
cout << " I was called with the following arguments: " << endl
|
||||
<< " Globalpoint = " << setw(25) << pGlobalpoint << endl
|
||||
<< " Direction = " << setw(25) << pDirection << endl
|
||||
<< " ProposedStepLength= " << pCurrentProposedStepLength << endl;
|
||||
// << " = " << << endl
|
||||
G4cout << "*** G4Navigator::ComputeStep: ***" << G4endl;
|
||||
G4std::cout.precision(8);
|
||||
G4cout << " I was called with the following arguments: " << G4endl
|
||||
<< " Globalpoint = " << G4std::setw(25) << pGlobalpoint << G4endl
|
||||
<< " Direction = " << G4std::setw(25) << pDirection << G4endl
|
||||
<< " ProposedStepLength= " << pCurrentProposedStepLength << G4endl;
|
||||
// << " = " << << G4endl
|
||||
}
|
||||
|
||||
if( fVerbose > 2 )
|
||||
{
|
||||
// cout.precision(3);
|
||||
cout << " Upon entering my state is: " << endl;
|
||||
// G4std::cout.precision(3);
|
||||
G4cout << " Upon entering my state is: " << G4endl;
|
||||
PrintState();
|
||||
}
|
||||
#endif
|
||||
@@ -437,53 +437,53 @@ G4double G4Navigator::ComputeStep(const G4ThreeVector &pGlobalpoint,
|
||||
isError = ( diffShiftSaf >= fAccuracyForException );
|
||||
G4cerr.precision(10);
|
||||
if ( isError )
|
||||
G4cerr << "Accuracy ERROR found in G4Navigator::ComputeStep: " << endl;
|
||||
G4cerr << "Accuracy ERROR found in G4Navigator::ComputeStep: " << G4endl;
|
||||
else
|
||||
G4cerr << "Warning G4Navigator::ComputeStep found slightly inaccurate position:" << endl;
|
||||
G4cerr << "Warning G4Navigator::ComputeStep found slightly inaccurate position:" << G4endl;
|
||||
|
||||
G4cerr << " The Step's starting point has moved "
|
||||
<< sqrt(moveLenSq)/mm << " mm " << endl
|
||||
<< " since the last call to a Locate method." << endl;
|
||||
<< sqrt(moveLenSq)/mm << " mm " << G4endl
|
||||
<< " since the last call to a Locate method." << G4endl;
|
||||
G4cerr << " This has resulted in moving "
|
||||
<< shiftOrigin/mm << " mm "
|
||||
<< " from the last point at which the safety "
|
||||
<< " was calculated " << endl;
|
||||
<< " was calculated " << G4endl;
|
||||
G4cerr << " which is more than the computed safety= "
|
||||
<< fPreviousSafety/mm << " mm at that point." << endl;
|
||||
<< fPreviousSafety/mm << " mm at that point." << G4endl;
|
||||
G4cerr << " This difference is "
|
||||
<< diffShiftSaf /mm << " mm." << endl;
|
||||
<< diffShiftSaf /mm << " mm." << G4endl;
|
||||
|
||||
#ifdef G4VERBOSE
|
||||
static G4int warnNow= 0;
|
||||
if( ((++warnNow % 100) == 1) ) { // || (warnNow < 4) ){
|
||||
G4cerr << " This problem can be due to either " << endl;
|
||||
G4cerr << " This problem can be due to either " << G4endl;
|
||||
G4cerr << " - a process that has proposed a displacement"
|
||||
<< " larger than the current safety , or" << endl;
|
||||
G4cerr << " - inaccuracy in the computation of the safety" << endl;
|
||||
<< " larger than the current safety , or" << G4endl;
|
||||
G4cerr << " - inaccuracy in the computation of the safety" << G4endl;
|
||||
G4cerr << " - if you are using a magnetic field, a known conflict about the safety exists in this case."
|
||||
<< endl;
|
||||
G4cerr << " We suggest that you " << endl
|
||||
<< G4endl;
|
||||
G4cerr << " We suggest that you " << G4endl
|
||||
<< " - find i) what particle is being tracked, and "
|
||||
<< " ii) through what part of your geometry " << endl
|
||||
<< " for example by reruning this event with " << endl
|
||||
<< " /tracking/verbose 1 " << endl
|
||||
<< " ii) through what part of your geometry " << G4endl
|
||||
<< " for example by reruning this event with " << G4endl
|
||||
<< " /tracking/verbose 1 " << G4endl
|
||||
<< " - check which processes you declare for this particle"
|
||||
<< " (and look at non-standard ones) " << endl
|
||||
<< " (and look at non-standard ones) " << G4endl
|
||||
<< " - if possible create a detailed logfile "
|
||||
<< " of this event using:" << endl
|
||||
<< " of this event using:" << G4endl
|
||||
<< " /tracking/verbose 6 "
|
||||
<< endl;
|
||||
<< G4endl;
|
||||
}
|
||||
// G4cerr << " - ." << endl;
|
||||
// G4cerr << " - ." << G4endl;
|
||||
#endif
|
||||
}
|
||||
#ifdef DEBUG
|
||||
else
|
||||
{
|
||||
G4cerr << " Warning in G4Navigator::ComputeStep: " << endl
|
||||
G4cerr << " Warning in G4Navigator::ComputeStep: " << G4endl
|
||||
<< "The Step's starting point has moved " << sqrt(moveLenSq)
|
||||
<< " which has taken it to the limit of the current safety. "
|
||||
<< endl;
|
||||
<< G4endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -600,7 +600,7 @@ G4double G4Navigator::ComputeStep(const G4ThreeVector &pGlobalpoint,
|
||||
#ifdef G4VERBOSE
|
||||
if( fVerbose > 1 )
|
||||
{
|
||||
cout << " Upon exiting my state is: " << endl;
|
||||
G4cout << " Upon exiting my state is: " << G4endl;
|
||||
PrintState();
|
||||
}
|
||||
#endif
|
||||
@@ -696,10 +696,10 @@ void G4Navigator::SetupHierarchy()
|
||||
}
|
||||
}
|
||||
|
||||
ostream& operator << (ostream &os,const G4Navigator &n)
|
||||
G4std::ostream& operator << (G4std::ostream &os,const G4Navigator &n)
|
||||
{
|
||||
|
||||
os << "Current History: " << endl << n.fHistory;
|
||||
os << "Current History: " << G4endl << n.fHistory;
|
||||
return os;
|
||||
}
|
||||
|
||||
@@ -748,13 +748,13 @@ G4double G4Navigator::ComputeSafety(const G4ThreeVector &pGlobalpoint,
|
||||
#ifdef G4VERBOSE
|
||||
if( fVerbose > 0 )
|
||||
{
|
||||
G4cout << "*** G4Navigator::ComputeSafety: ***" << endl;
|
||||
G4cout << "*** G4Navigator::ComputeSafety: ***" << G4endl;
|
||||
G4cout.precision(8);
|
||||
G4cout << " I was called with the following arguments: " << endl
|
||||
<< " Globalpoint = " << pGlobalpoint << endl;
|
||||
// cout << " pMaxLength = " << pMaxLength << endl;
|
||||
G4cout << " I was called with the following arguments: " << G4endl
|
||||
<< " Globalpoint = " << pGlobalpoint << G4endl;
|
||||
// cout << " pMaxLength = " << pMaxLength << G4endl;
|
||||
|
||||
G4cout << " Upon entering my state is: " << endl;
|
||||
G4cout << " Upon entering my state is: " << G4endl;
|
||||
PrintState();
|
||||
}
|
||||
#endif
|
||||
@@ -815,10 +815,10 @@ G4double G4Navigator::ComputeSafety(const G4ThreeVector &pGlobalpoint,
|
||||
#ifdef G4VERBOSE
|
||||
if( fVerbose > 1 )
|
||||
{
|
||||
cout.precision(8);
|
||||
cout << " Upon exiting my state is: " << endl;
|
||||
G4std::cout.precision(8);
|
||||
G4cout << " Upon exiting my state is: " << G4endl;
|
||||
PrintState();
|
||||
cout << " and I return a value of Safety = " << newSafety << endl;
|
||||
G4cout << " and I return a value of Safety = " << newSafety << G4endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -842,50 +842,50 @@ void G4Navigator::PrintState()
|
||||
if( fVerbose >= 4 )
|
||||
{
|
||||
G4cout.precision(3);
|
||||
G4cout << " Upon exiting my state is: " << endl;
|
||||
G4cout << " ValidExitNormal= " << fValidExitNormal << endl
|
||||
<< " ExitNormal = " << fExitNormal << endl
|
||||
<< " Exiting = " << fExiting << endl
|
||||
<< " Entering = " << fEntering << endl
|
||||
G4cout << " Upon exiting my state is: " << G4endl;
|
||||
G4cout << " ValidExitNormal= " << fValidExitNormal << G4endl
|
||||
<< " ExitNormal = " << fExitNormal << G4endl
|
||||
<< " Exiting = " << fExiting << G4endl
|
||||
<< " Entering = " << fEntering << G4endl
|
||||
<< " BlockedPhysicalVolume= " ;
|
||||
if (fBlockedPhysicalVolume==0 )
|
||||
G4cout << "None";
|
||||
else
|
||||
G4cout << fBlockedPhysicalVolume->GetName();
|
||||
G4cout << endl
|
||||
<< " BlockedReplicaNo = " << fBlockedReplicaNo << endl
|
||||
<< " LastStepWasZero = " << fLastStepWasZero << endl
|
||||
<< endl;
|
||||
G4cout << G4endl
|
||||
<< " BlockedReplicaNo = " << fBlockedReplicaNo << G4endl
|
||||
<< " LastStepWasZero = " << fLastStepWasZero << G4endl
|
||||
<< G4endl;
|
||||
}
|
||||
if( ( 1 < fVerbose) && (fVerbose < 4) )
|
||||
{
|
||||
G4cout.precision(3);
|
||||
G4cout << setw(18) << " ExitNormal " << " "
|
||||
<< setw( 5) << " Valid " << " "
|
||||
<< setw( 9) << " Exiting " << " "
|
||||
<< setw( 9) << " Entering" << " "
|
||||
<< setw(15) << " Blocked:Volume " << " "
|
||||
<< setw( 9) << " ReplicaNo" << " "
|
||||
<< setw( 8) << " LastStepZero " << " "
|
||||
<< endl;
|
||||
G4cout << setw(18) << fExitNormal << " "
|
||||
<< setw( 5) << fValidExitNormal << " "
|
||||
<< setw( 9) << fExiting << " "
|
||||
<< setw( 9) << fEntering << " ";
|
||||
G4cout << G4std::setw(18) << " ExitNormal " << " "
|
||||
<< G4std::setw( 5) << " Valid " << " "
|
||||
<< G4std::setw( 9) << " Exiting " << " "
|
||||
<< G4std::setw( 9) << " Entering" << " "
|
||||
<< G4std::setw(15) << " Blocked:Volume " << " "
|
||||
<< G4std::setw( 9) << " ReplicaNo" << " "
|
||||
<< G4std::setw( 8) << " LastStepZero " << " "
|
||||
<< G4endl;
|
||||
G4cout << G4std::setw(18) << fExitNormal << " "
|
||||
<< G4std::setw( 5) << fValidExitNormal << " "
|
||||
<< G4std::setw( 9) << fExiting << " "
|
||||
<< G4std::setw( 9) << fEntering << " ";
|
||||
if (fBlockedPhysicalVolume==0 )
|
||||
G4cout << setw(15) << "None";
|
||||
G4cout << G4std::setw(15) << "None";
|
||||
else
|
||||
G4cout << setw(15)<< fBlockedPhysicalVolume->GetName();
|
||||
G4cout << setw( 9) << fBlockedReplicaNo << " "
|
||||
<< setw( 8) << fLastStepWasZero << " "
|
||||
<< endl;
|
||||
G4cout << G4std::setw(15)<< fBlockedPhysicalVolume->GetName();
|
||||
G4cout << G4std::setw( 9) << fBlockedReplicaNo << " "
|
||||
<< G4std::setw( 8) << fLastStepWasZero << " "
|
||||
<< G4endl;
|
||||
}
|
||||
if( fVerbose > 2 )
|
||||
{
|
||||
G4cout.precision(8);
|
||||
G4cout << " Current Localpoint = " << fLastLocatedPointLocal << endl;
|
||||
G4cout << " PreviousSftOrigin = " << fPreviousSftOrigin << endl;
|
||||
G4cout << " PreviousSafety = " << fPreviousSafety << endl;
|
||||
G4cout << " Current Localpoint = " << fLastLocatedPointLocal << G4endl;
|
||||
G4cout << " PreviousSftOrigin = " << fPreviousSftOrigin << G4endl;
|
||||
G4cout << " PreviousSafety = " << fPreviousSafety << G4endl;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -959,15 +959,15 @@ void G4Navigator::LocateGlobalPointWithinVolume(const G4ThreeVector& pGlobalpoi
|
||||
|
||||
if( pOldVol != pNewVol ){
|
||||
// This is abnormal behaviour.
|
||||
cerr << " ERROR in G4Navigator::LocateGlobalPointWithinVolume " << endl;
|
||||
cerr << " A volume change has occured - this is not expected & illegal" << endl;
|
||||
cerr << " Old volume name = " << pOldVol->GetName() << endl;
|
||||
cerr << " New volume name = " << pNewVol->GetName() << endl;
|
||||
G4cerr << " ERROR in G4Navigator::LocateGlobalPointWithinVolume " << G4endl;
|
||||
G4cerr << " A volume change has occured - this is not expected & illegal" << G4endl;
|
||||
G4cerr << " Old volume name = " << pOldVol->GetName() << G4endl;
|
||||
G4cerr << " New volume name = " << pNewVol->GetName() << G4endl;
|
||||
|
||||
G4VPhysicalVolume *pNewVol2;
|
||||
pNewVol2= LocateGlobalPointAndSetup(pGlobalpoint, 0);
|
||||
//, G4ThreeVector(1.,0.,0.));
|
||||
cerr << " Tried again & found volume= " << pNewVol2->GetName() << endl;
|
||||
G4cerr << " Tried again & found volume= " << pNewVol2->GetName() << G4endl;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4NormalNavigation.cc,v 1.1.10.1 1999/12/07 20:48:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4NormalNavigation.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4NormalNavigation Implementation
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ParameterisedNavigation.cc,v 1.1.10.1 1999/12/07 20:48:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4ParameterisedNavigation.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4ParameterisedNavigation Implementation
|
||||
@@ -17,7 +17,7 @@ G4ParameterisedNavigation::~G4ParameterisedNavigation()
|
||||
{
|
||||
#ifdef G4DEBUG_NAVIGATION
|
||||
cout << "G4ParameterisedNavigation::~G4ParameterisedNavigation() called."
|
||||
<< endl;
|
||||
<< G4endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4PropagatorInField.cc,v 1.8.6.1 1999/12/07 20:48:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4PropagatorInField.cc,v 1.9 1999/12/15 14:50:26 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "G4PropagatorInField.hh"
|
||||
#include "G4ios.hh"
|
||||
#include <iomanip.h>
|
||||
#include "g4std/iomanip"
|
||||
|
||||
// Initialisation moved to G4TransportationManager.cc, to ensure
|
||||
// correct order initialisation of static (class) data members
|
||||
@@ -115,9 +115,9 @@ G4PropagatorInField::
|
||||
if( (stepTrial == 0.0)
|
||||
|| ( fNoZeroStep > 5*fThresholdNo_ZeroSteps ) ) {
|
||||
G4cerr << " G4PropagatorInField::ComputeStep "
|
||||
<< " ERROR : attempting a zero step= " << stepTrial << endl
|
||||
<< " ERROR : attempting a zero step= " << stepTrial << G4endl
|
||||
<< " and/or no progress after " << fNoZeroStep
|
||||
<< " trial steps. ABORTING." << endl;
|
||||
<< " trial steps. ABORTING." << G4endl;
|
||||
G4Exception("G4PropagatorInField::ComputeStep No progress - Looping with zero steps");
|
||||
}
|
||||
}
|
||||
@@ -181,7 +181,7 @@ G4PropagatorInField::
|
||||
intersects= (LinearStepLength <= ChordAB_Length);
|
||||
// G4Navigator contracts to return k_infinity if len==asked
|
||||
// and it did not find a surface boundary at that length
|
||||
LinearStepLength = min( LinearStepLength, ChordAB_Length);
|
||||
LinearStepLength = G4std::min( LinearStepLength, ChordAB_Length);
|
||||
|
||||
if( intersects )
|
||||
{
|
||||
@@ -209,7 +209,7 @@ G4PropagatorInField::
|
||||
#ifdef G4VERBOSE
|
||||
if( Verbose() > 0 )
|
||||
G4cout << " Found intersection after Step of length " <<
|
||||
StepTaken << endl;
|
||||
StepTaken << G4endl;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
@@ -243,11 +243,11 @@ G4PropagatorInField::
|
||||
if( do_loop_count >= GetMaxLoopCount() ){
|
||||
|
||||
G4cerr << "G4PropagateInField: Warning: Particle is looping - "
|
||||
<< " tracking in field will be stopped. " << endl;
|
||||
<< " tracking in field will be stopped. " << G4endl;
|
||||
G4cerr << " It has performed " << do_loop_count << " steps in Field "
|
||||
<< " while a maximum of " << GetMaxLoopCount() << " are allowed. "
|
||||
<< endl;
|
||||
//G4cerr << " In future this will be treated better/quicker. " << endl;
|
||||
<< G4endl;
|
||||
//G4cerr << " In future this will be treated better/quicker. " << G4endl;
|
||||
fParticleIsLooping= true;
|
||||
}
|
||||
#endif
|
||||
@@ -281,7 +281,7 @@ G4PropagatorInField::
|
||||
<< " and is " << End_PointAndTangent.CurveS()
|
||||
<< " a difference of "
|
||||
<< OriginalState.CurveS() + TruePathLength
|
||||
- End_PointAndTangent.CurveS() << endl;
|
||||
- End_PointAndTangent.CurveS() << G4endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -423,7 +423,7 @@ G4PropagatorInField::LocateIntersectionPoint(
|
||||
ChordAF_Length, NewSafety);
|
||||
|
||||
G4bool Intersects_AF = (stepLength <= ChordAF_Length);
|
||||
stepLength = min(stepLength, ChordAF_Length);
|
||||
stepLength = G4std::min(stepLength, ChordAF_Length);
|
||||
if( Intersects_AF ){
|
||||
// There is an intersection of AF with a volume boundary
|
||||
|
||||
@@ -458,7 +458,7 @@ G4PropagatorInField::LocateIntersectionPoint(
|
||||
ChordFB_Length, NewSafety);
|
||||
|
||||
G4bool Intersects_FB = stepLength <= ChordFB_Length;
|
||||
stepLength = min(stepLength, ChordFB_Length);
|
||||
stepLength = G4std::min(stepLength, ChordFB_Length);
|
||||
if( Intersects_FB ) {
|
||||
// There is an intersection of FB with a volume boundary
|
||||
// H <- First Intersection of Chord FB
|
||||
@@ -510,12 +510,12 @@ G4PropagatorInField::LocateIntersectionPoint(
|
||||
if( (noInaccuracyWarnings < maxNoWarnings )
|
||||
|| (Verbose() > 1) ){
|
||||
G4cerr << "G4PropagatorInField::LocateIntersectionPoint: "
|
||||
<< " Warning: Integration inaccuracy requires " << endl
|
||||
<< " an adjustment in the step's endpoint " << endl
|
||||
<< " Warning: Integration inaccuracy requires " << G4endl
|
||||
<< " an adjustment in the step's endpoint " << G4endl
|
||||
<< " Two mid-points are further apart than their "
|
||||
<< "curve length difference" << endl
|
||||
<< "curve length difference" << G4endl
|
||||
<< " Dist = " << sqrt(linDistSq)
|
||||
<< " curve length = " << curveDist << endl;
|
||||
<< " curve length = " << curveDist << G4endl;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -565,21 +565,21 @@ void G4PropagatorInField::printStatus(
|
||||
static G4int noPrecision= 4;
|
||||
G4cout.precision(noPrecision);
|
||||
// G4cout.setf(ios_base::fixed,ios_base::floatfield);
|
||||
G4cout << setw( 6) << " "
|
||||
<< setw( 25) << " Current Position and Direction" << " "
|
||||
<< endl;
|
||||
G4cout << setw( 5) << "Step#" << " "
|
||||
<< setw( 9) << "X(mm)" << " "
|
||||
<< setw( 9) << "Y(mm)" << " "
|
||||
<< setw( 9) << "Z(mm)" << " "
|
||||
<< setw( 7) << " N_x " << " "
|
||||
<< setw( 7) << " N_y " << " "
|
||||
<< setw( 7) << " N_z " << " "
|
||||
<< setw( 9) << "StepLen" << " "
|
||||
<< setw( 9) << "PhsStep" << " "
|
||||
<< setw(12) << "StartSafety" << " "
|
||||
<< setw(18) << "NextVolume" << " "
|
||||
<< endl;
|
||||
G4cout << G4std::setw( 6) << " "
|
||||
<< G4std::setw( 25) << " Current Position and Direction" << " "
|
||||
<< G4endl;
|
||||
G4cout << G4std::setw( 5) << "Step#" << " "
|
||||
<< 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( 9) << "StepLen" << " "
|
||||
<< G4std::setw( 9) << "PhsStep" << " "
|
||||
<< G4std::setw(12) << "StartSafety" << " "
|
||||
<< G4std::setw(18) << "NextVolume" << " "
|
||||
<< G4endl;
|
||||
// Recurse to print the start values
|
||||
printStatus( StartFT, StartFT, //
|
||||
-1.0, safety, -1, 0); // startVolume);
|
||||
@@ -589,45 +589,45 @@ void G4PropagatorInField::printStatus(
|
||||
{
|
||||
G4cout.precision(3);
|
||||
if( stepNo >= 0)
|
||||
G4cout << setw( 5) << stepNo << " ";
|
||||
G4cout << G4std::setw( 5) << stepNo << " ";
|
||||
else
|
||||
G4cout << setw( 5) << "Start" << " ";
|
||||
G4cout << setw( 9) << CurrentPosition.x() << " "
|
||||
<< setw( 9) << CurrentPosition.y() << " "
|
||||
<< setw( 9) << CurrentPosition.z() << " "
|
||||
<< setw( 7) << CurrentUnitVelocity.x() << " "
|
||||
<< setw( 7) << CurrentUnitVelocity.y() << " "
|
||||
<< setw( 7) << CurrentUnitVelocity.z() << " ";
|
||||
G4cout << setw( 9) << step_len << " ";
|
||||
G4cout << G4std::setw( 5) << "Start" << " ";
|
||||
G4cout << G4std::setw( 9) << CurrentPosition.x() << " "
|
||||
<< G4std::setw( 9) << CurrentPosition.y() << " "
|
||||
<< G4std::setw( 9) << CurrentPosition.z() << " "
|
||||
<< G4std::setw( 7) << CurrentUnitVelocity.x() << " "
|
||||
<< G4std::setw( 7) << CurrentUnitVelocity.y() << " "
|
||||
<< G4std::setw( 7) << CurrentUnitVelocity.z() << " ";
|
||||
G4cout << G4std::setw( 9) << step_len << " ";
|
||||
if( requestStep != -1.0 )
|
||||
G4cout << setw( 9) << requestStep << " ";
|
||||
G4cout << G4std::setw( 9) << requestStep << " ";
|
||||
else
|
||||
G4cout << setw( 9) << " InitialStep " << " ";
|
||||
G4cout << setw(12) << safety << " ";
|
||||
G4cout << G4std::setw( 9) << " InitialStep " << " ";
|
||||
G4cout << G4std::setw(12) << safety << " ";
|
||||
|
||||
if( startVolume != 0) {
|
||||
G4cout << setw(12) << startVolume->GetName() << " ";
|
||||
G4cout << G4std::setw(12) << startVolume->GetName() << " ";
|
||||
} else {
|
||||
if( step_len != -1 )
|
||||
G4cout << setw(12) << "OutOfWorld" << " ";
|
||||
G4cout << G4std::setw(12) << "OutOfWorld" << " ";
|
||||
else
|
||||
G4cout << setw(12) << "NotGiven" << " ";
|
||||
G4cout << G4std::setw(12) << "NotGiven" << " ";
|
||||
}
|
||||
|
||||
G4cout << endl;
|
||||
G4cout << G4endl;
|
||||
}
|
||||
|
||||
else // if( verboseLevel > 3 )
|
||||
{
|
||||
// Multi-line output
|
||||
|
||||
// G4cout << "Current Position is " << CurrentPosition << endl
|
||||
// << " and UnitVelocity is " << CurrentUnitVelocity << endl;
|
||||
// G4cout << "Current Position is " << CurrentPosition << G4endl
|
||||
// << " and UnitVelocity is " << CurrentUnitVelocity << G4endl;
|
||||
G4cout << "Step taken was " << step_len
|
||||
<< " out of PhysicalStep= " << requestStep << endl;
|
||||
G4cout << "Final safety is: " << safety << endl;
|
||||
<< " out of PhysicalStep= " << requestStep << G4endl;
|
||||
G4cout << "Final safety is: " << safety << G4endl;
|
||||
|
||||
G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag() << endl;
|
||||
G4cout << endl;
|
||||
G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag() << G4endl;
|
||||
G4cout << G4endl;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ReplicaNavigation.cc,v 1.1.10.1 1999/12/07 20:48:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4ReplicaNavigation.cc,v 1.2 1999/12/15 14:50:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4REplicaNavigation Implementation
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4TouchableHistory.cc,v 1.2.2.1 1999/12/07 20:48:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4TouchableHistory.cc,v 1.3 1999/12/15 14:50:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4TouchableHistory Implementation
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4TransportationManager.cc,v 1.4.2.1 1999/12/07 20:48:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4TransportationManager.cc,v 1.5 1999/12/15 14:50:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// G4TransportationManager
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4VoxelNavigation.cc,v 1.3.8.1 1999/12/07 20:48:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4VoxelNavigation.cc,v 1.4 1999/12/15 14:50:27 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4VoxelNavigation Implementation
|
||||
@@ -245,7 +245,7 @@ G4double G4VoxelNavigation::ComputeVoxelSafety(const G4ThreeVector&localPoint) c
|
||||
else // (maxCurNodeNoDelta == minCurNodeNoDelta)
|
||||
{
|
||||
voxelSafety=minCurNodeNoDelta*curNodeWidth;
|
||||
voxelSafety+=min(minCurCommonDelta,maxCurCommonDelta);
|
||||
voxelSafety+=G4std::min(minCurCommonDelta,maxCurCommonDelta);
|
||||
}
|
||||
|
||||
// Compute isotropic safety to boundaries of previous levels
|
||||
@@ -327,7 +327,7 @@ G4bool G4VoxelNavigation::LocateNextVoxel(const G4ThreeVector& localPoint,
|
||||
maxVal=minVal+workNodeWidth;
|
||||
if (maxVal<=workCoord-kCarTolerance*0.5)
|
||||
{
|
||||
// G4cout << "Must consider next voxel" << endl;
|
||||
// G4cout << "Must consider next voxel" << G4endl;
|
||||
newNodeNo=workNodeNo+1;
|
||||
newHeader=workHeader;
|
||||
newDistance=(maxVal-localPoint(workHeaderAxis))/localDirection(workHeaderAxis);
|
||||
@@ -522,6 +522,6 @@ G4double G4VoxelNavigation::ComputeSafety(const G4ThreeVector &localPoint,
|
||||
G4VoxelNavigation::~G4VoxelNavigation()
|
||||
{
|
||||
#ifdef G4DEBUG_NAVIGATION
|
||||
cout << "G4VoxelNavigation::~G4VoxelNavigation() called." << endl;
|
||||
cout << "G4VoxelNavigation::~G4VoxelNavigation() called." << G4endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user