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

Import Geant4 10.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 14:11:04 +02:00
parent c9b32a6c0a
commit d4af681f38
4886 changed files with 420149 additions and 1023309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/History
+7 -1
View File
@@ -1,4 +1,4 @@
$Id: History 81774 2014-06-05 08:36:37Z gcosmo $
$Id: History 91269 2015-06-29 07:05:59Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,12 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
26th June 2015 J. Allison (tracking-V10-01-01)
- G4RichTrajectory.cc: Coverity fix.
20th May 2015 J. Allison (tracking-V10-01-00)
- Added Creator Model ID and Creator Model Name to G4Atts of G4RichTrajectory.
4th June 2014 L. Desorgher (tracking-V10-00-00)
-Corrections in G4AdjointSteppingAction and G4AdjointTrackingAction to have
the treatment of adj and forward tracks in the same event
source/tracking/include/G4RichTrajectory.hh
+2 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4RichTrajectory.hh 69003 2013-04-15 09:25:23Z gcosmo $
// $Id: G4RichTrajectory.hh 90219 2015-05-21 08:07:27Z gcosmo $
//
//---------------------------------------------------------------
//
@@ -102,6 +102,7 @@ private:
G4TouchableHandle fpInitialVolume;
G4TouchableHandle fpInitialNextVolume;
const G4VProcess* fpCreatorProcess;
G4int fCreatorModelID;
G4TouchableHandle fpFinalVolume;
G4TouchableHandle fpFinalNextVolume;
const G4VProcess* fpEndingProcess;
source/tracking/src/G4RichTrajectory.cc
+26 -5
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4RichTrajectory.cc 69003 2013-04-15 09:25:23Z gcosmo $
// $Id: G4RichTrajectory.cc 91269 2015-06-29 07:05:59Z gcosmo $
//
// ---------------------------------------------------------------
//
@@ -47,6 +47,7 @@
#include "G4AttDefStore.hh"
#include "G4AttDef.hh"
#include "G4AttValue.hh"
#include "G4UIcommand.hh"
#include "G4UnitsTable.hh"
#include "G4VProcess.hh"
@@ -62,6 +63,7 @@ G4ThreadLocal G4Allocator<G4RichTrajectory> *aRichTrajectoryAllocator = 0;
G4RichTrajectory::G4RichTrajectory():
fpRichPointsContainer(0),
fpCreatorProcess(0),
fCreatorModelID(0),
fpEndingProcess(0),
fFinalKineticEnergy(0.)
{
@@ -80,6 +82,7 @@ G4RichTrajectory::G4RichTrajectory(const G4Track* aTrack):
fpInitialVolume = aTrack->GetTouchableHandle();
fpInitialNextVolume = aTrack->GetNextTouchableHandle();
fpCreatorProcess = aTrack->GetCreatorProcess();
fCreatorModelID = aTrack->GetCreatorModelID();
// On construction, set final values to initial values.
// Final values are updated at the addition of every step - see AppendStep.
fpFinalVolume = aTrack->GetTouchableHandle();
@@ -97,6 +100,7 @@ G4RichTrajectory::G4RichTrajectory(G4RichTrajectory & right):
fpInitialVolume = right.fpInitialVolume;
fpInitialNextVolume = right.fpInitialNextVolume;
fpCreatorProcess = right.fpCreatorProcess;
fCreatorModelID = right.fCreatorModelID;
fpFinalVolume = right.fpFinalVolume;
fpFinalNextVolume = right.fpFinalNextVolume;
fpEndingProcess = right.fpEndingProcess;
@@ -191,11 +195,19 @@ const std::map<G4String,G4AttDef>* G4RichTrajectory::GetAttDefs() const
ID = "CPN";
(*store)[ID] = G4AttDef(ID,"Creator Process Name",
"Physics","","G4String");
"Physics","","G4String");
ID = "CPTN";
(*store)[ID] = G4AttDef(ID,"Creator Process Type Name",
"Physics","","G4String");
"Physics","","G4String");
ID = "CMID";
(*store)[ID] = G4AttDef(ID,"Creator Model ID",
"Physics","","G4int");
ID = "CMN";
(*store)[ID] = G4AttDef(ID,"Creator Model Name",
"Physics","","G4String");
ID = "FVPath";
(*store)[ID] = G4AttDef(ID,"Final Volume Path",
@@ -252,12 +264,21 @@ std::vector<G4AttValue>* G4RichTrajectory::CreateAttValues() const
}
if (fpCreatorProcess) {
values->push_back(G4AttValue("CPN",fpCreatorProcess->GetProcessName(),""));
values->push_back
(G4AttValue("CPN",fpCreatorProcess->GetProcessName(),""));
G4ProcessType type = fpCreatorProcess->GetProcessType();
values->push_back(G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),""));
values->push_back
(G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),""));
values->push_back
(G4AttValue("CMID",G4UIcommand::ConvertToString(fCreatorModelID),""));
const G4String& creatorModelName =
G4PhysicsModelCatalog::GetModelName(fCreatorModelID);
values->push_back(G4AttValue("CMN",creatorModelName,""));
} else {
values->push_back(G4AttValue("CPN","None",""));
values->push_back(G4AttValue("CPTN","None",""));
values->push_back(G4AttValue("CMID","None",""));
values->push_back(G4AttValue("CMN","None",""));
}
if (fpFinalVolume && fpFinalVolume->GetVolume()) {