1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
backported from geant-4.9.5 for DumpRegion function footprint chnage
--- source/run/pyG4RunManager.cc 2006-06-30 00:35:12.000000000 +0900
+++ source/run/pyG4RunManager.cc.new 2012-07-14 22:00:38.000000000 +0900
@@ -23,14 +23,15 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
-// $Id: pyG4RunManager.cc,v 1.4 2006/06/29 15:35:12 gunter Exp $
-// $Name: geant4-09-03-patch-02 $
+// $Id: pyG4RunManager.cc,v 1.6 2010-12-02 08:23:05 kmura Exp $
+// $Name: not supported by cvs2svn $
// ====================================================================
// pyG4RunManager.cc
//
// 2005 Q
// ====================================================================
#include <boost/python.hpp>
+#include "G4Version.hh"
#include "G4RunManager.hh"
#include "G4VUserDetectorConstruction.hh"
#include "G4VUserPhysicsList.hh"
@@ -72,13 +73,17 @@ void (G4RunManager::*f6_SetUserAction)(G
= &G4RunManager::SetUserAction;
// DumpRegion
+#if G4VERSION_NUMBER >= 932
+void (G4RunManager::*f1_DumpRegion)(const G4String&) const
+ = &G4RunManager::DumpRegion;
+#else
void (G4RunManager::*f1_DumpRegion)(G4String) const
- = &G4RunManager::DumpRegion;
+ = &G4RunManager::DumpRegion;
+#endif
void (G4RunManager::*f2_DumpRegion)(G4Region*) const
= &G4RunManager::DumpRegion;
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DumpRegion,
- DumpRegion, 0, 1);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DumpRegion, DumpRegion, 0, 1);
// BeamOn()
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_BeamOn, BeamOn, 1, 3);
@@ -87,8 +92,8 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_AbortRun, AbortRun, 0, 1);
// DefineWorldVolume()
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DefineWorldVolume,
- DefineWorldVolume, 1, 2);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DefineWorldVolume,
+ DefineWorldVolume, 1, 2);
};
@@ -102,18 +107,18 @@ void export_G4RunManager()
class_<G4RunManager>("G4RunManager", "run manager class")
// ---
.def("GetRunManager", &G4RunManager::GetRunManager,
- "Get an instance of G4RunManager",
- return_value_policy<reference_existing_object>())
+ "Get an instance of G4RunManager",
+ return_value_policy<reference_existing_object>())
.staticmethod("GetRunManager")
// ---
.def("SetVerboseLevel", &G4RunManager::SetVerboseLevel)
.def("GetVerboseLevel", &G4RunManager::GetVerboseLevel)
// ---
.def("Initialize", &G4RunManager::Initialize)
- .def("BeamOn", &G4RunManager::BeamOn,
- f_BeamOn((arg("n_event"), arg("macroFile")=0,
- arg("n_select")=-1),
- "Starts event loop."))
+ .def("BeamOn", &G4RunManager::BeamOn,
+ f_BeamOn((arg("n_event"), arg("macroFile")=0,
+ arg("n_select")=-1),
+ "Starts event loop."))
// ---
.def("SetUserInitialization", f1_SetUserInitialization)
.def("SetUserInitialization", f2_SetUserInitialization)
@@ -125,50 +130,58 @@ void export_G4RunManager()
.def("SetUserAction", f6_SetUserAction)
// ---
.def("GetUserDetectorConstruction",
- &G4RunManager::GetUserDetectorConstruction,
- return_internal_reference<>())
+ &G4RunManager::GetUserDetectorConstruction,
+ return_internal_reference<>())
.def("GetUserPhysicsList",
- &G4RunManager::GetUserPhysicsList,
- return_internal_reference<>())
+ &G4RunManager::GetUserPhysicsList,
+ return_internal_reference<>())
.def("GetUserPrimaryGeneratorAction",
- &G4RunManager::GetUserPrimaryGeneratorAction,
- return_internal_reference<>())
+ &G4RunManager::GetUserPrimaryGeneratorAction,
+ return_internal_reference<>())
.def("GetUserRunAction", &G4RunManager::GetUserRunAction,
- return_internal_reference<>())
+ return_internal_reference<>())
.def("GetUserEventAction", &G4RunManager::GetUserEventAction,
- return_internal_reference<>())
+ return_internal_reference<>())
.def("GetUserStackingAction", &G4RunManager::GetUserStackingAction,
- return_internal_reference<>())
+ return_internal_reference<>())
.def("GetUserTrackingAction", &G4RunManager::GetUserTrackingAction,
- return_internal_reference<>())
+ return_internal_reference<>())
.def("GetUserSteppingAction", &G4RunManager::GetUserSteppingAction,
- return_internal_reference<>())
+ return_internal_reference<>())
// ---
.def("AbortRun", &G4RunManager::AbortRun,
- f_AbortRun((arg("soft_abort")=false),
- "Abort run (event loop)."))
- .def("AbortEvent", &G4RunManager::AbortEvent)
- .def("GetVersionString", &G4RunManager::GetVersionString)
+ f_AbortRun((arg("soft_abort")=false),
+ "Abort run (event loop)."))
+ .def("AbortEvent", &G4RunManager::AbortEvent)
.def("DefineWorldVolume", &G4RunManager::DefineWorldVolume,
- f_DefineWorldVolume())
+ f_DefineWorldVolume())
.def("DumpRegion", f1_DumpRegion)
.def("DumpRegion", f2_DumpRegion, f_DumpRegion())
.def("rndmSaveThisRun", &G4RunManager::rndmSaveThisRun)
.def("rndmSaveThisEvent", &G4RunManager::rndmSaveThisEvent)
.def("RestoreRandomNumberStatus",
- &G4RunManager::RestoreRandomNumberStatus)
+ &G4RunManager::RestoreRandomNumberStatus)
.def("SetRandomNumberStore", &G4RunManager::SetRandomNumberStore)
.def("GetRandomNumberStore", &G4RunManager::GetRandomNumberStore)
.def("SetRandomNumberStoreDir", &G4RunManager::SetRandomNumberStoreDir)
- .def("GetRandomNumberStoreDir", &G4RunManager::GetRandomNumberStoreDir)
.def("GeometryHasBeenModified", &G4RunManager::GeometryHasBeenModified)
.def("PhysicsHasBeenModified", &G4RunManager::PhysicsHasBeenModified)
.def("GetGeometryToBeOptimized",&G4RunManager::GetGeometryToBeOptimized)
.def("GetCurrentRun", &G4RunManager::GetCurrentRun,
- return_value_policy<reference_existing_object>())
+ return_value_policy<reference_existing_object>())
.def("GetCurrentEvent", &G4RunManager::GetCurrentEvent,
- return_value_policy<reference_existing_object>())
+ return_value_policy<reference_existing_object>())
.def("SetRunIDCounter", &G4RunManager::SetRunIDCounter)
+
+#if G4VERSION_NUMBER >= 932
+ .def("GetVersionString", &G4RunManager::GetVersionString,
+ return_value_policy<reference_existing_object>())
+ .def("GetRandomNumberStoreDir", &G4RunManager::GetRandomNumberStoreDir,
+ return_internal_reference<>())
+#else
+ .def("GetVersionString", &G4RunManager::GetVersionString)
+ .def("GetRandomNumberStoreDir", &G4RunManager::GetRandomNumberStoreDir)
+#endif
;
// reduced functionality...
|
GitWeb