| 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 27
28 // /vis/scene commands - John Allison 9th Aug 28 // /vis/scene commands - John Allison 9th August 1998
29 29
30 #include "G4VisCommandsScene.hh" 30 #include "G4VisCommandsScene.hh"
31 31
32 #include "G4VisManager.hh" 32 #include "G4VisManager.hh"
33 #include "G4TransportationManager.hh" 33 #include "G4TransportationManager.hh"
34 #include "G4RunManager.hh" 34 #include "G4RunManager.hh"
35 #include "G4RunManagerFactory.hh" << 35 #ifdef G4MULTITHREADED
>> 36 #include "G4MTRunManager.hh"
>> 37 #endif
36 #include "G4Run.hh" 38 #include "G4Run.hh"
37 #include "G4PhysicalVolumeModel.hh" 39 #include "G4PhysicalVolumeModel.hh"
38 #include "G4ApplicationState.hh" 40 #include "G4ApplicationState.hh"
39 #include "G4UImanager.hh" 41 #include "G4UImanager.hh"
40 #include "G4UIcommand.hh" 42 #include "G4UIcommand.hh"
41 #include "G4UIcmdWithAString.hh" 43 #include "G4UIcmdWithAString.hh"
42 #include "G4UIcmdWithoutParameter.hh" 44 #include "G4UIcmdWithoutParameter.hh"
43 #include "G4ios.hh" 45 #include "G4ios.hh"
44 #include <sstream> 46 #include <sstream>
45 47
46 #define G4warn G4cout <<
47 <<
48 G4VVisCommandScene::G4VVisCommandScene () {} 48 G4VVisCommandScene::G4VVisCommandScene () {}
49 49
50 G4VVisCommandScene::~G4VVisCommandScene () {} 50 G4VVisCommandScene::~G4VVisCommandScene () {}
51 51
52 G4String G4VVisCommandScene::CurrentSceneName 52 G4String G4VVisCommandScene::CurrentSceneName () {
53 const G4Scene* pScene = fpVisManager -> GetC 53 const G4Scene* pScene = fpVisManager -> GetCurrentScene ();
54 G4String currentSceneName = "none"; 54 G4String currentSceneName = "none";
55 if (pScene) currentSceneName = pScene -> Get 55 if (pScene) currentSceneName = pScene -> GetName ();
56 return currentSceneName; 56 return currentSceneName;
57 } 57 }
58 58
59 ////////////// /vis/scene/activateModel ////// 59 ////////////// /vis/scene/activateModel ////////////////////////////
60 60
61 G4VisCommandSceneActivateModel::G4VisCommandSc 61 G4VisCommandSceneActivateModel::G4VisCommandSceneActivateModel () {
62 G4bool omitable; 62 G4bool omitable;
63 fpCommand = new G4UIcommand ("/vis/scene/act 63 fpCommand = new G4UIcommand ("/vis/scene/activateModel", this);
64 fpCommand -> SetGuidance 64 fpCommand -> SetGuidance
65 ("Activate or de-activate model."); 65 ("Activate or de-activate model.");
66 fpCommand -> SetGuidance 66 fpCommand -> SetGuidance
67 ("Attempts to match search string to name 67 ("Attempts to match search string to name of model - use unique sub-string.");
68 fpCommand -> SetGuidance 68 fpCommand -> SetGuidance
69 ("Use \"/vis/scene/list\" to see model nam 69 ("Use \"/vis/scene/list\" to see model names.");
70 fpCommand -> SetGuidance 70 fpCommand -> SetGuidance
71 ("If name == \"all\" (default), all models 71 ("If name == \"all\" (default), all models are activated.");
72 G4UIparameter* parameter; 72 G4UIparameter* parameter;
73 parameter = new G4UIparameter ("search-strin 73 parameter = new G4UIparameter ("search-string", 's', omitable = true);
74 parameter -> SetDefaultValue ("all"); 74 parameter -> SetDefaultValue ("all");
75 fpCommand -> SetParameter (parameter); 75 fpCommand -> SetParameter (parameter);
76 parameter = new G4UIparameter ("activate", ' 76 parameter = new G4UIparameter ("activate", 'b', omitable = true);
77 parameter -> SetDefaultValue (true); 77 parameter -> SetDefaultValue (true);
78 fpCommand -> SetParameter (parameter); 78 fpCommand -> SetParameter (parameter);
79 } 79 }
80 80
81 G4VisCommandSceneActivateModel::~G4VisCommandS 81 G4VisCommandSceneActivateModel::~G4VisCommandSceneActivateModel () {
82 delete fpCommand; 82 delete fpCommand;
83 } 83 }
84 84
85 G4String G4VisCommandSceneActivateModel::GetCu 85 G4String G4VisCommandSceneActivateModel::GetCurrentValue(G4UIcommand*) {
86 return ""; 86 return "";
87 } 87 }
88 88
89 void G4VisCommandSceneActivateModel::SetNewVal 89 void G4VisCommandSceneActivateModel::SetNewValue (G4UIcommand*,
90 G4String newValue) { 90 G4String newValue) {
91 91
92 G4VisManager::Verbosity verbosity = fpVisMan 92 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
93 93
94 G4String searchString, activateString; 94 G4String searchString, activateString;
95 std::istringstream is (newValue); 95 std::istringstream is (newValue);
96 // Need to handle the possibility that the s << 96 is >> searchString >> activateString;
97 // contains embedded blanks within quotation <<
98 // (This arises if the search string is auto <<
99 // global description, as in G4UIQt, clickin <<
100 auto lastQuotationMark = newValue.find_last_ <<
101 if (lastQuotationMark != std::string::npos) <<
102 auto firstQuotationMark = newValue.find_fi <<
103 if (lastQuotationMark != firstQuotationMar <<
104 // Note: there must not be more quotatio <<
105 searchString = newValue.substr <<
106 (firstQuotationMark + 1, lastQuotationMa <<
107 activateString = newValue.substr(lastQuo <<
108 // Perhaps we ought to check number of q <<
109 G4int nQuotes = 0; <<
110 for (auto c : newValue) { <<
111 if (c == '"') nQuotes++; <<
112 } <<
113 if (nQuotes > 2) { <<
114 G4ExceptionDescription ed; <<
115 ed << "More than 2 quotation marks in <<
116 G4Exception("G4VisCommandSceneActivate <<
117 } <<
118 } <<
119 } <<
120 else { <<
121 // None or one quotation marks - just inpu <<
122 is >> searchString >> activateString; <<
123 } <<
124 G4bool activate = G4UIcommand::ConvertToBool 97 G4bool activate = G4UIcommand::ConvertToBool(activateString);
125 98
126 G4Scene* pScene = fpVisManager->GetCurrentSc 99 G4Scene* pScene = fpVisManager->GetCurrentScene();
127 if (!pScene) { 100 if (!pScene) {
128 if (verbosity >= G4VisManager::errors) { 101 if (verbosity >= G4VisManager::errors) {
129 G4warn << "ERROR: No current scene. Ple << 102 G4cerr << "ERROR: No current scene. Please create one." << G4endl;
130 } 103 }
131 return; 104 return;
132 } 105 }
133 106
134 G4VSceneHandler* pSceneHandler = fpVisManage 107 G4VSceneHandler* pSceneHandler = fpVisManager->GetCurrentSceneHandler();
135 if (!pSceneHandler) { 108 if (!pSceneHandler) {
136 if (verbosity >= G4VisManager::errors) { 109 if (verbosity >= G4VisManager::errors) {
137 G4warn << "ERROR: No current sceneHandle << 110 G4cerr << "ERROR: No current sceneHandler. Please create one." << G4endl;
138 } 111 }
139 return; 112 return;
140 } 113 }
141 114
142 if (searchString == "all" && !activate) { 115 if (searchString == "all" && !activate) {
143 if (verbosity >= G4VisManager::warnings) { 116 if (verbosity >= G4VisManager::warnings) {
144 G4warn << << 117 G4cout <<
145 "WARNING: You are not allowed to de-activate 118 "WARNING: You are not allowed to de-activate all models."
146 "\n Command ignored." 119 "\n Command ignored."
147 << G4endl; 120 << G4endl;
148 } 121 }
149 return; 122 return;
150 } 123 }
151 124
152 G4bool any = false; 125 G4bool any = false;
153 126
154 std::vector<G4Scene::Model>& runDurationMode 127 std::vector<G4Scene::Model>& runDurationModelList =
155 pScene->SetRunDurationModelList(); 128 pScene->SetRunDurationModelList();
156 for (size_t i = 0; i < runDurationModelList. 129 for (size_t i = 0; i < runDurationModelList.size(); i++) {
157 const G4String& modelName = runDurationMod << 130 const G4String& modelName =
158 if (searchString == "all" || modelName.fin << 131 runDurationModelList[i].fpModel->GetGlobalDescription();
>> 132 if (searchString == "all" || modelName.find(searchString)
>> 133 != std::string::npos) {
159 any = true; 134 any = true;
160 runDurationModelList[i].fActive = activa 135 runDurationModelList[i].fActive = activate;
161 if (verbosity >= G4VisManager::warnings) 136 if (verbosity >= G4VisManager::warnings) {
162 G4warn << "Model \"" << modelName; << 137 G4cout << "Model \"" << modelName;
163 if (activate) G4warn << "\" activated."; << 138 if (activate) G4cout << "\" activated.";
164 else G4warn << "\" de-activated."; << 139 else G4cout << "\" de-activated.";
165 G4warn << G4endl; << 140 G4cout << G4endl;
166 } 141 }
167 } 142 }
168 } 143 }
169 144
170 std::vector<G4Scene::Model>& endOfEventModel 145 std::vector<G4Scene::Model>& endOfEventModelList =
171 pScene->SetEndOfEventModelList(); 146 pScene->SetEndOfEventModelList();
172 for (size_t i = 0; i < endOfEventModelList.s 147 for (size_t i = 0; i < endOfEventModelList.size(); i++) {
173 const G4String& modelName = endOfEventMode << 148 const G4String& modelName =
174 if (searchString == "all" || modelName.fin << 149 endOfEventModelList[i].fpModel->GetGlobalDescription();
>> 150 if (searchString == "all" || modelName.find(searchString)
>> 151 != std::string::npos) {
175 any = true; 152 any = true;
176 endOfEventModelList[i].fActive = activat 153 endOfEventModelList[i].fActive = activate;
177 if (verbosity >= G4VisManager::warnings) 154 if (verbosity >= G4VisManager::warnings) {
178 G4warn << "Model \"" << modelName; << 155 G4cout << "Model \"" << modelName;
179 if (activate) G4warn << "\" activated."; << 156 if (activate) G4cout << "\" activated.";
180 else G4warn << "\" de-activated."; << 157 else G4cout << "\" de-activated.";
181 G4warn << G4endl; << 158 G4cout << G4endl;
182 } 159 }
183 } 160 }
184 } 161 }
185 162
186 std::vector<G4Scene::Model>& endOfRunModelLi 163 std::vector<G4Scene::Model>& endOfRunModelList =
187 pScene->SetEndOfRunModelList(); 164 pScene->SetEndOfRunModelList();
188 for (size_t i = 0; i < endOfRunModelList.siz 165 for (size_t i = 0; i < endOfRunModelList.size(); i++) {
189 const G4String& modelName = endOfRunModelL << 166 const G4String& modelName =
190 if (searchString == "all" || modelName.fin << 167 endOfRunModelList[i].fpModel->GetGlobalDescription();
>> 168 if (searchString == "all" || modelName.find(searchString)
>> 169 != std::string::npos) {
191 any = true; 170 any = true;
192 endOfRunModelList[i].fActive = activate; 171 endOfRunModelList[i].fActive = activate;
193 if (verbosity >= G4VisManager::warnings) 172 if (verbosity >= G4VisManager::warnings) {
194 G4warn << "Model \"" << modelName; << 173 G4cout << "Model \"" << modelName;
195 if (activate) G4warn << "\" activated."; << 174 if (activate) G4cout << "\" activated.";
196 else G4warn << "\" de-activated."; << 175 else G4cout << "\" de-activated.";
197 G4warn << G4endl; << 176 G4cout << G4endl;
198 } 177 }
199 } 178 }
200 } 179 }
201 180
202 if (!any) { 181 if (!any) {
203 if (verbosity >= G4VisManager::warnings) { 182 if (verbosity >= G4VisManager::warnings) {
204 G4warn << "WARNING: No match found." << << 183 G4cout << "WARNING: No match found." << G4endl;
205 } 184 }
206 return; 185 return;
207 } 186 }
208 187
209 CheckSceneAndNotifyHandlers (pScene); 188 CheckSceneAndNotifyHandlers (pScene);
210 } 189 }
211 190
212 ////////////// /vis/scene/create ///////////// 191 ////////////// /vis/scene/create ///////////////////////////////////////
213 192
214 G4VisCommandSceneCreate::G4VisCommandSceneCrea 193 G4VisCommandSceneCreate::G4VisCommandSceneCreate (): fId (0) {
215 G4bool omitable; 194 G4bool omitable;
216 fpCommand = new G4UIcmdWithAString ("/vis/sc 195 fpCommand = new G4UIcmdWithAString ("/vis/scene/create", this);
217 fpCommand -> SetGuidance 196 fpCommand -> SetGuidance
218 ("Creates an empty scene."); 197 ("Creates an empty scene.");
219 fpCommand -> SetGuidance 198 fpCommand -> SetGuidance
220 ("Invents a name if not supplied. This sc 199 ("Invents a name if not supplied. This scene becomes current.");
221 fpCommand -> SetParameterName ("scene-name", 200 fpCommand -> SetParameterName ("scene-name", omitable = true);
222 } 201 }
223 202
224 G4VisCommandSceneCreate::~G4VisCommandSceneCre 203 G4VisCommandSceneCreate::~G4VisCommandSceneCreate () {
225 delete fpCommand; 204 delete fpCommand;
226 } 205 }
227 206
228 G4String G4VisCommandSceneCreate::NextName () 207 G4String G4VisCommandSceneCreate::NextName () {
229 std::ostringstream oss; 208 std::ostringstream oss;
230 oss << "scene-" << fId; 209 oss << "scene-" << fId;
231 return oss.str(); 210 return oss.str();
232 } 211 }
233 212
234 G4String G4VisCommandSceneCreate::GetCurrentVa 213 G4String G4VisCommandSceneCreate::GetCurrentValue (G4UIcommand*) {
235 return ""; 214 return "";
236 } 215 }
237 216
238 void G4VisCommandSceneCreate::SetNewValue (G4U 217 void G4VisCommandSceneCreate::SetNewValue (G4UIcommand*, G4String newValue) {
239 218
240 G4VisManager::Verbosity verbosity = fpVisMan 219 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
241 220
242 G4String& newName = newValue; 221 G4String& newName = newValue;
243 G4String nextName = NextName (); 222 G4String nextName = NextName ();
244 223
245 if (newName == "") { 224 if (newName == "") {
246 newName = nextName; 225 newName = nextName;
247 } 226 }
248 if (newName == nextName) fId++; 227 if (newName == nextName) fId++;
249 228
250 G4SceneList& sceneList = fpVisManager -> Set 229 G4SceneList& sceneList = fpVisManager -> SetSceneList ();
251 std::size_t iScene, nScenes = sceneList.size << 230 G4int iScene, nScenes = sceneList.size ();
252 for (iScene = 0; iScene < nScenes; ++iScene) << 231 for (iScene = 0; iScene < nScenes; iScene++) {
253 if (sceneList [iScene] -> GetName () == ne 232 if (sceneList [iScene] -> GetName () == newName) break;
254 } 233 }
255 if (iScene < nScenes) { 234 if (iScene < nScenes) {
256 if (verbosity >= G4VisManager::warnings) { 235 if (verbosity >= G4VisManager::warnings) {
257 G4warn << "WARNING: Scene \"" << newName << 236 G4cout << "WARNING: Scene \"" << newName << "\" already exists."
258 << "\n New scene not created." 237 << "\n New scene not created."
259 << G4endl; 238 << G4endl;
260 } 239 }
261 } else { 240 } else {
262 241
263 // Add empty scene data object to list... 242 // Add empty scene data object to list...
264 G4Scene* pScene = new G4Scene (newName); 243 G4Scene* pScene = new G4Scene (newName);
265 sceneList.push_back (pScene); 244 sceneList.push_back (pScene);
266 fpVisManager -> SetCurrentScene (pScene); 245 fpVisManager -> SetCurrentScene (pScene);
267 246
268 if (verbosity >= G4VisManager::confirmatio 247 if (verbosity >= G4VisManager::confirmations) {
269 G4cout << "New empty scene \"" << newNam 248 G4cout << "New empty scene \"" << newName << "\" created." << G4endl;
270 } 249 }
271 } 250 }
272 } 251 }
273 252
274 ////////////// /vis/scene/endOfEventAction /// 253 ////////////// /vis/scene/endOfEventAction ////////////////////////////
275 254
276 G4VisCommandSceneEndOfEventAction::G4VisComman 255 G4VisCommandSceneEndOfEventAction::G4VisCommandSceneEndOfEventAction () {
277 G4bool omitable; 256 G4bool omitable;
278 fpCommand = new G4UIcommand ("/vis/scene/end 257 fpCommand = new G4UIcommand ("/vis/scene/endOfEventAction", this);
279 fpCommand -> SetGuidance 258 fpCommand -> SetGuidance
280 ("Accumulate or refresh the viewer for eac 259 ("Accumulate or refresh the viewer for each new event.");
281 fpCommand -> SetGuidance 260 fpCommand -> SetGuidance
282 ("\"accumulate\": viewer accumulates hits, 261 ("\"accumulate\": viewer accumulates hits, etc., event by event, or");
283 fpCommand -> SetGuidance 262 fpCommand -> SetGuidance
284 ("\"refresh\": viewer shows them at end of 263 ("\"refresh\": viewer shows them at end of event or, for direct-screen"
285 "\n viewers, refreshes the screen just b 264 "\n viewers, refreshes the screen just before drawing the next event.");
286 G4UIparameter* parameter; 265 G4UIparameter* parameter;
287 parameter = new G4UIparameter ("action", 's' 266 parameter = new G4UIparameter ("action", 's', omitable = true);
288 parameter -> SetParameterCandidates ("accumu 267 parameter -> SetParameterCandidates ("accumulate refresh");
289 parameter -> SetDefaultValue ("refresh"); 268 parameter -> SetDefaultValue ("refresh");
290 fpCommand -> SetParameter (parameter); 269 fpCommand -> SetParameter (parameter);
291 parameter = new G4UIparameter ("maxNumber", 270 parameter = new G4UIparameter ("maxNumber", 'i', omitable = true);
292 parameter -> SetDefaultValue (100); 271 parameter -> SetDefaultValue (100);
293 parameter -> SetGuidance 272 parameter -> SetGuidance
294 ("Maximum number of events kept. Unlimited 273 ("Maximum number of events kept. Unlimited if negative.");
295 fpCommand -> SetParameter (parameter); 274 fpCommand -> SetParameter (parameter);
296 } 275 }
297 276
298 G4VisCommandSceneEndOfEventAction::~G4VisComma 277 G4VisCommandSceneEndOfEventAction::~G4VisCommandSceneEndOfEventAction () {
299 delete fpCommand; 278 delete fpCommand;
300 } 279 }
301 280
302 G4String G4VisCommandSceneEndOfEventAction::Ge 281 G4String G4VisCommandSceneEndOfEventAction::GetCurrentValue(G4UIcommand*) {
303 return ""; 282 return "";
304 } 283 }
305 284
306 void G4VisCommandSceneEndOfEventAction::SetNew 285 void G4VisCommandSceneEndOfEventAction::SetNewValue (G4UIcommand*,
307 G4String newValue) { 286 G4String newValue) {
308 287
309 G4VisManager::Verbosity verbosity = fpVisMan 288 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
310 289
311 G4String action; 290 G4String action;
312 G4int maxNumberOfKeptEvents; 291 G4int maxNumberOfKeptEvents;
313 std::istringstream is (newValue); 292 std::istringstream is (newValue);
314 is >> action >> maxNumberOfKeptEvents; 293 is >> action >> maxNumberOfKeptEvents;
315 294
316 G4Scene* pScene = fpVisManager->GetCurrentSc 295 G4Scene* pScene = fpVisManager->GetCurrentScene();
317 if (!pScene) { 296 if (!pScene) {
318 if (verbosity >= G4VisManager::errors) { 297 if (verbosity >= G4VisManager::errors) {
319 G4warn << "ERROR: No current scene. Ple << 298 G4cerr << "ERROR: No current scene. Please create one." << G4endl;
320 } 299 }
321 return; 300 return;
322 } 301 }
323 302
324 G4VSceneHandler* pSceneHandler = fpVisManage 303 G4VSceneHandler* pSceneHandler = fpVisManager->GetCurrentSceneHandler();
325 if (!pSceneHandler) { 304 if (!pSceneHandler) {
326 if (verbosity >= G4VisManager::errors) { 305 if (verbosity >= G4VisManager::errors) {
327 G4warn << "ERROR: No current sceneHandle << 306 G4cerr << "ERROR: No current sceneHandler. Please create one." << G4endl;
328 } 307 }
329 return; 308 return;
330 } 309 }
331 310
332 if (action == "accumulate") { 311 if (action == "accumulate") {
333 pScene->SetRefreshAtEndOfEvent(false); 312 pScene->SetRefreshAtEndOfEvent(false);
334 pScene->SetMaxNumberOfKeptEvents(maxNumber 313 pScene->SetMaxNumberOfKeptEvents(maxNumberOfKeptEvents);
335 } 314 }
336 else if (action == "refresh") { 315 else if (action == "refresh") {
337 if (!pScene->GetRefreshAtEndOfRun()) { 316 if (!pScene->GetRefreshAtEndOfRun()) {
338 if (verbosity >= G4VisManager::errors) { 317 if (verbosity >= G4VisManager::errors) {
339 G4warn << << 318 G4cerr <<
340 "ERROR: Cannot refresh events unless runs 319 "ERROR: Cannot refresh events unless runs refresh too."
341 "\n Use \"/vis/scene/endOfRun refresh\"." 320 "\n Use \"/vis/scene/endOfRun refresh\"."
342 << G4endl; 321 << G4endl;
343 } 322 }
344 } else { 323 } else {
345 pScene->SetRefreshAtEndOfEvent(true); 324 pScene->SetRefreshAtEndOfEvent(true);
346 pScene->SetMaxNumberOfKeptEvents(maxNumb 325 pScene->SetMaxNumberOfKeptEvents(maxNumberOfKeptEvents);
347 pSceneHandler->SetMarkForClearingTransie 326 pSceneHandler->SetMarkForClearingTransientStore(true);
348 } 327 }
349 } 328 }
350 else { 329 else {
351 if (verbosity >= G4VisManager::errors) { 330 if (verbosity >= G4VisManager::errors) {
352 G4warn << << 331 G4cerr <<
353 "ERROR: unrecognised parameter \"" << action 332 "ERROR: unrecognised parameter \"" << action << "\"."
354 << G4endl; 333 << G4endl;
355 } 334 }
356 return; 335 return;
357 } 336 }
358 337
359 // Change of transients behaviour, so... 338 // Change of transients behaviour, so...
360 fpVisManager->ResetTransientsDrawnFlags(); 339 fpVisManager->ResetTransientsDrawnFlags();
361 340
362 // Are there any events currently kept... 341 // Are there any events currently kept...
363 size_t nCurrentlyKept = 0; << 342 size_t nCurrentlyKept = 0;
364 G4RunManager* runManager = G4RunManagerFacto << 343 G4RunManager* runManager = G4RunManager::GetRunManager();
365 if(runManager) << 344 #ifdef G4MULTITHREADED
366 { << 345 if(G4Threading::IsMultithreadedApplication())
>> 346 { runManager = G4MTRunManager::GetMasterRunManager(); }
>> 347 #endif
>> 348 if (runManager) {
367 const G4Run* currentRun = runManager->GetC 349 const G4Run* currentRun = runManager->GetCurrentRun();
368 if(currentRun) << 350 if (currentRun) {
369 { << 351 const std::vector<const G4Event*>* events =
370 const std::vector<const G4Event*>* event << 352 currentRun->GetEventVector();
371 if(events) << 353 if (events) nCurrentlyKept = events->size();
372 nCurrentlyKept = events->size(); <<
373 } 354 }
374 } 355 }
375 356
376 if (verbosity >= G4VisManager::confirmations 357 if (verbosity >= G4VisManager::confirmations) {
377 G4cout << "End of event action set to "; 358 G4cout << "End of event action set to ";
378 if (pScene->GetRefreshAtEndOfEvent()) G4co 359 if (pScene->GetRefreshAtEndOfEvent()) G4cout << "\"refresh\".";
379 else { 360 else {
380 G4cout << "\"accumulate\"." 361 G4cout << "\"accumulate\"."
381 "\n Maximum number of events to be kept: " 362 "\n Maximum number of events to be kept: "
382 << maxNumberOfKeptEvents 363 << maxNumberOfKeptEvents
383 << " (unlimited if negative)." 364 << " (unlimited if negative)."
384 "\n This may be changed with, e.g., " 365 "\n This may be changed with, e.g., "
385 "\"/vis/scene/endOfEventAction accumulate 10 366 "\"/vis/scene/endOfEventAction accumulate 1000\".";
386 } 367 }
387 G4cout << G4endl; 368 G4cout << G4endl;
388 } 369 }
389 370
390 if (!pScene->GetRefreshAtEndOfEvent() && 371 if (!pScene->GetRefreshAtEndOfEvent() &&
391 maxNumberOfKeptEvents != 0 && 372 maxNumberOfKeptEvents != 0 &&
392 verbosity >= G4VisManager::warnings) { 373 verbosity >= G4VisManager::warnings) {
393 G4warn << "WARNING: "; << 374 G4cout << "WARNING: ";
394 if (nCurrentlyKept) { 375 if (nCurrentlyKept) {
395 G4warn << << 376 G4cout <<
396 "\n There are currently " << nCurrentlyKept 377 "\n There are currently " << nCurrentlyKept
397 << " events kept for refreshing and/or 378 << " events kept for refreshing and/or reviewing.";
398 } else { 379 } else {
399 G4warn << "The vis manager will keep "; << 380 G4cout << "The vis manager will keep ";
400 if (maxNumberOfKeptEvents < 0) G4warn << << 381 if (maxNumberOfKeptEvents < 0) G4cout << "an unlimited number of";
401 else G4warn << "up to " << maxNumberOfKe << 382 else G4cout << "up to " << maxNumberOfKeptEvents;
402 G4warn << " events."; << 383 G4cout << " events.";
403 if (maxNumberOfKeptEvents > 1 || maxNumb 384 if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0)
404 G4warn << << 385 G4cout <<
405 "\n This may use a lot of memory." 386 "\n This may use a lot of memory."
406 "\n It may be changed with, e.g., " 387 "\n It may be changed with, e.g., "
407 "\"/vis/scene/endOfEventAction accumulate 388 "\"/vis/scene/endOfEventAction accumulate 10\".";
408 } 389 }
409 G4warn << G4endl; << 390 G4cout << G4endl;
410 } 391 }
411 } 392 }
412 393
413 ////////////// /vis/scene/endOfRunAction ///// 394 ////////////// /vis/scene/endOfRunAction ////////////////////////////
414 395
415 G4VisCommandSceneEndOfRunAction::G4VisCommandS 396 G4VisCommandSceneEndOfRunAction::G4VisCommandSceneEndOfRunAction () {
416 G4bool omitable; 397 G4bool omitable;
417 fpCommand = new G4UIcmdWithAString ("/vis/sc 398 fpCommand = new G4UIcmdWithAString ("/vis/scene/endOfRunAction", this);
418 fpCommand -> SetGuidance 399 fpCommand -> SetGuidance
419 ("Accumulate or refresh the viewer for eac 400 ("Accumulate or refresh the viewer for each new run.");
420 fpCommand -> SetGuidance 401 fpCommand -> SetGuidance
421 ("\"accumulate\": viewer accumulates hits, 402 ("\"accumulate\": viewer accumulates hits, etc., run by run, or");
422 fpCommand -> SetGuidance 403 fpCommand -> SetGuidance
423 ("\"refresh\": viewer shows them at end of 404 ("\"refresh\": viewer shows them at end of run or, for direct-screen"
424 "\n viewers, refreshes the screen just b 405 "\n viewers, refreshes the screen just before drawing the first"
425 "\n event of the next run."); 406 "\n event of the next run.");
426 fpCommand -> SetGuidance ("The detector rema 407 fpCommand -> SetGuidance ("The detector remains or is redrawn.");
427 fpCommand -> SetParameterName ("action", omi 408 fpCommand -> SetParameterName ("action", omitable = true);
428 fpCommand -> SetCandidates ("accumulate refr 409 fpCommand -> SetCandidates ("accumulate refresh");
429 fpCommand -> SetDefaultValue ("refresh"); 410 fpCommand -> SetDefaultValue ("refresh");
430 } 411 }
431 412
432 G4VisCommandSceneEndOfRunAction::~G4VisCommand 413 G4VisCommandSceneEndOfRunAction::~G4VisCommandSceneEndOfRunAction () {
433 delete fpCommand; 414 delete fpCommand;
434 } 415 }
435 416
436 G4String G4VisCommandSceneEndOfRunAction::GetC 417 G4String G4VisCommandSceneEndOfRunAction::GetCurrentValue(G4UIcommand*) {
437 return ""; 418 return "";
438 } 419 }
439 420
440 void G4VisCommandSceneEndOfRunAction::SetNewVa 421 void G4VisCommandSceneEndOfRunAction::SetNewValue (G4UIcommand*,
441 G4String newValue) { 422 G4String newValue) {
442 423
443 G4VisManager::Verbosity verbosity = fpVisMan 424 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
444 425
445 G4String action; 426 G4String action;
446 std::istringstream is (newValue); 427 std::istringstream is (newValue);
447 is >> action; 428 is >> action;
448 429
449 G4Scene* pScene = fpVisManager->GetCurrentSc 430 G4Scene* pScene = fpVisManager->GetCurrentScene();
450 if (!pScene) { 431 if (!pScene) {
451 if (verbosity >= G4VisManager::errors) { 432 if (verbosity >= G4VisManager::errors) {
452 G4warn << "ERROR: No current scene. Ple << 433 G4cerr << "ERROR: No current scene. Please create one." << G4endl;
453 } 434 }
454 return; 435 return;
455 } 436 }
456 437
457 G4VSceneHandler* pSceneHandler = fpVisManage 438 G4VSceneHandler* pSceneHandler = fpVisManager->GetCurrentSceneHandler();
458 if (!pSceneHandler) { 439 if (!pSceneHandler) {
459 if (verbosity >= G4VisManager::errors) { 440 if (verbosity >= G4VisManager::errors) {
460 G4warn << "ERROR: No current sceneHandle << 441 G4cerr << "ERROR: No current sceneHandler. Please create one." << G4endl;
461 } 442 }
462 return; 443 return;
463 } 444 }
464 445
465 if (action == "accumulate") { 446 if (action == "accumulate") {
466 if (pScene->GetRefreshAtEndOfEvent()) { 447 if (pScene->GetRefreshAtEndOfEvent()) {
467 if (verbosity >= G4VisManager::errors) { 448 if (verbosity >= G4VisManager::errors) {
468 G4warn << << 449 G4cerr <<
469 "ERROR: Cannot accumulate runs unless even 450 "ERROR: Cannot accumulate runs unless events accumulate too."
470 "\n Use \"/vis/scene/endOfEventAction acc 451 "\n Use \"/vis/scene/endOfEventAction accumulate\"."
471 << G4endl; 452 << G4endl;
472 } 453 }
473 } 454 }
474 else { 455 else {
475 pScene->SetRefreshAtEndOfRun(false); 456 pScene->SetRefreshAtEndOfRun(false);
476 } 457 }
477 } 458 }
478 else if (action == "refresh") { 459 else if (action == "refresh") {
479 pScene->SetRefreshAtEndOfRun(true); 460 pScene->SetRefreshAtEndOfRun(true);
480 pSceneHandler->SetMarkForClearingTransient 461 pSceneHandler->SetMarkForClearingTransientStore(true);
481 } 462 }
482 else { 463 else {
483 if (verbosity >= G4VisManager::errors) { 464 if (verbosity >= G4VisManager::errors) {
484 G4warn << << 465 G4cerr <<
485 "ERROR: unrecognised parameter \"" << action 466 "ERROR: unrecognised parameter \"" << action << "\"."
486 << G4endl; 467 << G4endl;
487 } 468 }
488 return; 469 return;
489 } 470 }
490 471
491 // Change of transients behaviour, so... 472 // Change of transients behaviour, so...
492 fpVisManager->ResetTransientsDrawnFlags(); 473 fpVisManager->ResetTransientsDrawnFlags();
493 474
494 if (verbosity >= G4VisManager::confirmations 475 if (verbosity >= G4VisManager::confirmations) {
495 G4cout << "End of run action set to \""; 476 G4cout << "End of run action set to \"";
496 if (pScene->GetRefreshAtEndOfRun()) G4cout 477 if (pScene->GetRefreshAtEndOfRun()) G4cout << "refresh";
497 else G4cout << "accumulate"; 478 else G4cout << "accumulate";
498 G4cout << "\"" << G4endl; 479 G4cout << "\"" << G4endl;
499 } 480 }
500 } 481 }
501 482
502 ////////////// /vis/scene/list /////////////// 483 ////////////// /vis/scene/list ///////////////////////////////////////
503 484
504 G4VisCommandSceneList::G4VisCommandSceneList ( 485 G4VisCommandSceneList::G4VisCommandSceneList () {
505 G4bool omitable; 486 G4bool omitable;
506 fpCommand = new G4UIcommand ("/vis/scene/lis 487 fpCommand = new G4UIcommand ("/vis/scene/list", this);
507 fpCommand -> SetGuidance ("Lists scene(s).") 488 fpCommand -> SetGuidance ("Lists scene(s).");
508 fpCommand -> SetGuidance 489 fpCommand -> SetGuidance
509 ("\"help /vis/verbose\" for definition of 490 ("\"help /vis/verbose\" for definition of verbosity.");
510 G4UIparameter* parameter; 491 G4UIparameter* parameter;
511 parameter = new G4UIparameter ("scene-name", 492 parameter = new G4UIparameter ("scene-name", 's', omitable = true);
512 parameter -> SetDefaultValue ("all"); 493 parameter -> SetDefaultValue ("all");
513 fpCommand -> SetParameter (parameter); 494 fpCommand -> SetParameter (parameter);
514 parameter = new G4UIparameter ("verbosity", 495 parameter = new G4UIparameter ("verbosity", 's', omitable = true);
515 parameter -> SetDefaultValue ("warnings"); 496 parameter -> SetDefaultValue ("warnings");
516 fpCommand -> SetParameter (parameter); 497 fpCommand -> SetParameter (parameter);
517 } 498 }
518 499
519 G4VisCommandSceneList::~G4VisCommandSceneList 500 G4VisCommandSceneList::~G4VisCommandSceneList () {
520 delete fpCommand; 501 delete fpCommand;
521 } 502 }
522 503
523 G4String G4VisCommandSceneList::GetCurrentValu 504 G4String G4VisCommandSceneList::GetCurrentValue (G4UIcommand*) {
524 return ""; 505 return "";
525 } 506 }
526 507
527 void G4VisCommandSceneList::SetNewValue (G4UIc 508 void G4VisCommandSceneList::SetNewValue (G4UIcommand*, G4String newValue) {
528 G4String name, verbosityString; 509 G4String name, verbosityString;
529 std::istringstream is (newValue); 510 std::istringstream is (newValue);
530 is >> name >> verbosityString; 511 is >> name >> verbosityString;
531 G4VisManager::Verbosity verbosity = 512 G4VisManager::Verbosity verbosity =
532 fpVisManager->GetVerbosityValue(verbosityS 513 fpVisManager->GetVerbosityValue(verbosityString);
533 const G4Scene* currentScene = fpVisManager - 514 const G4Scene* currentScene = fpVisManager -> GetCurrentScene ();
534 G4String currentName; 515 G4String currentName;
535 if (currentScene) currentName = currentScene 516 if (currentScene) currentName = currentScene->GetName();
536 517
537 G4SceneList& sceneList = fpVisManager -> Set 518 G4SceneList& sceneList = fpVisManager -> SetSceneList ();
538 std::size_t iScene, nScenes = sceneList.size << 519 G4int iScene, nScenes = sceneList.size ();
539 G4bool found = false; 520 G4bool found = false;
540 for (iScene = 0; iScene < nScenes; ++iScene) << 521 for (iScene = 0; iScene < nScenes; iScene++) {
541 G4Scene* pScene = sceneList [iScene]; 522 G4Scene* pScene = sceneList [iScene];
542 const G4String& iName = pScene -> GetName 523 const G4String& iName = pScene -> GetName ();
543 if (name != "all") { 524 if (name != "all") {
544 if (name != iName) continue; 525 if (name != iName) continue;
545 } 526 }
546 found = true; 527 found = true;
547 if (iName == currentName) { 528 if (iName == currentName) {
548 G4cout << " (current)"; 529 G4cout << " (current)";
549 } 530 }
550 else { 531 else {
551 G4cout << " "; 532 G4cout << " ";
552 } 533 }
553 G4cout << " scene \"" << iName << "\""; 534 G4cout << " scene \"" << iName << "\"";
554 if (verbosity >= G4VisManager::warnings) { 535 if (verbosity >= G4VisManager::warnings) {
555 std::size_t i; << 536 G4int i;
556 G4cout << "\n Run-duration models:"; 537 G4cout << "\n Run-duration models:";
557 std::size_t nRunModels = pScene -> GetRu << 538 G4int nRunModels = pScene -> GetRunDurationModelList ().size ();
558 if (nRunModels == 0) { 539 if (nRunModels == 0) {
559 G4cout << " none."; 540 G4cout << " none.";
560 } 541 }
561 for (i = 0; i < nRunModels; ++i) { << 542 for (i = 0; i < nRunModels; i++) {
562 if (pScene -> GetRunDurationModelList()[i].f 543 if (pScene -> GetRunDurationModelList()[i].fActive)
563 G4cout << "\n Active: "; 544 G4cout << "\n Active: ";
564 else G4cout << "\n Inactive: "; 545 else G4cout << "\n Inactive: ";
565 G4VModel* pModel = pScene -> GetRunDurationM 546 G4VModel* pModel = pScene -> GetRunDurationModelList()[i].fpModel;
566 G4cout << pModel -> GetGlobalDescription (); 547 G4cout << pModel -> GetGlobalDescription ();
567 } 548 }
568 G4cout << "\n End-of-event models:"; 549 G4cout << "\n End-of-event models:";
569 std::size_t nEOEModels = pScene -> GetEn << 550 G4int nEOEModels = pScene -> GetEndOfEventModelList ().size ();
570 if (nEOEModels == 0) { 551 if (nEOEModels == 0) {
571 G4cout << " none."; 552 G4cout << " none.";
572 } 553 }
573 for (i = 0; i < nEOEModels; ++i) { << 554 for (i = 0; i < nEOEModels; i++) {
574 if (pScene -> GetEndOfEventModelList()[i].fA 555 if (pScene -> GetEndOfEventModelList()[i].fActive)
575 G4cout << "\n Active: "; 556 G4cout << "\n Active: ";
576 else G4cout << "\n Inactive: "; 557 else G4cout << "\n Inactive: ";
577 G4VModel* pModel = pScene -> GetEndOfEventMo 558 G4VModel* pModel = pScene -> GetEndOfEventModelList()[i].fpModel;
578 G4cout << pModel -> GetGlobalDescription (); 559 G4cout << pModel -> GetGlobalDescription ();
579 } 560 }
580 G4cout << "\n End-of-run models:"; 561 G4cout << "\n End-of-run models:";
581 std::size_t nEORModels = pScene -> GetEn << 562 G4int nEORModels = pScene -> GetEndOfRunModelList ().size ();
582 if (nEORModels == 0) { 563 if (nEORModels == 0) {
583 G4cout << " none."; 564 G4cout << " none.";
584 } 565 }
585 for (i = 0; i < nEORModels; ++i) { << 566 for (i = 0; i < nEORModels; i++) {
586 if (pScene -> GetEndOfRunModelList()[i].fAct 567 if (pScene -> GetEndOfRunModelList()[i].fActive)
587 G4cout << "\n Active: "; 568 G4cout << "\n Active: ";
588 else G4cout << "\n Inactive: "; 569 else G4cout << "\n Inactive: ";
589 G4VModel* pModel = pScene -> GetEndOfRunMode 570 G4VModel* pModel = pScene -> GetEndOfRunModelList()[i].fpModel;
590 G4cout << pModel -> GetGlobalDescription (); 571 G4cout << pModel -> GetGlobalDescription ();
591 } 572 }
592 } 573 }
593 if (verbosity >= G4VisManager::parameters) 574 if (verbosity >= G4VisManager::parameters) {
594 G4cout << "\n " << *sceneList [iScene]; 575 G4cout << "\n " << *sceneList [iScene];
595 } 576 }
596 G4cout << G4endl; 577 G4cout << G4endl;
597 } 578 }
598 if (!found) { 579 if (!found) {
599 G4warn << "No scenes found"; << 580 G4cout << "No scenes found";
600 if (name != "all") { 581 if (name != "all") {
601 G4warn << " of name \"" << name << "\""; << 582 G4cout << " of name \"" << name << "\"";
602 } 583 }
603 G4warn << "." << G4endl; << 584 G4cout << "." << G4endl;
604 } 585 }
605 } 586 }
606 587
607 ////////////// /vis/scene/notifyHandlers ///// 588 ////////////// /vis/scene/notifyHandlers /////////////////////////
608 589
609 G4VisCommandSceneNotifyHandlers::G4VisCommandS 590 G4VisCommandSceneNotifyHandlers::G4VisCommandSceneNotifyHandlers () {
610 G4bool omitable; 591 G4bool omitable;
611 fpCommand = new G4UIcommand ("/vis/scene/not 592 fpCommand = new G4UIcommand ("/vis/scene/notifyHandlers", this);
612 fpCommand -> SetGuidance 593 fpCommand -> SetGuidance
613 ("Notifies scene handlers and forces re-re 594 ("Notifies scene handlers and forces re-rendering.");
614 fpCommand -> SetGuidance 595 fpCommand -> SetGuidance
615 ("Notifies the handler(s) of the specified 596 ("Notifies the handler(s) of the specified scene and forces a"
616 "\nreconstruction of any graphical databa 597 "\nreconstruction of any graphical databases."
617 "\nClears and refreshes all viewers of cu 598 "\nClears and refreshes all viewers of current scene."
618 "\n The default action \"refresh\" does 599 "\n The default action \"refresh\" does not issue \"update\" (see"
619 "\n /vis/viewer/update)." 600 "\n /vis/viewer/update)."
620 "\nIf \"flush\" is specified, it issues a 601 "\nIf \"flush\" is specified, it issues an \"update\" as well as"
621 "\n \"refresh\" - \"update\" and initiat 602 "\n \"refresh\" - \"update\" and initiates post-processing"
622 "\n for graphics systems which need it." 603 "\n for graphics systems which need it.");
623 fpCommand -> SetGuidance 604 fpCommand -> SetGuidance
624 ("The default for <scene-name> is the curr 605 ("The default for <scene-name> is the current scene name.");
625 fpCommand -> SetGuidance 606 fpCommand -> SetGuidance
626 ("This command does not change current sce 607 ("This command does not change current scene, scene handler or viewer.");
627 G4UIparameter* parameter; 608 G4UIparameter* parameter;
628 parameter = new G4UIparameter ("scene-name", 609 parameter = new G4UIparameter ("scene-name", 's',
629 omitable = true); 610 omitable = true);
630 parameter -> SetCurrentAsDefault(true); 611 parameter -> SetCurrentAsDefault(true);
631 fpCommand -> SetParameter (parameter); 612 fpCommand -> SetParameter (parameter);
632 parameter = new G4UIparameter ("refresh-flus 613 parameter = new G4UIparameter ("refresh-flush", 's',
633 omitable = true); 614 omitable = true);
634 parameter -> SetDefaultValue("refresh"); 615 parameter -> SetDefaultValue("refresh");
635 parameter -> SetParameterCandidates("r refre 616 parameter -> SetParameterCandidates("r refresh f flush");
636 fpCommand -> SetParameter (parameter); 617 fpCommand -> SetParameter (parameter);
637 } 618 }
638 619
639 G4VisCommandSceneNotifyHandlers::~G4VisCommand 620 G4VisCommandSceneNotifyHandlers::~G4VisCommandSceneNotifyHandlers () {
640 delete fpCommand; 621 delete fpCommand;
641 } 622 }
642 623
643 G4String G4VisCommandSceneNotifyHandlers::GetC 624 G4String G4VisCommandSceneNotifyHandlers::GetCurrentValue(G4UIcommand*) {
644 return CurrentSceneName (); 625 return CurrentSceneName ();
645 } 626 }
646 627
647 void G4VisCommandSceneNotifyHandlers::SetNewVa 628 void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand*,
648 G4String newValue) { 629 G4String newValue) {
649 630
650 G4VisManager::Verbosity verbosity = fpVisMan 631 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
651 632
652 G4String sceneName, refresh_flush; 633 G4String sceneName, refresh_flush;
653 std::istringstream is (newValue); 634 std::istringstream is (newValue);
654 is >> sceneName >> refresh_flush; 635 is >> sceneName >> refresh_flush;
655 G4bool flush = false; 636 G4bool flush = false;
656 if (refresh_flush[0] == 'f') flush = true; << 637 if (refresh_flush(0) == 'f') flush = true;
657 638
658 const G4SceneList& sceneList = fpVisManager 639 const G4SceneList& sceneList = fpVisManager -> GetSceneList ();
659 G4SceneHandlerList& sceneHandlerList = 640 G4SceneHandlerList& sceneHandlerList =
660 fpVisManager -> SetAvailableSceneHandlers 641 fpVisManager -> SetAvailableSceneHandlers ();
661 642
662 // Check scene name. 643 // Check scene name.
663 const std::size_t nScenes = sceneList.size ( << 644 const G4int nScenes = sceneList.size ();
664 std::size_t iScene; << 645 G4int iScene;
665 for (iScene = 0; iScene < nScenes; ++iScene) << 646 for (iScene = 0; iScene < nScenes; iScene++) {
666 G4Scene* scene = sceneList [iScene]; 647 G4Scene* scene = sceneList [iScene];
667 if (sceneName == scene -> GetName ()) brea 648 if (sceneName == scene -> GetName ()) break;
668 } 649 }
669 if (iScene >= nScenes ) { 650 if (iScene >= nScenes ) {
670 if (verbosity >= G4VisManager::warnings) { 651 if (verbosity >= G4VisManager::warnings) {
671 G4warn << "WARNING: Scene \"" << sceneNa << 652 G4cout << "WARNING: Scene \"" << sceneName << "\" not found."
672 "\n /vis/scene/list to see scenes." 653 "\n /vis/scene/list to see scenes."
673 << G4endl; 654 << G4endl;
674 } 655 }
675 return; 656 return;
676 } 657 }
677 658
678 // Store current context... 659 // Store current context...
679 G4VSceneHandler* pCurrentSceneHandler = 660 G4VSceneHandler* pCurrentSceneHandler =
680 fpVisManager -> GetCurrentSceneHandler(); 661 fpVisManager -> GetCurrentSceneHandler();
681 if (!pCurrentSceneHandler) { 662 if (!pCurrentSceneHandler) {
682 if (verbosity >= G4VisManager::warnings) { 663 if (verbosity >= G4VisManager::warnings) {
683 G4warn << "WARNING: No current scene han << 664 G4cout << "WARNING: No current scene handler."
684 << G4endl; 665 << G4endl;
685 } 666 }
686 return; 667 return;
687 } 668 }
688 G4VViewer* pCurrentViewer = fpVisManager -> 669 G4VViewer* pCurrentViewer = fpVisManager -> GetCurrentViewer();
689 if (!pCurrentViewer) { 670 if (!pCurrentViewer) {
690 if (verbosity >= G4VisManager::warnings) { 671 if (verbosity >= G4VisManager::warnings) {
691 G4warn << "WARNING: No current viewer." << 672 G4cout << "WARNING: No current viewer."
692 << G4endl; 673 << G4endl;
693 } 674 }
694 return; 675 return;
695 } 676 }
696 G4Scene* pCurrentScene = fpVisManager -> Get 677 G4Scene* pCurrentScene = fpVisManager -> GetCurrentScene();
697 if (!pCurrentScene) { 678 if (!pCurrentScene) {
698 if (verbosity >= G4VisManager::warnings) { 679 if (verbosity >= G4VisManager::warnings) {
699 G4warn << "WARNING: No current scene." << 680 G4cout << "WARNING: No current scene."
700 << G4endl; 681 << G4endl;
701 } 682 }
702 return; 683 return;
703 } 684 }
704 685
705 G4VisManager::Verbosity currentVerbosity = f 686 G4VisManager::Verbosity currentVerbosity = fpVisManager -> GetVerbosity();
706 687
707 // Suppress messages during this process (on 688 // Suppress messages during this process (only print errors)...
708 //fpVisManager -> SetVerboseLevel(G4VisManag 689 //fpVisManager -> SetVerboseLevel(G4VisManager::errors);
709 690
710 // For each scene handler, if it contains th 691 // For each scene handler, if it contains the scene, clear and
711 // rebuild the graphical database, then for 692 // rebuild the graphical database, then for each viewer set (make
712 // current), clear, (re)draw, and show. 693 // current), clear, (re)draw, and show.
713 const std::size_t nSceneHandlers = sceneHand << 694 const G4int nSceneHandlers = sceneHandlerList.size ();
714 for (std::size_t iSH = 0; iSH < nSceneHandle << 695 for (G4int iSH = 0; iSH < nSceneHandlers; iSH++) {
715 G4VSceneHandler* aSceneHandler = sceneHand 696 G4VSceneHandler* aSceneHandler = sceneHandlerList [iSH];
716 G4Scene* aScene = aSceneHandler -> GetScen 697 G4Scene* aScene = aSceneHandler -> GetScene ();
717 if (aScene) { 698 if (aScene) {
718 const G4String& aSceneName = aScene -> G 699 const G4String& aSceneName = aScene -> GetName ();
719 if (sceneName == aSceneName) { 700 if (sceneName == aSceneName) {
720 aScene->CalculateExtent(); // Check and rec 701 aScene->CalculateExtent(); // Check and recalculate extent
721 G4ViewerList& viewerList = aSceneHandler -> 702 G4ViewerList& viewerList = aSceneHandler -> SetViewerList ();
722 const std::size_t nViewers = viewerList.size << 703 const G4int nViewers = viewerList.size ();
723 for (std::size_t iV = 0; iV < nViewers; ++iV << 704 for (G4int iV = 0; iV < nViewers; iV++) {
724 G4VViewer* aViewer = viewerList [iV]; 705 G4VViewer* aViewer = viewerList [iV];
725 // Force rebuild of graphical database, if 706 // Force rebuild of graphical database, if any.
726 aViewer -> NeedKernelVisit(); 707 aViewer -> NeedKernelVisit();
727 if (aViewer->GetViewParameters().IsAutoRef 708 if (aViewer->GetViewParameters().IsAutoRefresh()) {
728 aSceneHandler -> SetCurrentViewer (aView 709 aSceneHandler -> SetCurrentViewer (aViewer);
729 // Ensure consistency of vis manager... 710 // Ensure consistency of vis manager...
730 fpVisManager -> SetCurrentViewer(aViewer 711 fpVisManager -> SetCurrentViewer(aViewer);
731 fpVisManager -> SetCurrentSceneHandler(a 712 fpVisManager -> SetCurrentSceneHandler(aSceneHandler);
732 fpVisManager -> SetCurrentScene(aScene); 713 fpVisManager -> SetCurrentScene(aScene);
733 aViewer -> SetView (); 714 aViewer -> SetView ();
734 aViewer -> ClearView (); 715 aViewer -> ClearView ();
735 aViewer -> DrawView (); 716 aViewer -> DrawView ();
736 if (flush) aViewer -> ShowView (); 717 if (flush) aViewer -> ShowView ();
737 if (verbosity >= G4VisManager::confirmat 718 if (verbosity >= G4VisManager::confirmations) {
738 G4cout << "Viewer \"" << aViewer -> Ge 719 G4cout << "Viewer \"" << aViewer -> GetName ()
739 << "\" of scene handler \"" << aScene 720 << "\" of scene handler \"" << aSceneHandler -> GetName ()
740 << "\"\n "; 721 << "\"\n ";
741 if (flush) G4cout << "flushed"; 722 if (flush) G4cout << "flushed";
742 else G4cout << "refreshed"; 723 else G4cout << "refreshed";
743 G4cout << " at request of scene \"" << 724 G4cout << " at request of scene \"" << sceneName
744 << "\"." << G4endl; 725 << "\"." << G4endl;
745 } 726 }
746 } else { 727 } else {
747 if (verbosity >= G4VisManager::confirmat 728 if (verbosity >= G4VisManager::confirmations) {
748 G4cout << "NOTE: The scene, \"" 729 G4cout << "NOTE: The scene, \""
749 << sceneName 730 << sceneName
750 << "\", of viewer \"" 731 << "\", of viewer \""
751 << aViewer -> GetName () 732 << aViewer -> GetName ()
752 << "\"\n of scene handler \"" 733 << "\"\n of scene handler \""
753 << aSceneHandler -> GetName () 734 << aSceneHandler -> GetName ()
754 << "\" has changed. To see effect," 735 << "\" has changed. To see effect,"
755 << "\n \"/vis/viewer/select " 736 << "\n \"/vis/viewer/select "
756 << aViewer -> GetShortName () 737 << aViewer -> GetShortName ()
757 << "\" and \"/vis/viewer/rebuild\"." 738 << "\" and \"/vis/viewer/rebuild\"."
758 << G4endl; 739 << G4endl;
759 } 740 }
760 } 741 }
761 } 742 }
762 } 743 }
763 } 744 }
764 else { 745 else {
765 if (verbosity >= G4VisManager::warnings) 746 if (verbosity >= G4VisManager::warnings) {
766 G4warn << "WARNING: G4VisCommandSceneNotifyH << 747 G4cout << "WARNING: G4VisCommandSceneNotifyHandlers: scene handler \""
767 << aSceneHandler->GetName() 748 << aSceneHandler->GetName()
768 << "\" has a null scene." 749 << "\" has a null scene."
769 << G4endl; 750 << G4endl;
770 } 751 }
771 } 752 }
772 } 753 }
773 754
774 // Reclaim original context - but set viewer 755 // Reclaim original context - but set viewer first, then scene
775 // handler, because the latter might have be 756 // handler, because the latter might have been created very recently
776 // and, not yet having a viewer, the current 757 // and, not yet having a viewer, the current viewer will,
777 // temporarily, refer to another scene handl 758 // temporarily, refer to another scene handler. SetCurrentViewer
778 // actually resets the scene handler, which 759 // actually resets the scene handler, which is what we don't want,
779 // so we set it again on the next line... 760 // so we set it again on the next line...
780 fpVisManager -> SetCurrentViewer(pCurrentVie 761 fpVisManager -> SetCurrentViewer(pCurrentViewer);
781 fpVisManager -> SetCurrentSceneHandler(pCurr 762 fpVisManager -> SetCurrentSceneHandler(pCurrentSceneHandler);
782 fpVisManager -> SetCurrentScene(pCurrentScen 763 fpVisManager -> SetCurrentScene(pCurrentScene);
783 fpVisManager -> SetVerboseLevel(currentVerbo 764 fpVisManager -> SetVerboseLevel(currentVerbosity);
784 // Take care of special case of scene handle 765 // Take care of special case of scene handler with no viewer yet.
785 if (pCurrentSceneHandler) { 766 if (pCurrentSceneHandler) {
786 G4ViewerList& viewerList = pCurrentSceneHa 767 G4ViewerList& viewerList = pCurrentSceneHandler -> SetViewerList ();
787 const std::size_t nViewers = viewerList.si << 768 const G4int nViewers = viewerList.size ();
788 if (nViewers) { 769 if (nViewers) {
789 pCurrentSceneHandler -> SetCurrentViewer 770 pCurrentSceneHandler -> SetCurrentViewer (pCurrentViewer);
790 // JA: I don't think we need this. SetVi << 771 if (pCurrentViewer && pCurrentSceneHandler->GetScene()) {
791 // if (pCurrentViewer && pCurrentSceneHa << 772 pCurrentViewer -> SetView ();
792 // pCurrentViewer -> SetView (); <<
793 // } <<
794 } <<
795 } <<
796 } <<
797 <<
798 ////////////// /vis/scene/removeModel //////// <<
799 <<
800 G4VisCommandSceneRemoveModel::G4VisCommandScen <<
801 G4bool omitable; <<
802 fpCommand = new G4UIcommand ("/vis/scene/rem <<
803 fpCommand -> SetGuidance("Remove model."); <<
804 fpCommand -> SetGuidance <<
805 ("Attempts to match search string to name of <<
806 fpCommand -> SetGuidance <<
807 ("Use \"/vis/scene/list\" to see model names <<
808 G4UIparameter* parameter; <<
809 parameter = new G4UIparameter ("search-strin <<
810 fpCommand -> SetParameter (parameter); <<
811 } <<
812 <<
813 G4VisCommandSceneRemoveModel::~G4VisCommandSce <<
814 delete fpCommand; <<
815 } <<
816 <<
817 G4String G4VisCommandSceneRemoveModel::GetCurr <<
818 return ""; <<
819 } <<
820 <<
821 void G4VisCommandSceneRemoveModel::SetNewValue <<
822 G4String newValue) { <<
823 <<
824 G4VisManager::Verbosity verbosity = fpVisMan <<
825 <<
826 G4String searchString; <<
827 std::istringstream is (newValue); <<
828 is >> searchString; <<
829 <<
830 G4Scene* pScene = fpVisManager->GetCurrentSc <<
831 if (!pScene) { <<
832 if (verbosity >= G4VisManager::errors) { <<
833 G4warn << "ERROR: No current scene. Ple <<
834 } <<
835 return; <<
836 } <<
837 <<
838 G4VSceneHandler* pSceneHandler = fpVisManage <<
839 if (!pSceneHandler) { <<
840 if (verbosity >= G4VisManager::errors) { <<
841 G4warn << "ERROR: No current sceneHandle <<
842 } <<
843 return; <<
844 } <<
845 <<
846 G4bool any = false; <<
847 <<
848 std::vector<G4Scene::Model>& runDurationMode <<
849 pScene->SetRunDurationModelList(); <<
850 for (size_t i = 0; i < runDurationModelList. <<
851 const G4String& modelName = <<
852 runDurationModelList[i].fpModel->GetGlobal <<
853 if (modelName.find(searchString) != std::s <<
854 runDurationModelList.erase(runDurationMo <<
855 any = true; <<
856 if (verbosity >= G4VisManager::warnings) <<
857 G4warn << "Model \"" << modelName << "\" rem <<
858 } <<
859 break; // Allow only one model at a tim <<
860 } <<
861 } <<
862 <<
863 std::vector<G4Scene::Model>& endOfEventModel <<
864 pScene->SetEndOfEventModelList(); <<
865 for (size_t i = 0; i < endOfEventModelList.s <<
866 const G4String& modelName = <<
867 endOfEventModelList[i].fpModel->GetGlobalD <<
868 if (modelName.find(searchString) != std::s <<
869 endOfEventModelList.erase(endOfEventMode <<
870 any = true; <<
871 if (verbosity >= G4VisManager::warnings) <<
872 G4warn << "Model \"" << modelName << "\" rem <<
873 } <<
874 break; // Allow only one model at a tim <<
875 } <<
876 } <<
877 <<
878 std::vector<G4Scene::Model>& endOfRunModelLi <<
879 pScene->SetEndOfRunModelList(); <<
880 for (size_t i = 0; i < endOfRunModelList.siz <<
881 const G4String& modelName = <<
882 endOfRunModelList[i].fpModel->GetGlobalDes <<
883 if (modelName.find(searchString) != std::s <<
884 endOfRunModelList.erase(endOfRunModelLis <<
885 any = true; <<
886 if (verbosity >= G4VisManager::warnings) <<
887 G4warn << "Model \"" << modelName << "\" rem <<
888 } 773 }
889 break; // Allow only one model at a tim <<
890 } <<
891 } <<
892 <<
893 if (!any) { <<
894 if (verbosity >= G4VisManager::warnings) { <<
895 G4warn << "WARNING: No match found." << <<
896 } 774 }
897 return; <<
898 } 775 }
899 <<
900 CheckSceneAndNotifyHandlers (pScene); <<
901 } 776 }
902 777
903 ////////////// /vis/scene/select ///////////// 778 ////////////// /vis/scene/select ///////////////////////////////////////
904 779
905 G4VisCommandSceneSelect::G4VisCommandSceneSele 780 G4VisCommandSceneSelect::G4VisCommandSceneSelect () {
906 G4bool omitable; 781 G4bool omitable;
907 fpCommand = new G4UIcmdWithAString ("/vis/sc 782 fpCommand = new G4UIcmdWithAString ("/vis/scene/select", this);
908 fpCommand -> SetGuidance ("Selects a scene") 783 fpCommand -> SetGuidance ("Selects a scene");
909 fpCommand -> SetGuidance 784 fpCommand -> SetGuidance
910 ("Makes the scene current. \"/vis/scene/lis 785 ("Makes the scene current. \"/vis/scene/list\" to see"
911 "\n possible scene names."); 786 "\n possible scene names.");
912 fpCommand -> SetParameterName ("scene-name", 787 fpCommand -> SetParameterName ("scene-name", omitable = false);
913 } 788 }
914 789
915 G4VisCommandSceneSelect::~G4VisCommandSceneSel 790 G4VisCommandSceneSelect::~G4VisCommandSceneSelect () {
916 delete fpCommand; 791 delete fpCommand;
917 } 792 }
918 793
919 G4String G4VisCommandSceneSelect::GetCurrentVa 794 G4String G4VisCommandSceneSelect::GetCurrentValue (G4UIcommand*) {
920 return ""; 795 return "";
921 } 796 }
922 797
923 void G4VisCommandSceneSelect::SetNewValue (G4U 798 void G4VisCommandSceneSelect::SetNewValue (G4UIcommand*, G4String newValue) {
924 799
925 G4VisManager::Verbosity verbosity = fpVisMan 800 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
926 801
927 G4String& selectName = newValue; 802 G4String& selectName = newValue;
928 G4SceneList& sceneList = fpVisManager -> Set 803 G4SceneList& sceneList = fpVisManager -> SetSceneList ();
929 std::size_t iScene, nScenes = sceneList.size << 804 G4int iScene, nScenes = sceneList.size ();
930 for (iScene = 0; iScene < nScenes; ++iScene) << 805 for (iScene = 0; iScene < nScenes; iScene++) {
931 if (sceneList [iScene] -> GetName () == se 806 if (sceneList [iScene] -> GetName () == selectName) break;
932 } 807 }
933 if (iScene >= nScenes) { 808 if (iScene >= nScenes) {
934 if (verbosity >= G4VisManager::warnings) { 809 if (verbosity >= G4VisManager::warnings) {
935 G4warn << "WARNING: Scene \"" << selectN << 810 G4cout << "WARNING: Scene \"" << selectName
936 << "\" not found - \"/vis/scene/list\" t 811 << "\" not found - \"/vis/scene/list\" to see possibilities."
937 << G4endl; 812 << G4endl;
938 } 813 }
939 return; 814 return;
940 } 815 }
941 816
942 if (verbosity >= G4VisManager::confirmations 817 if (verbosity >= G4VisManager::confirmations) {
943 G4cout << "Scene \"" << selectName 818 G4cout << "Scene \"" << selectName
944 << "\" selected." << G4endl; 819 << "\" selected." << G4endl;
945 } 820 }
946 821
947 CheckSceneAndNotifyHandlers (sceneList [iSce 822 CheckSceneAndNotifyHandlers (sceneList [iScene]);
948 } 823 }
949 824
950 ////////////// /vis/scene/showExtents //////// 825 ////////////// /vis/scene/showExtents ///////////////////////////////////////
951 826
952 G4VisCommandSceneShowExtents::G4VisCommandScen 827 G4VisCommandSceneShowExtents::G4VisCommandSceneShowExtents () {
953 fpCommand = new G4UIcmdWithoutParameter ("/v 828 fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/showExtents", this);
954 fpCommand -> SetGuidance ("Prints and draws 829 fpCommand -> SetGuidance ("Prints and draws extents of models in a scene");
955 } 830 }
956 831
957 G4VisCommandSceneShowExtents::~G4VisCommandSce 832 G4VisCommandSceneShowExtents::~G4VisCommandSceneShowExtents () {
958 delete fpCommand; 833 delete fpCommand;
959 } 834 }
960 835
961 G4String G4VisCommandSceneShowExtents::GetCurr 836 G4String G4VisCommandSceneShowExtents::GetCurrentValue (G4UIcommand*) {
962 return ""; 837 return "";
963 } 838 }
964 839
965 void G4VisCommandSceneShowExtents::SetNewValue 840 void G4VisCommandSceneShowExtents::SetNewValue (G4UIcommand*, G4String) {
966 841
967 G4VisManager::Verbosity verbosity = fpVisMan 842 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
968 843
969 G4VSceneHandler* pCurrentSceneHandler = 844 G4VSceneHandler* pCurrentSceneHandler =
970 fpVisManager -> GetCurrentSceneHandler(); 845 fpVisManager -> GetCurrentSceneHandler();
971 if (!pCurrentSceneHandler) { 846 if (!pCurrentSceneHandler) {
972 if (verbosity >= G4VisManager::warnings) { 847 if (verbosity >= G4VisManager::warnings) {
973 G4warn << "WARNING: No current scene han << 848 G4cout << "WARNING: No current scene handler."
974 << G4endl; 849 << G4endl;
975 } 850 }
976 return; 851 return;
977 } 852 }
978 G4VViewer* pCurrentViewer = fpVisManager -> 853 G4VViewer* pCurrentViewer = fpVisManager -> GetCurrentViewer();
979 if (!pCurrentViewer) { 854 if (!pCurrentViewer) {
980 if (verbosity >= G4VisManager::warnings) { 855 if (verbosity >= G4VisManager::warnings) {
981 G4warn << "WARNING: No current viewer." << 856 G4cout << "WARNING: No current viewer."
982 << G4endl; 857 << G4endl;
983 } 858 }
984 return; 859 return;
985 } 860 }
986 G4Scene* pCurrentScene = fpVisManager -> Get 861 G4Scene* pCurrentScene = fpVisManager -> GetCurrentScene();
987 if (!pCurrentScene) { 862 if (!pCurrentScene) {
988 if (verbosity >= G4VisManager::warnings) { 863 if (verbosity >= G4VisManager::warnings) {
989 G4warn << "WARNING: No current scene." << 864 G4cout << "WARNING: No current scene."
990 << G4endl; 865 << G4endl;
991 } 866 }
992 return; 867 return;
993 } 868 }
994 869
995 G4cout << "\n Run-duration models:"; 870 G4cout << "\n Run-duration models:";
996 std::size_t nRunModels = pCurrentScene -> Ge << 871 G4int nRunModels = pCurrentScene -> GetRunDurationModelList ().size ();
997 if (nRunModels == 0) { 872 if (nRunModels == 0) {
998 G4cout << " none."; 873 G4cout << " none.";
999 } 874 }
1000 for (std::size_t i = 0; i < nRunModels; ++i << 875 for (G4int i = 0; i < nRunModels; i++) {
1001 if (pCurrentScene -> GetRunDurationModelL 876 if (pCurrentScene -> GetRunDurationModelList()[i].fActive)
1002 G4cout << "\n Active: "; 877 G4cout << "\n Active: ";
1003 else G4cout << "\n Inactive: "; 878 else G4cout << "\n Inactive: ";
1004 G4VModel* pModel = pCurrentScene -> GetRu 879 G4VModel* pModel = pCurrentScene -> GetRunDurationModelList()[i].fpModel;
1005 const G4VisExtent& transformedExtent = pM << 880 const G4VisExtent& transformedExtent = pModel -> GetTransformedExtent();
1006 G4cout << pModel -> GetGlobalDescription 881 G4cout << pModel -> GetGlobalDescription ()
1007 << "\n" << transformedExtent; 882 << "\n" << transformedExtent;
1008 DrawExtent(transformedExtent); 883 DrawExtent(transformedExtent);
1009 } 884 }
1010 G4cout << "\n End-of-event models:"; 885 G4cout << "\n End-of-event models:";
1011 std::size_t nEOEModels = pCurrentScene -> G << 886 G4int nEOEModels = pCurrentScene -> GetEndOfEventModelList ().size ();
1012 if (nEOEModels == 0) { 887 if (nEOEModels == 0) {
1013 G4cout << " none."; 888 G4cout << " none.";
1014 } 889 }
1015 for (std::size_t i = 0; i < nEOEModels; ++i << 890 for (G4int i = 0; i < nEOEModels; i++) {
1016 if (pCurrentScene -> GetEndOfEventModelLi 891 if (pCurrentScene -> GetEndOfEventModelList()[i].fActive)
1017 G4cout << "\n Active: "; 892 G4cout << "\n Active: ";
1018 else G4cout << "\n Inactive: "; 893 else G4cout << "\n Inactive: ";
1019 G4VModel* pModel = pCurrentScene -> GetEn 894 G4VModel* pModel = pCurrentScene -> GetEndOfEventModelList()[i].fpModel;
1020 const G4VisExtent& transformedExtent = pM << 895 const G4VisExtent& transformedExtent = pModel -> GetTransformedExtent();
1021 G4cout << pModel -> GetGlobalDescription 896 G4cout << pModel -> GetGlobalDescription ()
1022 << "\n" << transformedExtent; 897 << "\n" << transformedExtent;
1023 DrawExtent(transformedExtent); 898 DrawExtent(transformedExtent);
1024 } 899 }
1025 G4cout << "\n End-of-run models:"; 900 G4cout << "\n End-of-run models:";
1026 std::size_t nEORModels = pCurrentScene -> G << 901 G4int nEORModels = pCurrentScene -> GetEndOfRunModelList ().size ();
1027 if (nEORModels == 0) { 902 if (nEORModels == 0) {
1028 G4cout << " none."; 903 G4cout << " none.";
1029 } 904 }
1030 for (std::size_t i = 0; i < nEORModels; ++i << 905 for (G4int i = 0; i < nEORModels; i++) {
1031 if (pCurrentScene -> GetEndOfRunModelList 906 if (pCurrentScene -> GetEndOfRunModelList()[i].fActive)
1032 G4cout << "\n Active: "; 907 G4cout << "\n Active: ";
1033 else G4cout << "\n Inactive: "; 908 else G4cout << "\n Inactive: ";
1034 G4VModel* pModel = pCurrentScene -> GetEn 909 G4VModel* pModel = pCurrentScene -> GetEndOfRunModelList()[i].fpModel;
1035 const G4VisExtent& transformedExtent = pM << 910 const G4VisExtent& transformedExtent = pModel -> GetTransformedExtent();
1036 G4cout << pModel -> GetGlobalDescription 911 G4cout << pModel -> GetGlobalDescription ()
1037 << "\n" << transformedExtent; 912 << "\n" << transformedExtent;
1038 DrawExtent(transformedExtent); 913 DrawExtent(transformedExtent);
1039 } 914 }
1040 G4cout << "\n Overall extent:\n"; << 915 G4cout << "Overall extent:\n";
1041 DrawExtent(pCurrentScene->GetExtent()); 916 DrawExtent(pCurrentScene->GetExtent());
1042 G4cout << G4endl; 917 G4cout << G4endl;
1043 } 918 }
1044 919