| 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 // 26 //
27 #include "G4VITProcess.hh" 27 #include "G4VITProcess.hh"
28 <<
29 #include "G4IT.hh" <<
30 #include "G4SystemOfUnits.hh" 28 #include "G4SystemOfUnits.hh"
>> 29 #include "G4IT.hh"
31 #include "G4TrackingInformation.hh" 30 #include "G4TrackingInformation.hh"
32 31
33 #include <memory> << 32 /*G4ThreadLocal*/size_t *G4VITProcess::fNbProcess = 0;
34 <<
35 /*G4ThreadLocal*/size_t *G4VITProcess::fNbProc <<
36 33
37 G4VITProcess::G4VITProcess(const G4String& nam 34 G4VITProcess::G4VITProcess(const G4String& name, G4ProcessType type) :
38 G4VProcess(name, type) 35 G4VProcess(name, type)
39 // fpState (0)//, 36 // fpState (0)//,
40 //fProcessID(fNbProcess) 37 //fProcessID(fNbProcess)
41 { 38 {
42 fpState.reset(); 39 fpState.reset();
43 if(fNbProcess == nullptr) fNbProcess = new s << 40 if(!fNbProcess) fNbProcess = new size_t(0);
44 fProcessID = *fNbProcess; 41 fProcessID = *fNbProcess;
45 (*fNbProcess)++; 42 (*fNbProcess)++;
46 SetInstantiateProcessState(true); 43 SetInstantiateProcessState(true);
47 currentInteractionLength = nullptr; << 44 currentInteractionLength = 0;
48 theInteractionTimeLeft = nullptr; << 45 theInteractionTimeLeft = 0;
49 theNumberOfInteractionLengthLeft = nullptr; << 46 theNumberOfInteractionLengthLeft = 0;
50 fProposesTimeStep = false; 47 fProposesTimeStep = false;
51 } 48 }
52 49
53 G4VITProcess::G4ProcessState::G4ProcessState() 50 G4VITProcess::G4ProcessState::G4ProcessState()
54 { 51 {
55 theNumberOfInteractionLengthLeft = -1.0; 52 theNumberOfInteractionLengthLeft = -1.0;
56 theInteractionTimeLeft = -1.0; 53 theInteractionTimeLeft = -1.0;
57 currentInteractionLength = -1.0; 54 currentInteractionLength = -1.0;
58 } 55 }
59 56
60 G4VITProcess::G4ProcessState::~G4ProcessState( 57 G4VITProcess::G4ProcessState::~G4ProcessState()
61 = default; << 58 {;}
62 59
63 G4VITProcess::~G4VITProcess() 60 G4VITProcess::~G4VITProcess()
64 = default; << 61 {
>> 62 //dtor
>> 63 // As the owner, G4IT should delete fProcessState
>> 64 }
65 65
66 G4VITProcess::G4VITProcess(const G4VITProcess& 66 G4VITProcess::G4VITProcess(const G4VITProcess& other) :
67 G4VProcess(other), fProcessID(other.fProce 67 G4VProcess(other), fProcessID(other.fProcessID)
68 { 68 {
69 //copy ctor 69 //copy ctor
70 //fpState = 0 ; 70 //fpState = 0 ;
71 currentInteractionLength = nullpt << 71 currentInteractionLength = 0;
72 theInteractionTimeLeft = nullpt << 72 theInteractionTimeLeft = 0;
73 theNumberOfInteractionLengthLeft = nullpt << 73 theNumberOfInteractionLengthLeft = 0;
74 fInstantiateProcessState = other. 74 fInstantiateProcessState = other.fInstantiateProcessState;
75 fProposesTimeStep = other. 75 fProposesTimeStep = other.fProposesTimeStep;
76 } 76 }
77 77
78 G4VITProcess& G4VITProcess::operator=(const G4 78 G4VITProcess& G4VITProcess::operator=(const G4VITProcess& rhs)
79 { 79 {
80 if (this == &rhs) return *this; // handle se 80 if (this == &rhs) return *this; // handle self assignment
81 //assignment operator 81 //assignment operator
82 return *this; 82 return *this;
83 } 83 }
84 84
85 void G4VITProcess::StartTracking(G4Track* trac 85 void G4VITProcess::StartTracking(G4Track* track)
86 { 86 {
87 G4TrackingInformation* trackingInfo = GetIT( 87 G4TrackingInformation* trackingInfo = GetIT(track)->GetTrackingInfo();
88 if(InstantiateProcessState()) 88 if(InstantiateProcessState())
89 { 89 {
90 // fpState = new G4ProcessState(); 90 // fpState = new G4ProcessState();
91 fpState = std::make_shared<G4ProcessState> << 91 fpState.reset(new G4ProcessState());
92 } 92 }
93 93
94 theNumberOfInteractionLengthLeft = &(fpSt 94 theNumberOfInteractionLengthLeft = &(fpState->theNumberOfInteractionLengthLeft );
95 theInteractionTimeLeft = &(fpSt 95 theInteractionTimeLeft = &(fpState->theInteractionTimeLeft );
96 currentInteractionLength = &(fpSt 96 currentInteractionLength = &(fpState->currentInteractionLength );
97 trackingInfo->RecordProcessState(fpState,fPr 97 trackingInfo->RecordProcessState(fpState,fProcessID);
98 // fpState = 0; 98 // fpState = 0;
99 fpState.reset(); 99 fpState.reset();
100 } 100 }
101 101
102 102