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

Import Geant4 8.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 14:55:03 +02:00
parent 216a75eeb1
commit fe73f43734
6714 changed files with 118229 additions and 68144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/src/G4Trajectory.cc
+17 -16
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Trajectory.cc,v 1.30 2006/06/29 21:16:13 gunter Exp $
// GEANT4 tag $Name: geant4-08-01 $
// $Id: G4Trajectory.cc,v 1.32 2006/10/16 13:39:35 allison Exp $
// GEANT4 tag $Name: geant4-08-02 $
//
// ---------------------------------------------------------------
//
@@ -94,14 +94,15 @@ G4Trajectory::G4Trajectory(G4Trajectory & right):G4VTrajectory()
G4Trajectory::~G4Trajectory()
{
// positionRecord->clearAndDestroy();
size_t i;
for(i=0;i<positionRecord->size();i++){
delete (*positionRecord)[i];
if (positionRecord) {
// positionRecord->clearAndDestroy();
size_t i;
for(i=0;i<positionRecord->size();i++){
delete (*positionRecord)[i];
}
positionRecord->clear();
delete positionRecord;
}
positionRecord->clear();
delete positionRecord;
}
void G4Trajectory::ShowTrajectory(std::ostream& os) const
@@ -126,31 +127,31 @@ const std::map<G4String,G4AttDef>* G4Trajectory::GetAttDefs() const
if (isNew) {
G4String ID("ID");
(*store)[ID] = G4AttDef(ID,"Track ID","Bookkeeping","","G4int");
(*store)[ID] = G4AttDef(ID,"Track ID","Physics","","G4int");
G4String PID("PID");
(*store)[PID] = G4AttDef(PID,"Parent ID","Bookkeeping","","G4int");
(*store)[PID] = G4AttDef(PID,"Parent ID","Physics","","G4int");
G4String PN("PN");
(*store)[PN] = G4AttDef(PN,"Particle Name","Bookkeeping","","G4String");
(*store)[PN] = G4AttDef(PN,"Particle Name","Physics","","G4String");
G4String Ch("Ch");
(*store)[Ch] = G4AttDef(Ch,"Charge","Physics","e+","G4double");
G4String PDG("PDG");
(*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Bookkeeping","","G4int");
(*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Physics","","G4int");
G4String IMom("IMom");
(*store)[IMom] = G4AttDef(IMom, "Momentum of track at start of trajectory",
(*store)[IMom] = G4AttDef(IMom, "Momentum at start of trajectory",
"Physics","G4BestUnit","G4ThreeVector");
G4String IMag("IMag");
(*store)[IMag] =
G4AttDef(IMag, "Magnitude of momentum of track at start of trajectory",
G4AttDef(IMag, "Magnitude of momentum at start of trajectory",
"Physics","G4BestUnit","G4double");
G4String NTP("NTP");
(*store)[NTP] = G4AttDef(NTP,"No. of points","Bookkeeping","","G4int");
(*store)[NTP] = G4AttDef(NTP,"No. of points","Physics","","G4int");
}
return store;