| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
26 // G4RichTrajectory class implementation 26 // G4RichTrajectory class implementation
27 // 27 //
28 // Contact: 28 // Contact:
29 // Questions and comments on G4Trajectory, o 29 // Questions and comments on G4Trajectory, on which this is based,
30 // should be sent to 30 // should be sent to
31 // Katsuya Amako (e-mail: Katsuya.Amako@k 31 // Katsuya Amako (e-mail: Katsuya.Amako@kek.jp)
32 // Makoto Asai (e-mail: asai@slac.stanf 32 // Makoto Asai (e-mail: asai@slac.stanford.edu)
33 // Takashi Sasaki (e-mail: Takashi.Sasaki@ 33 // Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
34 // and on the extended code to: 34 // and on the extended code to:
35 // John Allison (e-mail: John.Allison@ma 35 // John Allison (e-mail: John.Allison@manchester.ac.uk)
36 // Joseph Perl (e-mail: perl@slac.stanf 36 // Joseph Perl (e-mail: perl@slac.stanford.edu)
37 // ------------------------------------------- 37 // --------------------------------------------------------------------
38 38
39 #include "G4RichTrajectory.hh" 39 #include "G4RichTrajectory.hh"
40 #include "G4ClonedRichTrajectory.hh" << 40 #include "G4RichTrajectoryPoint.hh"
41 <<
42 #include "G4ParticleTable.hh" <<
43 #include "G4AttDef.hh" <<
44 #include "G4AttDefStore.hh" 41 #include "G4AttDefStore.hh"
>> 42 #include "G4AttDef.hh"
45 #include "G4AttValue.hh" 43 #include "G4AttValue.hh"
46 #include "G4PhysicsModelCatalog.hh" <<
47 #include "G4RichTrajectoryPoint.hh" <<
48 #include "G4UIcommand.hh" 44 #include "G4UIcommand.hh"
49 #include "G4UnitsTable.hh" 45 #include "G4UnitsTable.hh"
50 #include "G4VProcess.hh" 46 #include "G4VProcess.hh"
>> 47 #include "G4PhysicsModelCatalog.hh"
51 48
52 namespace { << 49 //#define G4ATTDEBUG
53 G4Mutex CloneRichTrajectoryMutex = G4MUTEX_IN <<
54 } <<
55 <<
56 // #define G4ATTDEBUG <<
57 #ifdef G4ATTDEBUG 50 #ifdef G4ATTDEBUG
58 # include "G4AttCheck.hh" << 51 #include "G4AttCheck.hh"
59 #endif 52 #endif
60 53
61 #include <sstream> 54 #include <sstream>
62 55
63 G4Allocator<G4RichTrajectory>*& aRichTrajector 56 G4Allocator<G4RichTrajectory>*& aRichTrajectoryAllocator()
64 { 57 {
65 G4ThreadLocalStatic G4Allocator<G4RichTrajec 58 G4ThreadLocalStatic G4Allocator<G4RichTrajectory>* _instance = nullptr;
66 return _instance; 59 return _instance;
67 } 60 }
68 61
69 G4RichTrajectory::G4RichTrajectory(const G4Tra << 62 G4RichTrajectory::G4RichTrajectory()
70 { 63 {
71 G4ParticleDefinition* fpParticleDefinition = << 64 }
72 ParticleName = fpParticleDefinition->GetPart <<
73 PDGCharge = fpParticleDefinition->GetPDGChar <<
74 PDGEncoding = fpParticleDefinition->GetPDGEn <<
75 fTrackID = aTrack->GetTrackID(); <<
76 fParentID = aTrack->GetParentID(); <<
77 initialKineticEnergy = aTrack->GetKineticEne <<
78 initialMomentum = aTrack->GetMomentum(); <<
79 positionRecord = new G4TrajectoryPointContai <<
80 <<
81 // Following is for the first trajectory poi <<
82 positionRecord->push_back(new G4RichTrajecto <<
83 65
>> 66 G4RichTrajectory::G4RichTrajectory(const G4Track* aTrack)
>> 67 : G4Trajectory(aTrack) // Note: this initialises the base class data
>> 68 // members and, unfortunately but never mind,
>> 69 // creates a G4TrajectoryPoint in
>> 70 // TrajectoryPointContainer that we cannot
>> 71 // access because it's private. We store the
>> 72 // same information (plus more) in a
>> 73 // G4RichTrajectoryPoint in the
>> 74 // RichTrajectoryPointsContainer
>> 75 {
84 fpInitialVolume = aTrack->GetTouchableHandle 76 fpInitialVolume = aTrack->GetTouchableHandle();
85 fpInitialNextVolume = aTrack->GetNextTouchab 77 fpInitialNextVolume = aTrack->GetNextTouchableHandle();
86 fpCreatorProcess = aTrack->GetCreatorProcess 78 fpCreatorProcess = aTrack->GetCreatorProcess();
87 fCreatorModelID = aTrack->GetCreatorModelID( 79 fCreatorModelID = aTrack->GetCreatorModelID();
88 80
89 // On construction, set final values to init 81 // On construction, set final values to initial values.
90 // Final values are updated at the addition 82 // Final values are updated at the addition of every step - see AppendStep.
91 // 83 //
92 fpFinalVolume = aTrack->GetTouchableHandle() 84 fpFinalVolume = aTrack->GetTouchableHandle();
93 fpFinalNextVolume = aTrack->GetNextTouchable 85 fpFinalNextVolume = aTrack->GetNextTouchableHandle();
94 fpEndingProcess = aTrack->GetCreatorProcess( 86 fpEndingProcess = aTrack->GetCreatorProcess();
95 fFinalKineticEnergy = aTrack->GetKineticEner 87 fFinalKineticEnergy = aTrack->GetKineticEnergy();
96 88
97 // Insert the first rich trajectory point (s 89 // Insert the first rich trajectory point (see note above)...
98 // 90 //
99 fpRichPointContainer = new G4TrajectoryPoint << 91 fpRichPointsContainer = new RichTrajectoryPointsContainer;
100 fpRichPointContainer->push_back(new G4RichTr << 92 fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aTrack));
101 } 93 }
102 94
103 G4RichTrajectory::G4RichTrajectory(G4RichTraje << 95 G4RichTrajectory::G4RichTrajectory(G4RichTrajectory& right)
>> 96 : G4Trajectory(right)
104 { 97 {
105 ParticleName = right.ParticleName; <<
106 PDGCharge = right.PDGCharge; <<
107 PDGEncoding = right.PDGEncoding; <<
108 fTrackID = right.fTrackID; <<
109 fParentID = right.fParentID; <<
110 initialKineticEnergy = right.initialKineticE <<
111 initialMomentum = right.initialMomentum; <<
112 positionRecord = new G4TrajectoryPointContai <<
113 <<
114 for (auto& i : *right.positionRecord) { <<
115 auto rightPoint = (G4RichTrajectoryPoint*) <<
116 positionRecord->push_back(new G4RichTrajec <<
117 } <<
118 <<
119 fpInitialVolume = right.fpInitialVolume; 98 fpInitialVolume = right.fpInitialVolume;
120 fpInitialNextVolume = right.fpInitialNextVol 99 fpInitialNextVolume = right.fpInitialNextVolume;
121 fpCreatorProcess = right.fpCreatorProcess; 100 fpCreatorProcess = right.fpCreatorProcess;
122 fCreatorModelID = right.fCreatorModelID; 101 fCreatorModelID = right.fCreatorModelID;
123 fpFinalVolume = right.fpFinalVolume; 102 fpFinalVolume = right.fpFinalVolume;
124 fpFinalNextVolume = right.fpFinalNextVolume; 103 fpFinalNextVolume = right.fpFinalNextVolume;
125 fpEndingProcess = right.fpEndingProcess; 104 fpEndingProcess = right.fpEndingProcess;
126 fFinalKineticEnergy = right.fFinalKineticEne 105 fFinalKineticEnergy = right.fFinalKineticEnergy;
127 fpRichPointContainer = new G4TrajectoryPoint << 106 fpRichPointsContainer = new RichTrajectoryPointsContainer;
128 for (auto& i : *right.fpRichPointContainer) << 107 for(std::size_t i=0; i<right.fpRichPointsContainer->size(); ++i)
129 auto rightPoint = (G4RichTrajectoryPoint*) << 108 {
130 fpRichPointContainer->push_back(new G4Rich << 109 G4RichTrajectoryPoint* rightPoint =
>> 110 (G4RichTrajectoryPoint*)((*(right.fpRichPointsContainer))[i]);
>> 111 fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(*rightPoint));
131 } 112 }
132 } 113 }
133 114
134 G4RichTrajectory::~G4RichTrajectory() 115 G4RichTrajectory::~G4RichTrajectory()
135 { 116 {
136 if (fpRichPointContainer != nullptr) { << 117 if (fpRichPointsContainer)
137 for (auto& i : *fpRichPointContainer) { << 118 {
138 delete i; << 119 for(std::size_t i=0; i<fpRichPointsContainer->size(); ++i)
>> 120 {
>> 121 delete (*fpRichPointsContainer)[i];
139 } 122 }
140 fpRichPointContainer->clear(); << 123 fpRichPointsContainer->clear();
141 delete fpRichPointContainer; << 124 delete fpRichPointsContainer;
142 } 125 }
143 } 126 }
144 127
145 void G4RichTrajectory::AppendStep(const G4Step 128 void G4RichTrajectory::AppendStep(const G4Step* aStep)
146 { 129 {
147 fpRichPointContainer->push_back(new G4RichTr << 130 fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aStep));
148 131
149 // Except for first step, which is a sort of 132 // Except for first step, which is a sort of virtual step to start
150 // the track, compute the final values... 133 // the track, compute the final values...
151 // 134 //
152 const G4Track* track = aStep->GetTrack(); 135 const G4Track* track = aStep->GetTrack();
153 const G4StepPoint* postStepPoint = aStep->Ge 136 const G4StepPoint* postStepPoint = aStep->GetPostStepPoint();
154 if (track->GetCurrentStepNumber() > 0) { << 137 if (track->GetCurrentStepNumber() > 0)
>> 138 {
155 fpFinalVolume = track->GetTouchableHandle( 139 fpFinalVolume = track->GetTouchableHandle();
156 fpFinalNextVolume = track->GetNextTouchabl 140 fpFinalNextVolume = track->GetNextTouchableHandle();
157 fpEndingProcess = postStepPoint->GetProces 141 fpEndingProcess = postStepPoint->GetProcessDefinedStep();
158 fFinalKineticEnergy = << 142 fFinalKineticEnergy = aStep->GetPreStepPoint()->GetKineticEnergy()
159 aStep->GetPreStepPoint()->GetKineticEner << 143 - aStep->GetTotalEnergyDeposit();
160 } 144 }
161 } 145 }
162 << 146
163 void G4RichTrajectory::MergeTrajectory(G4VTraj 147 void G4RichTrajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
164 { 148 {
165 if (secondTrajectory == nullptr) return; << 149 if(secondTrajectory == nullptr) return;
166 150
167 auto seco = (G4RichTrajectory*)secondTraject << 151 G4RichTrajectory* seco = (G4RichTrajectory*)secondTrajectory;
168 G4int ent = seco->GetPointEntries(); 152 G4int ent = seco->GetPointEntries();
169 for (G4int i = 1; i < ent; ++i) { << 153 for(G4int i=1; i<ent; ++i)
>> 154 {
170 // initial point of the second trajectory 155 // initial point of the second trajectory should not be merged
171 // 156 //
172 fpRichPointContainer->push_back((*(seco->f << 157 fpRichPointsContainer->push_back((*(seco->fpRichPointsContainer))[i]);
173 } 158 }
174 delete (*seco->fpRichPointContainer)[0]; << 159 delete (*seco->fpRichPointsContainer)[0];
175 seco->fpRichPointContainer->clear(); << 160 seco->fpRichPointsContainer->clear();
176 } 161 }
177 162
178 void G4RichTrajectory::ShowTrajectory(std::ost 163 void G4RichTrajectory::ShowTrajectory(std::ostream& os) const
179 { 164 {
180 // Invoke the default implementation in G4VT 165 // Invoke the default implementation in G4VTrajectory...
181 // 166 //
182 G4VTrajectory::ShowTrajectory(os); 167 G4VTrajectory::ShowTrajectory(os);
183 168
184 // ... or override with your own code here. 169 // ... or override with your own code here.
185 } 170 }
186 171
187 void G4RichTrajectory::DrawTrajectory() const 172 void G4RichTrajectory::DrawTrajectory() const
188 { 173 {
189 // Invoke the default implementation in G4VT 174 // Invoke the default implementation in G4VTrajectory...
190 // 175 //
191 G4VTrajectory::DrawTrajectory(); 176 G4VTrajectory::DrawTrajectory();
192 177
193 // ... or override with your own code here. 178 // ... or override with your own code here.
194 } 179 }
195 180
196 const std::map<G4String, G4AttDef>* G4RichTraj << 181 const std::map<G4String,G4AttDef>* G4RichTrajectory::GetAttDefs() const
197 { 182 {
198 G4bool isNew; 183 G4bool isNew;
199 std::map<G4String, G4AttDef>* store = G4AttD << 184 std::map<G4String,G4AttDef>* store
200 if (isNew) { << 185 = G4AttDefStore::GetInstance("G4RichTrajectory",isNew);
201 G4String ID; << 186 if (isNew)
202 << 187 {
203 ID = "ID"; << 188 // Get att defs from base class...
204 (*store)[ID] = G4AttDef(ID, "Track ID", "P << 189 //
205 << 190 *store = *(G4Trajectory::GetAttDefs());
206 ID = "PID"; <<
207 (*store)[ID] = G4AttDef(ID, "Parent ID", " <<
208 <<
209 ID = "PN"; <<
210 (*store)[ID] = G4AttDef(ID, "Particle Name <<
211 <<
212 ID = "Ch"; <<
213 (*store)[ID] = G4AttDef(ID, "Charge", "Phy <<
214 <<
215 ID = "PDG"; <<
216 (*store)[ID] = G4AttDef(ID, "PDG Encoding" <<
217 <<
218 ID = "IKE"; <<
219 (*store)[ID] = G4AttDef(ID, "Initial kinet <<
220 <<
221 ID = "IMom"; <<
222 (*store)[ID] = G4AttDef(ID, "Initial momen <<
223 <<
224 ID = "IMag"; <<
225 (*store)[ID] = G4AttDef(ID, "Initial momen <<
226 191
227 ID = "NTP"; << 192 G4String ID;
228 (*store)[ID] = G4AttDef(ID, "No. of points <<
229 193
230 ID = "IVPath"; 194 ID = "IVPath";
231 (*store)[ID] = G4AttDef(ID, "Initial Volum << 195 (*store)[ID] = G4AttDef(ID,"Initial Volume Path",
>> 196 "Physics","","G4String");
232 197
233 ID = "INVPath"; 198 ID = "INVPath";
234 (*store)[ID] = G4AttDef(ID, "Initial Next << 199 (*store)[ID] = G4AttDef(ID,"Initial Next Volume Path",
>> 200 "Physics","","G4String");
235 201
236 ID = "CPN"; 202 ID = "CPN";
237 (*store)[ID] = G4AttDef(ID, "Creator Proce << 203 (*store)[ID] = G4AttDef(ID,"Creator Process Name",
>> 204 "Physics","","G4String");
238 205
239 ID = "CPTN"; 206 ID = "CPTN";
240 (*store)[ID] = G4AttDef(ID, "Creator Proce << 207 (*store)[ID] = G4AttDef(ID,"Creator Process Type Name",
241 << 208 "Physics","","G4String");
>> 209
242 ID = "CMID"; 210 ID = "CMID";
243 (*store)[ID] = G4AttDef(ID, "Creator Model << 211 (*store)[ID] = G4AttDef(ID,"Creator Model ID",
>> 212 "Physics","","G4int");
244 213
245 ID = "CMN"; 214 ID = "CMN";
246 (*store)[ID] = G4AttDef(ID, "Creator Model << 215 (*store)[ID] = G4AttDef(ID,"Creator Model Name",
>> 216 "Physics","","G4String");
247 217
248 ID = "FVPath"; 218 ID = "FVPath";
249 (*store)[ID] = G4AttDef(ID, "Final Volume << 219 (*store)[ID] = G4AttDef(ID,"Final Volume Path",
>> 220 "Physics","","G4String");
250 221
251 ID = "FNVPath"; 222 ID = "FNVPath";
252 (*store)[ID] = G4AttDef(ID, "Final Next Vo << 223 (*store)[ID] = G4AttDef(ID,"Final Next Volume Path",
>> 224 "Physics","","G4String");
253 225
254 ID = "EPN"; 226 ID = "EPN";
255 (*store)[ID] = G4AttDef(ID, "Ending Proces << 227 (*store)[ID] = G4AttDef(ID,"Ending Process Name",
>> 228 "Physics","","G4String");
256 229
257 ID = "EPTN"; 230 ID = "EPTN";
258 (*store)[ID] = G4AttDef(ID, "Ending Proces << 231 (*store)[ID] = G4AttDef(ID,"Ending Process Type Name",
>> 232 "Physics","","G4String");
259 233
260 ID = "FKE"; 234 ID = "FKE";
261 (*store)[ID] = G4AttDef(ID, "Final kinetic << 235 (*store)[ID] = G4AttDef(ID,"Final kinetic energy",
>> 236 "Physics","G4BestUnit","G4double");
262 } 237 }
263 238
264 return store; 239 return store;
265 } 240 }
266 241
267 static G4String Path(const G4TouchableHandle& 242 static G4String Path(const G4TouchableHandle& th)
268 { 243 {
269 std::ostringstream oss; 244 std::ostringstream oss;
270 G4int depth = th->GetHistoryDepth(); 245 G4int depth = th->GetHistoryDepth();
271 for (G4int i = depth; i >= 0; --i) { << 246 for (G4int i = depth; i >= 0; --i)
272 oss << th->GetVolume(i)->GetName() << ':' << 247 {
>> 248 oss << th->GetVolume(i)->GetName()
>> 249 << ':' << th->GetCopyNumber(i);
273 if (i != 0) oss << '/'; 250 if (i != 0) oss << '/';
274 } 251 }
275 return oss.str(); 252 return oss.str();
276 } 253 }
277 254
278 std::vector<G4AttValue>* G4RichTrajectory::Cre 255 std::vector<G4AttValue>* G4RichTrajectory::CreateAttValues() const
279 { 256 {
280 // Create base class att values... 257 // Create base class att values...
281 //std::vector<G4AttValue>* values = G4VTraje << 258 std::vector<G4AttValue>* values = G4Trajectory::CreateAttValues();
282 auto values = new std::vector<G4AttValue>; <<
283 values->push_back(G4AttValue("ID", G4UIcomma <<
284 values->push_back(G4AttValue("PID", G4UIcomm <<
285 values->push_back(G4AttValue("PN", ParticleN <<
286 values->push_back(G4AttValue("Ch", G4UIcomma <<
287 values->push_back(G4AttValue("PDG", G4UIcomm <<
288 values->push_back(G4AttValue("IKE", G4BestUn <<
289 values->push_back(G4AttValue("IMom", G4BestU <<
290 values->push_back(G4AttValue("IMag", G4BestU <<
291 values->push_back(G4AttValue("NTP", G4UIcomm <<
292 <<
293 if (fpInitialVolume && (fpInitialVolume->Get <<
294 values->push_back(G4AttValue("IVPath", Pat <<
295 } <<
296 else { <<
297 values->push_back(G4AttValue("IVPath", "No <<
298 } <<
299 <<
300 if (fpInitialNextVolume && (fpInitialNextVol <<
301 values->push_back(G4AttValue("INVPath", Pa <<
302 } <<
303 else { <<
304 values->push_back(G4AttValue("INVPath", "N <<
305 } <<
306 259
307 if (fpCreatorProcess != nullptr) { << 260 if (fpInitialVolume && fpInitialVolume->GetVolume())
308 values->push_back(G4AttValue("CPN", fpCrea << 261 {
309 G4ProcessType type = fpCreatorProcess->Get << 262 values->push_back(G4AttValue("IVPath",Path(fpInitialVolume),""));
310 values->push_back(G4AttValue("CPTN", G4VPr <<
311 values->push_back(G4AttValue("CMID", G4UIc <<
312 const G4String& creatorModelName = G4Physi <<
313 values->push_back(G4AttValue("CMN", creato <<
314 } 263 }
315 else { << 264 else
316 values->push_back(G4AttValue("CPN", "None" << 265 {
317 values->push_back(G4AttValue("CPTN", "None << 266 values->push_back(G4AttValue("IVPath","None",""));
318 values->push_back(G4AttValue("CMID", "None <<
319 values->push_back(G4AttValue("CMN", "None" <<
320 } 267 }
321 268
322 if (fpFinalVolume && (fpFinalVolume->GetVolu << 269 if (fpInitialNextVolume && fpInitialNextVolume->GetVolume())
323 values->push_back(G4AttValue("FVPath", Pat << 270 {
>> 271 values->push_back(G4AttValue("INVPath",Path(fpInitialNextVolume),""));
324 } 272 }
325 else { << 273 else
326 values->push_back(G4AttValue("FVPath", "No << 274 {
>> 275 values->push_back(G4AttValue("INVPath","None",""));
327 } 276 }
328 277
329 if (fpFinalNextVolume && (fpFinalNextVolume- << 278 if (fpCreatorProcess != nullptr)
330 values->push_back(G4AttValue("FNVPath", Pa << 279 {
331 } << 280 values->push_back
332 else { << 281 (G4AttValue("CPN",fpCreatorProcess->GetProcessName(),""));
333 values->push_back(G4AttValue("FNVPath", "N << 282 G4ProcessType type = fpCreatorProcess->GetProcessType();
334 } << 283 values->push_back
335 << 284 (G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),""));
336 if (fpEndingProcess != nullptr) { << 285 values->push_back
337 values->push_back(G4AttValue("EPN", fpEndi << 286 (G4AttValue("CMID",G4UIcommand::ConvertToString(fCreatorModelID),""));
>> 287 const G4String& creatorModelName =
>> 288 G4PhysicsModelCatalog::GetModelNameFromID(fCreatorModelID);
>> 289 values->push_back(G4AttValue("CMN",creatorModelName,""));
>> 290 }
>> 291 else
>> 292 {
>> 293 values->push_back(G4AttValue("CPN","None",""));
>> 294 values->push_back(G4AttValue("CPTN","None",""));
>> 295 values->push_back(G4AttValue("CMID","None",""));
>> 296 values->push_back(G4AttValue("CMN","None",""));
>> 297 }
>> 298
>> 299 if (fpFinalVolume && fpFinalVolume->GetVolume())
>> 300 {
>> 301 values->push_back(G4AttValue("FVPath",Path(fpFinalVolume),""));
>> 302 }
>> 303 else
>> 304 {
>> 305 values->push_back(G4AttValue("FVPath","None",""));
>> 306 }
>> 307
>> 308 if (fpFinalNextVolume && fpFinalNextVolume->GetVolume())
>> 309 {
>> 310 values->push_back(G4AttValue("FNVPath",Path(fpFinalNextVolume),""));
>> 311 }
>> 312 else
>> 313 {
>> 314 values->push_back(G4AttValue("FNVPath","None",""));
>> 315 }
>> 316
>> 317 if (fpEndingProcess != nullptr)
>> 318 {
>> 319 values->push_back(G4AttValue("EPN",fpEndingProcess->GetProcessName(),""));
338 G4ProcessType type = fpEndingProcess->GetP 320 G4ProcessType type = fpEndingProcess->GetProcessType();
339 values->push_back(G4AttValue("EPTN", G4VPr << 321 values->push_back(G4AttValue("EPTN",G4VProcess::GetProcessTypeName(type),""));
340 } 322 }
341 else { << 323 else
342 values->push_back(G4AttValue("EPN", "None" << 324 {
343 values->push_back(G4AttValue("EPTN", "None << 325 values->push_back(G4AttValue("EPN","None",""));
>> 326 values->push_back(G4AttValue("EPTN","None",""));
344 } 327 }
345 328
346 values->push_back(G4AttValue("FKE", G4BestUn << 329 values->push_back
>> 330 (G4AttValue("FKE",G4BestUnit(fFinalKineticEnergy,"Energy"),""));
347 331
348 #ifdef G4ATTDEBUG 332 #ifdef G4ATTDEBUG
349 G4cout << G4AttCheck(values, GetAttDefs()); << 333 G4cout << G4AttCheck(values,GetAttDefs());
350 #endif 334 #endif
351 335
352 return values; 336 return values;
353 } 337 }
354 <<
355 G4ParticleDefinition* G4RichTrajectory::GetPar <<
356 { <<
357 return (G4ParticleTable::GetParticleTable()- <<
358 } <<
359 <<
360 G4VTrajectory* G4RichTrajectory::CloneForMaste <<
361 { <<
362 G4AutoLock lock(&CloneRichTrajectoryMutex); <<
363 auto* cloned = new G4ClonedRichTrajectory(*t <<
364 return cloned; <<
365 } <<
366 <<
367 338