Import Geant4 9.6.0 source tree
This commit is contained in:
@@ -23,8 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4AdjointCrossSurfChecker.cc,v 1.2 2009-11-18 18:04:11 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Class Name: G4AdjointCrossSurfChecker
|
||||
@@ -34,12 +33,14 @@
|
||||
// Customer: ESA/ESTEC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include"G4AdjointCrossSurfChecker.hh"
|
||||
#include"G4Step.hh"
|
||||
#include"G4StepPoint.hh"
|
||||
#include"G4PhysicalVolumeStore.hh"
|
||||
#include"G4VSolid.hh"
|
||||
#include"G4AffineTransform.hh"
|
||||
#include "G4AdjointCrossSurfChecker.hh"
|
||||
#include "G4PhysicalConstants.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
#include "G4Step.hh"
|
||||
#include "G4StepPoint.hh"
|
||||
#include "G4PhysicalVolumeStore.hh"
|
||||
#include "G4VSolid.hh"
|
||||
#include "G4AffineTransform.hh"
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -283,8 +284,7 @@ G4bool G4AdjointCrossSurfChecker::AddaSphericalSurfaceWithCenterAtTheCenterOfAVo
|
||||
G4VPhysicalVolume* daughter =thePhysicalVolume;
|
||||
G4LogicalVolume* mother = thePhysicalVolume->GetMotherLogical();
|
||||
G4AffineTransform theTransformationFromPhysVolToWorld = G4AffineTransform();
|
||||
G4PhysicalVolumeStore* thePhysVolStore =G4PhysicalVolumeStore::GetInstance();
|
||||
while (mother){
|
||||
while (mother){
|
||||
theTransformationFromPhysVolToWorld *=
|
||||
G4AffineTransform(daughter->GetFrameRotation(),daughter->GetObjectTranslation());
|
||||
/*G4cout<<"Mother "<<mother->GetName()<<std::endl;
|
||||
|
||||
@@ -23,8 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4AdjointSteppingAction.cc,v 1.4 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Class Name: G4AdjointSteppingAction
|
||||
@@ -116,5 +115,17 @@ void G4AdjointSteppingAction::UserSteppingAction(const G4Step* aStep)
|
||||
return;
|
||||
}
|
||||
}
|
||||
//Check for reaching out of world
|
||||
if (aStep->GetPostStepPoint()->GetStepStatus() == fWorldBoundary) {
|
||||
did_adj_part_reach_ext_source=true;
|
||||
last_momentum =aTrack->GetMomentum();
|
||||
last_ekin=aTrack->GetKineticEnergy();
|
||||
last_weight = aTrack->GetWeight();
|
||||
last_part_def = aTrack->GetDefinition();
|
||||
last_pos = crossing_pos;
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectory.cc,v 1.9 2010-02-22 21:26:56 allison Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectoryPoint.cc,v 1.6 2010-02-22 21:26:56 allison Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
@@ -228,10 +227,10 @@ G4RichTrajectoryPoint::GetAttDefs() const
|
||||
return store;
|
||||
}
|
||||
|
||||
static G4String Status(G4StepStatus s)
|
||||
static G4String Status(G4StepStatus stps)
|
||||
{
|
||||
G4String status;
|
||||
switch (s) {
|
||||
switch (stps) {
|
||||
case fWorldBoundary: status = "fWorldBoundary"; break;
|
||||
case fGeomBoundary: status = "fGeomBoundary"; break;
|
||||
case fAtRestDoItProc: status = "fAtRestDoItProc"; break;
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectory.cc,v 1.22 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006-06-29 21:16:01 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingManager.cc,v 1.51 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingManager2.cc,v 1.38 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SteppingVerbose.cc,v 1.24 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -42,7 +41,7 @@
|
||||
|
||||
#include "G4SteppingVerbose.hh"
|
||||
#include "G4SteppingManager.hh"
|
||||
|
||||
#include "G4SystemOfUnits.hh"
|
||||
#include "G4VSensitiveDetector.hh" // Include from 'hits/digi'
|
||||
#include "G4StepStatus.hh" // Include from 'tracking'
|
||||
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4TrackingManager.cc,v 1.23 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4TrackingMessenger.cc,v 1.15 2006-11-03 11:13:38 allison Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Trajectory.cc,v 1.35 2010-06-16 20:03:00 allison Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4TrajectoryPoint.cc,v 1.19 2006-06-29 21:16:15 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UserSteppingAction.cc,v 1.11 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UserTrackingAction.cc,v 1.11 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VSteppingVerbose.cc,v 1.19 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VTrajectory.cc,v 1.17 2010-07-19 13:41:21 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ---------------------------------------------------------------
|
||||
//
|
||||
@@ -91,17 +90,14 @@ void G4VTrajectory::ShowTrajectory(std::ostream& os) const
|
||||
for (G4int i = 0; i < GetPointEntries(); i++) {
|
||||
|
||||
G4VTrajectoryPoint* aTrajectoryPoint = GetPoint(i);
|
||||
std::vector<G4AttValue>* attValues
|
||||
= aTrajectoryPoint->CreateAttValues();
|
||||
const std::map<G4String,G4AttDef>* attDefs
|
||||
= aTrajectoryPoint->GetAttDefs();
|
||||
attValues = aTrajectoryPoint->CreateAttValues();
|
||||
attDefs = aTrajectoryPoint->GetAttDefs();
|
||||
|
||||
// Ensure validity...
|
||||
if (G4AttCheck(attValues,attDefs).Check("G4VTrajectory::ShowTrajectory")) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<G4AttValue>::iterator iAttVal;
|
||||
for (iAttVal = attValues->begin();
|
||||
iAttVal != attValues->end(); ++iAttVal) {
|
||||
std::map<G4String,G4AttDef>::const_iterator iAttDef =
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VTrajectoryPoint.cc,v 1.4 2006-06-29 21:16:26 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user