| 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 // class G4ErrorPropagationNavigator implement 26 // class G4ErrorPropagationNavigator implementation
27 // 27 //
28 // Author: Pedro Arce, CIEMAT 28 // Author: Pedro Arce, CIEMAT
29 // ------------------------------------------- 29 // --------------------------------------------------------------------
30 30
31 #include "G4ErrorPropagationNavigator.hh" 31 #include "G4ErrorPropagationNavigator.hh"
32 32
33 #include "globals.hh" 33 #include "globals.hh"
34 #include "G4ThreeVector.hh" 34 #include "G4ThreeVector.hh"
35 #include "G4ErrorPropagatorData.hh" 35 #include "G4ErrorPropagatorData.hh"
36 #include "G4ErrorSurfaceTarget.hh" 36 #include "G4ErrorSurfaceTarget.hh"
37 37
38 #include "G4ErrorPlaneSurfaceTarget.hh" 38 #include "G4ErrorPlaneSurfaceTarget.hh"
39 #include "G4ErrorCylSurfaceTarget.hh" 39 #include "G4ErrorCylSurfaceTarget.hh"
40 40
>> 41
>> 42 //-------------------------------------------------------------------
>> 43
>> 44 G4ErrorPropagationNavigator::G4ErrorPropagationNavigator()
>> 45 : G4Navigator()
>> 46 {
>> 47 }
>> 48
>> 49 //-------------------------------------------------------------------
>> 50
>> 51 G4ErrorPropagationNavigator::~G4ErrorPropagationNavigator()
>> 52 {
>> 53 }
>> 54
>> 55 //-------------------------------------------------------------------
>> 56
41 G4double G4ErrorPropagationNavigator:: 57 G4double G4ErrorPropagationNavigator::
42 ComputeStep ( const G4ThreeVector &pGlobalPoin 58 ComputeStep ( const G4ThreeVector &pGlobalPoint,
43 const G4ThreeVector &pDirection, 59 const G4ThreeVector &pDirection,
44 const G4double pCurrentProposedS 60 const G4double pCurrentProposedStepLength,
45 G4double &pNewSafety ) 61 G4double &pNewSafety )
46 { 62 {
47 G4double safetyGeom = DBL_MAX; 63 G4double safetyGeom = DBL_MAX;
48 64
49 G4double Step = G4Navigator::ComputeStep(pGl 65 G4double Step = G4Navigator::ComputeStep(pGlobalPoint, pDirection,
50 pCu 66 pCurrentProposedStepLength,
51 saf 67 safetyGeom);
52 68
53 G4ErrorPropagatorData* g4edata 69 G4ErrorPropagatorData* g4edata
54 = G4ErrorPropagatorData::GetErrorPropagato 70 = G4ErrorPropagatorData::GetErrorPropagatorData();
55 71
56 if ( g4edata != nullptr ) 72 if ( g4edata != nullptr )
57 { 73 {
58 const G4ErrorTarget* target = g4edata->Get 74 const G4ErrorTarget* target = g4edata->GetTarget();
59 if( target != nullptr ) 75 if( target != nullptr )
60 { 76 {
61 G4double StepPlane=target->GetDistanceFr 77 G4double StepPlane=target->GetDistanceFromPoint(pGlobalPoint,pDirection);
62 78
63 if( StepPlane < 0. ) // Negative means t 79 if( StepPlane < 0. ) // Negative means target is crossed,
64 { // will not be foun 80 { // will not be found
65 StepPlane = DBL_MAX; 81 StepPlane = DBL_MAX;
66 } 82 }
67 #ifdef G4VERBOSE 83 #ifdef G4VERBOSE
68 if( G4ErrorPropagatorData::verbose() >= 84 if( G4ErrorPropagatorData::verbose() >= 4 )
69 { 85 {
70 G4cout << "G4ErrorPropagationNavigator 86 G4cout << "G4ErrorPropagationNavigator::ComputeStep()" << G4endl
71 << " Target step: " << StepPla 87 << " Target step: " << StepPlane
72 << ", Transportation step: " << 88 << ", Transportation step: " << Step << G4endl;
73 target->Dump( "G4ErrorPropagationNavig 89 target->Dump( "G4ErrorPropagationNavigator::ComputeStep Target " );
74 } 90 }
75 #endif 91 #endif
76 92
77 if( StepPlane < Step ) 93 if( StepPlane < Step )
78 { 94 {
79 #ifdef G4VERBOSE 95 #ifdef G4VERBOSE
80 if( G4ErrorPropagatorData::verbose() > 96 if( G4ErrorPropagatorData::verbose() >= 2 )
81 { 97 {
82 G4cout << "G4ErrorPropagationNavigat 98 G4cout << "G4ErrorPropagationNavigator::ComputeStep()" << G4endl
83 << " TargetCloserThanBoundar 99 << " TargetCloserThanBoundary: " << StepPlane << " < "
84 << Step << G4endl; 100 << Step << G4endl;
85 } 101 }
86 #endif 102 #endif
87 Step = StepPlane; 103 Step = StepPlane;
88 g4edata->SetState(G4ErrorState_TargetC 104 g4edata->SetState(G4ErrorState_TargetCloserThanBoundary);
89 } 105 }
90 else 106 else
91 { 107 {
92 g4edata->SetState(G4ErrorState_Propaga 108 g4edata->SetState(G4ErrorState_Propagating);
93 } 109 }
94 } 110 }
95 } 111 }
96 G4double safetyTarget = TargetSafetyFromPoin 112 G4double safetyTarget = TargetSafetyFromPoint(pGlobalPoint);
97 113
98 // Avoid call to G4Navigator::ComputeSafety 114 // Avoid call to G4Navigator::ComputeSafety - which could have side effects
99 // 115 //
100 pNewSafety = std::min(safetyGeom, safetyTarg 116 pNewSafety = std::min(safetyGeom, safetyTarget);
101 117
102 #ifdef G4VERBOSE 118 #ifdef G4VERBOSE
103 if( G4ErrorPropagatorData::verbose() >= 3 ) 119 if( G4ErrorPropagatorData::verbose() >= 3 )
104 { 120 {
105 G4cout << "G4ErrorPropagationNavigator::Co 121 G4cout << "G4ErrorPropagationNavigator::ComputeStep()" << G4endl
106 << " Step: " << Step << ", Compute 122 << " Step: " << Step << ", ComputeSafety: " << pNewSafety
107 << G4endl; 123 << G4endl;
108 } 124 }
109 #endif 125 #endif
110 126
111 return Step; 127 return Step;
112 } 128 }
113 129
114 //-------------------------------------------- 130 //-------------------------------------------------------------------
115 131
116 G4double G4ErrorPropagationNavigator:: 132 G4double G4ErrorPropagationNavigator::
117 TargetSafetyFromPoint( const G4ThreeVector& pG 133 TargetSafetyFromPoint( const G4ThreeVector& pGlobalpoint )
118 { 134 {
119 G4double safety = DBL_MAX; 135 G4double safety = DBL_MAX;
120 136
121 G4ErrorPropagatorData* g4edata 137 G4ErrorPropagatorData* g4edata
122 = G4ErrorPropagatorData::GetErrorPropagato 138 = G4ErrorPropagatorData::GetErrorPropagatorData();
123 139
124 if ( g4edata != nullptr ) 140 if ( g4edata != nullptr )
125 { 141 {
126 const G4ErrorTarget* target = g4edata->Get 142 const G4ErrorTarget* target = g4edata->GetTarget();
127 if( target != nullptr ) 143 if( target != nullptr )
128 { 144 {
129 safety = target->GetDistanceFromPoint(p 145 safety = target->GetDistanceFromPoint(pGlobalpoint);
130 } 146 }
131 } 147 }
132 return safety; 148 return safety;
133 } 149 }
134 150
135 //-------------------------------------------- 151 //-------------------------------------------------------------------
136 152
137 G4double G4ErrorPropagationNavigator:: 153 G4double G4ErrorPropagationNavigator::
138 ComputeSafety( const G4ThreeVector &pGlobalPoi 154 ComputeSafety( const G4ThreeVector &pGlobalPoint,
139 const G4double pMaxLength, 155 const G4double pMaxLength,
140 const G4bool keepState ) 156 const G4bool keepState )
141 { 157 {
142 G4double safetyGeom = G4Navigator::ComputeSa 158 G4double safetyGeom = G4Navigator::ComputeSafety(pGlobalPoint,
143 159 pMaxLength, keepState);
144 160
145 G4double safetyTarget = TargetSafetyFromPoin 161 G4double safetyTarget = TargetSafetyFromPoint( pGlobalPoint );
146 162
147 return std::min(safetyGeom, safetyTarget); 163 return std::min(safetyGeom, safetyTarget);
148 } 164 }
149 165
150 //-------------------------------------------- 166 //-------------------------------------------------------------------
151 167
152 G4ThreeVector G4ErrorPropagationNavigator:: 168 G4ThreeVector G4ErrorPropagationNavigator::
153 GetGlobalExitNormal( const G4ThreeVector& poin 169 GetGlobalExitNormal( const G4ThreeVector& point, G4bool* valid )
154 { 170 {
155 G4ErrorPropagatorData* g4edata 171 G4ErrorPropagatorData* g4edata
156 = G4ErrorPropagatorData::GetErrorPropa 172 = G4ErrorPropagatorData::GetErrorPropagatorData();
157 const G4ErrorTarget* target = nullptr; 173 const G4ErrorTarget* target = nullptr;
158 174
159 G4ThreeVector normal(0.0, 0.0, 0.0); 175 G4ThreeVector normal(0.0, 0.0, 0.0);
160 G4double distance= 0; 176 G4double distance= 0;
161 177
162 // Determine which 'geometry' limited the st 178 // Determine which 'geometry' limited the step
163 if ( g4edata != nullptr ) 179 if ( g4edata != nullptr )
164 { 180 {
165 target = g4edata->GetTarget(); 181 target = g4edata->GetTarget();
166 if( target != nullptr ) 182 if( target != nullptr )
167 { 183 {
168 distance = target->GetDistanceFromPoint( 184 distance = target->GetDistanceFromPoint(point);
169 } 185 }
170 } 186 }
171 187
172 if( distance > kCarTolerance || (target == n 188 if( distance > kCarTolerance || (target == nullptr) )
173 // Not reached the target or if a target d 189 // Not reached the target or if a target does not exist,
174 // this seems the best we can do 190 // this seems the best we can do
175 { 191 {
176 normal = G4Navigator::GetGlobalExitNormal( 192 normal = G4Navigator::GetGlobalExitNormal(point, valid);
177 } 193 }
178 else 194 else
179 { 195 {
180 switch( target->GetType() ) 196 switch( target->GetType() )
181 { 197 {
182 case G4ErrorTarget_GeomVolume: 198 case G4ErrorTarget_GeomVolume:
183 // The volume is in the 'real' mass ge 199 // The volume is in the 'real' mass geometry
184 normal = G4Navigator::GetGlobalExitNor 200 normal = G4Navigator::GetGlobalExitNormal(point, valid);
185 break; 201 break;
186 case G4ErrorTarget_TrkL: 202 case G4ErrorTarget_TrkL:
187 normal = G4ThreeVector( 0.0, 0.0, 0.0) 203 normal = G4ThreeVector( 0.0, 0.0, 0.0);
188 *valid = false; 204 *valid = false;
189 G4Exception("G4ErrorPropagationNavigat 205 G4Exception("G4ErrorPropagationNavigator::GetGlobalExitNormal",
190 "Geometry1003", 206 "Geometry1003",
191 JustWarning, "Unexpected v 207 JustWarning, "Unexpected value of Target type");
192 break; 208 break;
193 case G4ErrorTarget_PlaneSurface: 209 case G4ErrorTarget_PlaneSurface:
194 case G4ErrorTarget_CylindricalSurface: 210 case G4ErrorTarget_CylindricalSurface:
195 const auto surfTarget= static_cast<con << 211 const G4ErrorSurfaceTarget* surfaceTarget=
196 normal = surfTarget->GetTangentPlane(p << 212 static_cast<const G4ErrorSurfaceTarget*>(target);
>> 213 normal = surfaceTarget->GetTangentPlane(point).normal().unit();
197 *valid = true; 214 *valid = true;
198 break; 215 break;
199 216
200 // default: 217 // default:
201 // normal= G4ThreeVector( 0.0, 0.0, 0.0 218 // normal= G4ThreeVector( 0.0, 0.0, 0.0 );
202 // *valid = false; 219 // *valid = false;
203 // G4Exception("G4ErrorPropagationNavig 220 // G4Exception("G4ErrorPropagationNavigator::GetGlobalExitNormal",
204 // "Geometry:003", 221 // "Geometry:003",
205 // FatalException, "Impossi 222 // FatalException, "Impossible value of Target type");
206 // break; 223 // break;
207 } 224 }
208 } 225 }
209 return normal; 226 return normal;
210 } 227 }
211 228
212 229