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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/src/G4SteppingManager.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SteppingManager.cc,v 1.7.6.1 1999/12/07 20:53:06 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4SteppingManager.cc,v 1.8 1999/12/15 14:53:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//---------------------------------------------------------------
@@ -168,7 +168,7 @@ G4StepStatus G4SteppingManager::Stepping()
// Update safety after invocation of all AlongStepDoIts
endpointSafOrigin= fPostStepPoint->GetPosition();
endpointSafety= max( proposedSafety - GeomStepLength, 0.);
endpointSafety= G4std::max( proposedSafety - GeomStepLength, 0.);
fStep->GetPostStepPoint()->SetSafety( endpointSafety );
source/tracking/src/G4SteppingVerbose.cc
+304 -304
View File
File diff suppressed because it is too large Load Diff
source/tracking/src/G4TrackingManager.cc
+7 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TrackingManager.cc,v 1.4.6.1 1999/12/07 20:53:06 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4TrackingManager.cc,v 1.5 1999/12/15 14:53:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//---------------------------------------------------------------
@@ -146,21 +146,21 @@ void G4TrackingManager::Verbose(G4String select)
if( select == "ProcessOneTrack" ){
#ifdef G4VERBOSE
if(verboseLevel >= 1) {
G4cout << endl;
G4cout << G4endl;
G4cout << "*******************************************************"
<< "**************************************************"
<< endl;
<< G4endl;
G4cout << "* G4Track Information: "
<< " Particle = " << fpTrack->GetDefinition()->GetParticleName()
<< ","
<< " Track ID = " << fpTrack->GetTrackID()
<< ","
<< " Parent ID = " << fpTrack->GetParentID()
<< endl;
<< G4endl;
G4cout << "*******************************************************"
<< "**************************************************"
<< endl;
G4cout << endl;
<< G4endl;
G4cout << G4endl;
}
#endif
source/tracking/src/G4TrackingMessenger.cc
+11 -10
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TrackingMessenger.cc,v 1.4.6.1 1999/12/07 20:53:07 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4TrackingMessenger.cc,v 1.6 2000/01/23 09:51:36 tsasaki Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//---------------------------------------------------------------
@@ -36,11 +36,7 @@
#include "G4TrackStatus.hh"
#include "G4ios.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
///////////////////////////////////////////////////////////////////
G4TrackingMessenger::G4TrackingMessenger(G4TrackingManager * trMan)
@@ -106,7 +102,7 @@ void G4TrackingMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
if( command == VerboseCmd ){
G4int vl;
const char* t = newValues;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl;
trackingManager->SetVerboseLevel(vl);
}
@@ -123,7 +119,7 @@ void G4TrackingMessenger::SetNewValue(G4UIcommand * command,G4String newValues)
if( command == StoreTrajectoryCmd ){
G4int vl;
const char* t = newValues;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl;
trackingManager->SetStoreTrajectory(vl!=0);
}
@@ -136,10 +132,15 @@ G4String G4TrackingMessenger::GetCurrentValue(G4UIcommand * command)
{
if( command == VerboseCmd ){
char line[100];
ostrstream os(line,100);
G4std::ostrstream os(line,100);
os << trackingManager->GetVerboseLevel() << '\0';
return G4String(line);
}
else if( command == StoreTrajectoryCmd ){
G4String ll = "0";
if(trackingManager->GetStoreTrajectory()) ll = "1";
return ll;
}
return G4String('\0');
}
source/tracking/src/G4Trajectory.cc
+22 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4Trajectory.cc,v 1.5.4.1.2.1 1999/12/07 20:53:07 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4Trajectory.cc,v 1.8 2000/01/26 04:20:34 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------
@@ -91,17 +91,17 @@ G4Trajectory::~G4Trajectory()
void G4Trajectory::ShowTrajectory() const
///////////////////////////////////
{
G4cout << endl << "TrackID =" << fTrackID
<< ":ParentID=" << fParentID << endl;
G4cout << G4endl << "TrackID =" << fTrackID
<< ":ParentID=" << fParentID << G4endl;
G4cout << "Particle name : " << ParticleName
<< " Charge : " << PDGCharge << endl;
<< " Charge : " << PDGCharge << G4endl;
G4cout << " Current trajectory has " << positionRecord->entries()
<< " points." << endl;
<< " points." << G4endl;
for( size_t i=0 ; i < positionRecord->entries() ; i++){
G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[i]);
G4cout << "Point[" << i << "]"
<< " Position= " << aTrajectoryPoint->GetPosition() << endl;
<< " Position= " << aTrajectoryPoint->GetPosition() << G4endl;
}
}
@@ -167,3 +167,18 @@ G4ParticleDefinition* G4Trajectory::GetParticleDefinition()
return (G4ParticleTable::GetParticleTable()->FindParticle(ParticleName));
}
/////////////////////////////////////////////
void G4Trajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
/////////////////////////////////////////////
{
if(!secondTrajectory) return;
G4Trajectory* seco = (G4Trajectory*)secondTrajectory;
G4int ent = seco->GetPointEntries();
for(int i=1;i<ent;i++) // initial point of the second trajectory should not be merged
{
positionRecord->append(seco->positionRecord->removeAt(1));
}
}
source/tracking/src/G4TrajectoryPoint.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TrajectoryPoint.cc,v 1.3.6.1 1999/12/07 20:53:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4TrajectoryPoint.cc,v 1.4 1999/12/15 14:53:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------
source/tracking/src/G4UserSteppingAction.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UserSteppingAction.cc,v 1.3.6.1 1999/12/07 20:53:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UserSteppingAction.cc,v 1.4 1999/12/15 14:54:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------
source/tracking/src/G4UserTrackingAction.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UserTrackingAction.cc,v 1.3.6.1 1999/12/07 20:53:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UserTrackingAction.cc,v 1.4 1999/12/15 14:54:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------
source/tracking/src/G4VSteppingVerbose.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VSteppingVerbose.cc,v 1.2.6.1 1999/12/07 20:53:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VSteppingVerbose.cc,v 1.3 1999/12/15 14:54:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//---------------------------------------------------------------