xcoll 0.5.12__py3-none-any.whl → 0.6.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of xcoll might be problematic. Click here for more details.

Files changed (336) hide show
  1. xcoll/__init__.py +5 -18
  2. xcoll/__init__.py.orig +26 -0
  3. xcoll/beam_elements/__init__.py +1 -0
  4. xcoll/beam_elements/absorber.py +12 -2
  5. xcoll/beam_elements/base.py +162 -62
  6. xcoll/beam_elements/blowup.py +1 -0
  7. xcoll/beam_elements/elements_src/black_absorber.h +57 -58
  8. xcoll/beam_elements/elements_src/black_crystal.h +49 -50
  9. xcoll/beam_elements/elements_src/everest_block.h +21 -11
  10. xcoll/beam_elements/elements_src/everest_collimator.h +100 -91
  11. xcoll/beam_elements/elements_src/everest_crystal.h +145 -140
  12. xcoll/beam_elements/elements_src/transparent_collimator.h +126 -0
  13. xcoll/beam_elements/elements_src/transparent_crystal.h +118 -0
  14. xcoll/beam_elements/everest.py +16 -5
  15. xcoll/beam_elements/monitor.py +1 -0
  16. xcoll/beam_elements/transparent.py +83 -0
  17. xcoll/colldb.py +15 -6
  18. xcoll/general.py +1 -1
  19. xcoll/general.py.orig +20 -0
  20. xcoll/headers/particle_states.py +51 -0
  21. xcoll/initial_distribution.py +121 -91
  22. xcoll/initial_distribution.py.orig +256 -0
  23. xcoll/interaction_record/interaction_record.py +2 -1
  24. xcoll/interaction_record/interaction_types.py +2 -2
  25. xcoll/line_tools.py +163 -73
  26. xcoll/lossmap.py +519 -127
  27. xcoll/plot.py +109 -0
  28. xcoll/rf_sweep.py +6 -0
  29. xcoll/scattering_routines/engine.py +414 -217
  30. xcoll/scattering_routines/environment.py +297 -0
  31. xcoll/scattering_routines/everest/amorphous.h +95 -71
  32. xcoll/scattering_routines/everest/{channeling.h → channelling.h} +121 -112
  33. xcoll/scattering_routines/everest/constants.h +1 -1
  34. xcoll/scattering_routines/everest/crystal_parameters.h +9 -9
  35. xcoll/scattering_routines/everest/everest.h +8 -3
  36. xcoll/scattering_routines/everest/everest.py +2 -1
  37. xcoll/scattering_routines/everest/ionisation_loss.h +141 -0
  38. xcoll/scattering_routines/everest/jaw.h +19 -24
  39. xcoll/scattering_routines/everest/materials.py +2 -0
  40. xcoll/scattering_routines/everest/multiple_coulomb_scattering.h +2 -2
  41. xcoll/scattering_routines/everest/nuclear_interaction.h +35 -19
  42. xcoll/scattering_routines/everest/properties.h +3 -72
  43. xcoll/xaux.py +65 -109
  44. {xcoll-0.5.12.dist-info → xcoll-0.6.1.dist-info}/METADATA +5 -5
  45. xcoll-0.6.1.dist-info/RECORD +138 -0
  46. xcoll/_manager.py +0 -22
  47. xcoll/headers/particle_states.h +0 -25
  48. xcoll/install.py +0 -35
  49. xcoll/scattering_routines/geant4/collimasim/.git +0 -1
  50. xcoll/scattering_routines/geant4/collimasim/.gitignore +0 -12
  51. xcoll/scattering_routines/geant4/collimasim/.gitmodules +0 -3
  52. xcoll/scattering_routines/geant4/collimasim/CMakeLists.txt +0 -26
  53. xcoll/scattering_routines/geant4/collimasim/README.md +0 -21
  54. xcoll/scattering_routines/geant4/collimasim/docs/Makefile +0 -20
  55. xcoll/scattering_routines/geant4/collimasim/docs/make.bat +0 -35
  56. xcoll/scattering_routines/geant4/collimasim/docs/source/collimasim.rst +0 -10
  57. xcoll/scattering_routines/geant4/collimasim/docs/source/conf.py +0 -59
  58. xcoll/scattering_routines/geant4/collimasim/docs/source/index.rst +0 -26
  59. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.appveyor.yml +0 -37
  60. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.clang-format +0 -19
  61. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.clang-tidy +0 -65
  62. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.cmake-format.yaml +0 -73
  63. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.git +0 -1
  64. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/CODEOWNERS +0 -9
  65. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/CONTRIBUTING.md +0 -386
  66. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/ISSUE_TEMPLATE/bug-report.yml +0 -45
  67. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/ISSUE_TEMPLATE/config.yml +0 -8
  68. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/dependabot.yml +0 -16
  69. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/labeler.yml +0 -8
  70. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/labeler_merged.yml +0 -3
  71. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/pull_request_template.md +0 -19
  72. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/workflows/ci.yml +0 -969
  73. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/workflows/configure.yml +0 -84
  74. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/workflows/format.yml +0 -48
  75. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/workflows/labeler.yml +0 -16
  76. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.github/workflows/pip.yml +0 -103
  77. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.gitignore +0 -45
  78. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.pre-commit-config.yaml +0 -151
  79. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/.readthedocs.yml +0 -3
  80. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/CMakeLists.txt +0 -297
  81. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/LICENSE +0 -29
  82. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/MANIFEST.in +0 -6
  83. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/README.rst +0 -180
  84. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/Doxyfile +0 -23
  85. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/Makefile +0 -192
  86. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/_static/theme_overrides.css +0 -11
  87. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/chrono.rst +0 -81
  88. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/custom.rst +0 -93
  89. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/eigen.rst +0 -310
  90. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/functional.rst +0 -109
  91. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/index.rst +0 -43
  92. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/overview.rst +0 -171
  93. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/stl.rst +0 -251
  94. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/cast/strings.rst +0 -305
  95. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/classes.rst +0 -1297
  96. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/embedding.rst +0 -262
  97. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/exceptions.rst +0 -396
  98. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/functions.rst +0 -568
  99. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/misc.rst +0 -337
  100. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/pycpp/index.rst +0 -13
  101. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/pycpp/numpy.rst +0 -463
  102. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/pycpp/object.rst +0 -286
  103. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/pycpp/utilities.rst +0 -155
  104. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/advanced/smart_ptrs.rst +0 -174
  105. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/basics.rst +0 -308
  106. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/benchmark.py +0 -91
  107. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/benchmark.rst +0 -95
  108. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/changelog.rst +0 -2050
  109. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/classes.rst +0 -542
  110. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/cmake/index.rst +0 -8
  111. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/compiling.rst +0 -648
  112. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/conf.py +0 -381
  113. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/faq.rst +0 -343
  114. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/index.rst +0 -48
  115. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/installing.rst +0 -105
  116. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/limitations.rst +0 -72
  117. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/pybind11-logo.png +0 -0
  118. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/pybind11_vs_boost_python1.png +0 -0
  119. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/pybind11_vs_boost_python1.svg +0 -427
  120. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/pybind11_vs_boost_python2.png +0 -0
  121. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/pybind11_vs_boost_python2.svg +0 -427
  122. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/reference.rst +0 -130
  123. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/release.rst +0 -96
  124. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/requirements.txt +0 -8
  125. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/docs/upgrade.rst +0 -548
  126. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/attr.h +0 -605
  127. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/buffer_info.h +0 -144
  128. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/cast.h +0 -1432
  129. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/chrono.h +0 -213
  130. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/common.h +0 -2
  131. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/complex.h +0 -65
  132. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/class.h +0 -709
  133. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/common.h +0 -1021
  134. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/descr.h +0 -104
  135. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/init.h +0 -346
  136. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/internals.h +0 -467
  137. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/type_caster_base.h +0 -978
  138. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/detail/typeid.h +0 -55
  139. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/eigen.h +0 -606
  140. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/embed.h +0 -284
  141. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/eval.h +0 -163
  142. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/functional.h +0 -121
  143. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/gil.h +0 -193
  144. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/iostream.h +0 -275
  145. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/numpy.h +0 -1741
  146. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/operators.h +0 -163
  147. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/options.h +0 -65
  148. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/pybind11.h +0 -2497
  149. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/pytypes.h +0 -1879
  150. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/stl/filesystem.h +0 -103
  151. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/stl.h +0 -375
  152. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/include/pybind11/stl_bind.h +0 -747
  153. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/noxfile.py +0 -88
  154. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/__init__.py +0 -11
  155. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/__main__.py +0 -52
  156. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/_version.py +0 -12
  157. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/_version.pyi +0 -6
  158. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/commands.py +0 -21
  159. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/py.typed +0 -0
  160. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/setup_helpers.py +0 -482
  161. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pybind11/setup_helpers.pyi +0 -63
  162. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/pyproject.toml +0 -41
  163. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/setup.cfg +0 -56
  164. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/setup.py +0 -155
  165. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/CMakeLists.txt +0 -503
  166. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/conftest.py +0 -208
  167. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/constructor_stats.h +0 -275
  168. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/cross_module_gil_utils.cpp +0 -73
  169. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/env.py +0 -33
  170. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/extra_python_package/pytest.ini +0 -0
  171. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/extra_python_package/test_files.py +0 -279
  172. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/extra_setuptools/pytest.ini +0 -0
  173. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/extra_setuptools/test_setuphelper.py +0 -143
  174. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/local_bindings.h +0 -85
  175. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/object.h +0 -179
  176. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/pybind11_cross_module_tests.cpp +0 -151
  177. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/pybind11_tests.cpp +0 -91
  178. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/pybind11_tests.h +0 -85
  179. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/pytest.ini +0 -19
  180. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/requirements.txt +0 -12
  181. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_async.cpp +0 -26
  182. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_async.py +0 -25
  183. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_buffers.cpp +0 -216
  184. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_buffers.py +0 -163
  185. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_builtin_casters.cpp +0 -286
  186. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_builtin_casters.py +0 -536
  187. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_call_policies.cpp +0 -107
  188. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_call_policies.py +0 -248
  189. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_callbacks.cpp +0 -227
  190. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_callbacks.py +0 -202
  191. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_chrono.cpp +0 -84
  192. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_chrono.py +0 -210
  193. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_class.cpp +0 -550
  194. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_class.py +0 -473
  195. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/CMakeLists.txt +0 -84
  196. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/embed.cpp +0 -21
  197. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt +0 -28
  198. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt +0 -39
  199. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt +0 -46
  200. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/main.cpp +0 -6
  201. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt +0 -41
  202. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt +0 -35
  203. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt +0 -41
  204. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_cmake_build/test.py +0 -10
  205. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_constants_and_functions.cpp +0 -165
  206. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_constants_and_functions.py +0 -53
  207. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_copy_move.cpp +0 -238
  208. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_copy_move.py +0 -126
  209. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_custom_type_casters.cpp +0 -141
  210. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_custom_type_casters.py +0 -117
  211. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_custom_type_setup.cpp +0 -41
  212. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_custom_type_setup.py +0 -50
  213. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_docstring_options.cpp +0 -69
  214. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_docstring_options.py +0 -42
  215. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_eigen.cpp +0 -348
  216. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_eigen.py +0 -771
  217. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_embed/CMakeLists.txt +0 -47
  218. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_embed/catch.cpp +0 -22
  219. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_embed/external_module.cpp +0 -23
  220. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_embed/test_interpreter.cpp +0 -326
  221. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_embed/test_interpreter.py +0 -15
  222. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_enum.cpp +0 -148
  223. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_enum.py +0 -272
  224. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_eval.cpp +0 -119
  225. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_eval.py +0 -51
  226. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_eval_call.py +0 -5
  227. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_exceptions.cpp +0 -285
  228. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_exceptions.h +0 -12
  229. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_exceptions.py +0 -265
  230. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_factory_constructors.cpp +0 -397
  231. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_factory_constructors.py +0 -520
  232. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_gil_scoped.cpp +0 -49
  233. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_gil_scoped.py +0 -94
  234. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_iostream.cpp +0 -125
  235. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_iostream.py +0 -331
  236. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_kwargs_and_defaults.cpp +0 -153
  237. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_kwargs_and_defaults.py +0 -284
  238. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_local_bindings.cpp +0 -107
  239. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_local_bindings.py +0 -257
  240. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_methods_and_attributes.cpp +0 -412
  241. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_methods_and_attributes.py +0 -517
  242. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_modules.cpp +0 -102
  243. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_modules.py +0 -92
  244. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_multiple_inheritance.cpp +0 -233
  245. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_multiple_inheritance.py +0 -360
  246. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_numpy_array.cpp +0 -472
  247. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_numpy_array.py +0 -593
  248. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_numpy_dtypes.cpp +0 -524
  249. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_numpy_dtypes.py +0 -441
  250. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_numpy_vectorize.cpp +0 -103
  251. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_numpy_vectorize.py +0 -267
  252. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_opaque_types.cpp +0 -73
  253. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_opaque_types.py +0 -59
  254. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_operator_overloading.cpp +0 -235
  255. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_operator_overloading.py +0 -146
  256. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_pickling.cpp +0 -189
  257. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_pickling.py +0 -82
  258. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_pytypes.cpp +0 -560
  259. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_pytypes.py +0 -651
  260. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_sequences_and_iterators.cpp +0 -500
  261. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_sequences_and_iterators.py +0 -253
  262. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_smart_ptr.cpp +0 -452
  263. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_smart_ptr.py +0 -318
  264. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_stl.cpp +0 -342
  265. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_stl.py +0 -291
  266. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_stl_binders.cpp +0 -131
  267. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_stl_binders.py +0 -318
  268. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_tagbased_polymorphic.cpp +0 -144
  269. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_tagbased_polymorphic.py +0 -29
  270. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_thread.cpp +0 -66
  271. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_thread.py +0 -44
  272. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_union.cpp +0 -22
  273. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_union.py +0 -9
  274. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_virtual_functions.cpp +0 -510
  275. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/test_virtual_functions.py +0 -408
  276. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/valgrind-numpy-scipy.supp +0 -140
  277. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tests/valgrind-python.supp +0 -117
  278. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/FindCatch.cmake +0 -70
  279. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/FindEigen3.cmake +0 -86
  280. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/FindPythonLibsNew.cmake +0 -257
  281. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/check-style.sh +0 -44
  282. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/cmake_uninstall.cmake.in +0 -23
  283. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/libsize.py +0 -39
  284. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/make_changelog.py +0 -64
  285. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/pybind11Common.cmake +0 -402
  286. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/pybind11Config.cmake.in +0 -233
  287. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/pybind11NewTools.cmake +0 -276
  288. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/pybind11Tools.cmake +0 -214
  289. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/pyproject.toml +0 -3
  290. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/setup_global.py.in +0 -65
  291. xcoll/scattering_routines/geant4/collimasim/lib/pybind11/tools/setup_main.py.in +0 -41
  292. xcoll/scattering_routines/geant4/collimasim/pyproject.toml +0 -8
  293. xcoll/scattering_routines/geant4/collimasim/setup.py +0 -144
  294. xcoll/scattering_routines/geant4/collimasim/src/collimasim/BDSPyATInterface.cpp +0 -403
  295. xcoll/scattering_routines/geant4/collimasim/src/collimasim/BDSPyATInterface.hh +0 -100
  296. xcoll/scattering_routines/geant4/collimasim/src/collimasim/BDSXtrackInterface.cpp +0 -763
  297. xcoll/scattering_routines/geant4/collimasim/src/collimasim/BDSXtrackInterface.hh +0 -118
  298. xcoll/scattering_routines/geant4/collimasim/src/collimasim/__init__.py +0 -8
  299. xcoll/scattering_routines/geant4/collimasim/src/collimasim/bindings.cpp +0 -63
  300. xcoll/scattering_routines/geant4/collimasim/src/collimasim/pyCollimatorPass.py +0 -142
  301. xcoll/scattering_routines/geant4/collimasim/src/collimasim/xtrack_collimator.py +0 -556
  302. xcoll/scattering_routines/geant4/collimasim/src/collimasim.egg-info/PKG-INFO +0 -6
  303. xcoll/scattering_routines/geant4/collimasim/src/collimasim.egg-info/SOURCES.txt +0 -24
  304. xcoll/scattering_routines/geant4/collimasim/src/collimasim.egg-info/dependency_links.txt +0 -1
  305. xcoll/scattering_routines/geant4/collimasim/src/collimasim.egg-info/not-zip-safe +0 -1
  306. xcoll/scattering_routines/geant4/collimasim/src/collimasim.egg-info/top_level.txt +0 -1
  307. xcoll/scattering_routines/geant4/collimasim/tests/README.md +0 -25
  308. xcoll/scattering_routines/geant4/collimasim/tests/resources/CollDB_forions.dat +0 -25
  309. xcoll/scattering_routines/geant4/collimasim/tests/resources/CollDB_new_example.dat +0 -18
  310. xcoll/scattering_routines/geant4/collimasim/tests/resources/CollDB_old_example.dat +0 -68
  311. xcoll/scattering_routines/geant4/collimasim/tests/resources/CollDB_testing.dat +0 -15
  312. xcoll/scattering_routines/geant4/collimasim/tests/resources/CollDB_yaml_example.yaml +0 -110
  313. xcoll/scattering_routines/geant4/collimasim/tests/resources/collgaps.dat +0 -7
  314. xcoll/scattering_routines/geant4/collimasim/tests/resources/collgaps_pyat_test.dat +0 -3
  315. xcoll/scattering_routines/geant4/collimasim/tests/resources/collonly_twiss_file_example.tfs +0 -54
  316. xcoll/scattering_routines/geant4/collimasim/tests/resources/settings.gmad +0 -3
  317. xcoll/scattering_routines/geant4/collimasim/tests/resources/settings_black_absorber.gmad +0 -3
  318. xcoll/scattering_routines/geant4/collimasim/tests/resources/settings_ions.gmad +0 -5
  319. xcoll/scattering_routines/geant4/collimasim/tests/resources/twiss_file_testing.tfs +0 -51
  320. xcoll/scattering_routines/geant4/collimasim/tests/test_pyat.py +0 -65
  321. xcoll/scattering_routines/geant4/collimasim/tests/test_pyat_passmethod.py +0 -59
  322. xcoll/scattering_routines/geant4/collimasim/tests/test_pyat_tracking.py +0 -102
  323. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack.py +0 -75
  324. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_angle.py +0 -74
  325. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_colldb_load.py +0 -84
  326. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_interaction.py +0 -159
  327. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_interaction_ion.py +0 -99
  328. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_ions.py +0 -78
  329. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_lost_energy.py +0 -88
  330. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_tilt.py +0 -80
  331. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_tracking.py +0 -97
  332. xcoll/scattering_routines/geant4/collimasim/tests/test_xtrack_tracking_ions.py +0 -96
  333. xcoll-0.5.12.dist-info/RECORD +0 -415
  334. {xcoll-0.5.12.dist-info → xcoll-0.6.1.dist-info}/LICENSE +0 -0
  335. {xcoll-0.5.12.dist-info → xcoll-0.6.1.dist-info}/NOTICE +0 -0
  336. {xcoll-0.5.12.dist-info → xcoll-0.6.1.dist-info}/WHEEL +0 -0
@@ -1,92 +0,0 @@
1
- # -*- coding: utf-8 -*-
2
- from pybind11_tests import ConstructorStats
3
- from pybind11_tests import modules as m
4
- from pybind11_tests.modules import subsubmodule as ms
5
-
6
-
7
- def test_nested_modules():
8
- import pybind11_tests
9
-
10
- assert pybind11_tests.__name__ == "pybind11_tests"
11
- assert pybind11_tests.modules.__name__ == "pybind11_tests.modules"
12
- assert (
13
- pybind11_tests.modules.subsubmodule.__name__
14
- == "pybind11_tests.modules.subsubmodule"
15
- )
16
- assert m.__name__ == "pybind11_tests.modules"
17
- assert ms.__name__ == "pybind11_tests.modules.subsubmodule"
18
-
19
- assert ms.submodule_func() == "submodule_func()"
20
-
21
-
22
- def test_reference_internal():
23
- b = ms.B()
24
- assert str(b.get_a1()) == "A[1]"
25
- assert str(b.a1) == "A[1]"
26
- assert str(b.get_a2()) == "A[2]"
27
- assert str(b.a2) == "A[2]"
28
-
29
- b.a1 = ms.A(42)
30
- b.a2 = ms.A(43)
31
- assert str(b.get_a1()) == "A[42]"
32
- assert str(b.a1) == "A[42]"
33
- assert str(b.get_a2()) == "A[43]"
34
- assert str(b.a2) == "A[43]"
35
-
36
- astats, bstats = ConstructorStats.get(ms.A), ConstructorStats.get(ms.B)
37
- assert astats.alive() == 2
38
- assert bstats.alive() == 1
39
- del b
40
- assert astats.alive() == 0
41
- assert bstats.alive() == 0
42
- assert astats.values() == ["1", "2", "42", "43"]
43
- assert bstats.values() == []
44
- assert astats.default_constructions == 0
45
- assert bstats.default_constructions == 1
46
- assert astats.copy_constructions == 0
47
- assert bstats.copy_constructions == 0
48
- # assert astats.move_constructions >= 0 # Don't invoke any
49
- # assert bstats.move_constructions >= 0 # Don't invoke any
50
- assert astats.copy_assignments == 2
51
- assert bstats.copy_assignments == 0
52
- assert astats.move_assignments == 0
53
- assert bstats.move_assignments == 0
54
-
55
-
56
- def test_importing():
57
- from collections import OrderedDict
58
-
59
- from pybind11_tests.modules import OD
60
-
61
- assert OD is OrderedDict
62
- assert str(OD([(1, "a"), (2, "b")])) == "OrderedDict([(1, 'a'), (2, 'b')])"
63
-
64
-
65
- def test_pydoc():
66
- """Pydoc needs to be able to provide help() for everything inside a pybind11 module"""
67
- import pydoc
68
-
69
- import pybind11_tests
70
-
71
- assert pybind11_tests.__name__ == "pybind11_tests"
72
- assert pybind11_tests.__doc__ == "pybind11 test module"
73
- assert pydoc.text.docmodule(pybind11_tests)
74
-
75
-
76
- def test_duplicate_registration():
77
- """Registering two things with the same name"""
78
-
79
- assert m.duplicate_registration() == []
80
-
81
-
82
- def test_builtin_key_type():
83
- """Test that all the keys in the builtin modules have type str.
84
-
85
- Previous versions of pybind11 would add a unicode key in python 2.
86
- """
87
- if hasattr(__builtins__, "keys"):
88
- keys = __builtins__.keys()
89
- else: # this is to make pypy happy since builtins is different there.
90
- keys = __builtins__.__dict__.keys()
91
-
92
- assert {type(k) for k in keys} == {str}
@@ -1,233 +0,0 @@
1
- /*
2
- tests/test_multiple_inheritance.cpp -- multiple inheritance,
3
- implicit MI casts
4
-
5
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
6
-
7
- All rights reserved. Use of this source code is governed by a
8
- BSD-style license that can be found in the LICENSE file.
9
- */
10
-
11
- #include "pybind11_tests.h"
12
- #include "constructor_stats.h"
13
-
14
- namespace {
15
-
16
- // Many bases for testing that multiple inheritance from many classes (i.e. requiring extra
17
- // space for holder constructed flags) works.
18
- template <int N> struct BaseN {
19
- explicit BaseN(int i) : i(i) {}
20
- int i;
21
- };
22
-
23
- // test_mi_static_properties
24
- struct Vanilla {
25
- std::string vanilla() { return "Vanilla"; };
26
- };
27
- struct WithStatic1 {
28
- static std::string static_func1() { return "WithStatic1"; };
29
- static int static_value1;
30
- };
31
- struct WithStatic2 {
32
- static std::string static_func2() { return "WithStatic2"; };
33
- static int static_value2;
34
- };
35
- struct VanillaStaticMix1 : Vanilla, WithStatic1, WithStatic2 {
36
- static std::string static_func() { return "VanillaStaticMix1"; }
37
- static int static_value;
38
- };
39
- struct VanillaStaticMix2 : WithStatic1, Vanilla, WithStatic2 {
40
- static std::string static_func() { return "VanillaStaticMix2"; }
41
- static int static_value;
42
- };
43
- int WithStatic1::static_value1 = 1;
44
- int WithStatic2::static_value2 = 2;
45
- int VanillaStaticMix1::static_value = 12;
46
- int VanillaStaticMix2::static_value = 12;
47
-
48
- // test_multiple_inheritance_virtbase
49
- struct Base1a {
50
- explicit Base1a(int i) : i(i) {}
51
- int foo() const { return i; }
52
- int i;
53
- };
54
- struct Base2a {
55
- explicit Base2a(int i) : i(i) {}
56
- int bar() const { return i; }
57
- int i;
58
- };
59
- struct Base12a : Base1a, Base2a {
60
- Base12a(int i, int j) : Base1a(i), Base2a(j) { }
61
- };
62
-
63
- // test_mi_unaligned_base
64
- // test_mi_base_return
65
- struct I801B1 { int a = 1; I801B1() = default; I801B1(const I801B1 &) = default; virtual ~I801B1() = default; };
66
- struct I801B2 { int b = 2; I801B2() = default; I801B2(const I801B2 &) = default; virtual ~I801B2() = default; };
67
- struct I801C : I801B1, I801B2 {};
68
- struct I801D : I801C {}; // Indirect MI
69
-
70
- } // namespace
71
-
72
- TEST_SUBMODULE(multiple_inheritance, m) {
73
- // Please do not interleave `struct` and `class` definitions with bindings code,
74
- // but implement `struct`s and `class`es in the anonymous namespace above.
75
- // This helps keeping the smart_holder branch in sync with master.
76
-
77
- // test_multiple_inheritance_mix1
78
- // test_multiple_inheritance_mix2
79
- struct Base1 {
80
- explicit Base1(int i) : i(i) {}
81
- int foo() const { return i; }
82
- int i;
83
- };
84
- py::class_<Base1> b1(m, "Base1");
85
- b1.def(py::init<int>())
86
- .def("foo", &Base1::foo);
87
-
88
- struct Base2 {
89
- explicit Base2(int i) : i(i) {}
90
- int bar() const { return i; }
91
- int i;
92
- };
93
- py::class_<Base2> b2(m, "Base2");
94
- b2.def(py::init<int>())
95
- .def("bar", &Base2::bar);
96
-
97
-
98
- // test_multiple_inheritance_cpp
99
- struct Base12 : Base1, Base2 {
100
- Base12(int i, int j) : Base1(i), Base2(j) { }
101
- };
102
- struct MIType : Base12 {
103
- MIType(int i, int j) : Base12(i, j) { }
104
- };
105
- py::class_<Base12, Base1, Base2>(m, "Base12");
106
- py::class_<MIType, Base12>(m, "MIType")
107
- .def(py::init<int, int>());
108
-
109
-
110
- // test_multiple_inheritance_python_many_bases
111
- #define PYBIND11_BASEN(N) \
112
- py::class_<BaseN<(N)>>(m, "BaseN" #N).def(py::init<int>()).def("f" #N, [](BaseN<N> &b) { \
113
- return b.i + (N); \
114
- })
115
- PYBIND11_BASEN( 1); PYBIND11_BASEN( 2); PYBIND11_BASEN( 3); PYBIND11_BASEN( 4);
116
- PYBIND11_BASEN( 5); PYBIND11_BASEN( 6); PYBIND11_BASEN( 7); PYBIND11_BASEN( 8);
117
- PYBIND11_BASEN( 9); PYBIND11_BASEN(10); PYBIND11_BASEN(11); PYBIND11_BASEN(12);
118
- PYBIND11_BASEN(13); PYBIND11_BASEN(14); PYBIND11_BASEN(15); PYBIND11_BASEN(16);
119
- PYBIND11_BASEN(17);
120
-
121
- // Uncommenting this should result in a compile time failure (MI can only be specified via
122
- // template parameters because pybind has to know the types involved; see discussion in #742 for
123
- // details).
124
- // struct Base12v2 : Base1, Base2 {
125
- // Base12v2(int i, int j) : Base1(i), Base2(j) { }
126
- // };
127
- // py::class_<Base12v2>(m, "Base12v2", b1, b2)
128
- // .def(py::init<int, int>());
129
-
130
-
131
- // test_multiple_inheritance_virtbase
132
- // Test the case where not all base classes are specified, and where pybind11 requires the
133
- // py::multiple_inheritance flag to perform proper casting between types.
134
- py::class_<Base1a, std::shared_ptr<Base1a>>(m, "Base1a")
135
- .def(py::init<int>())
136
- .def("foo", &Base1a::foo);
137
-
138
- py::class_<Base2a, std::shared_ptr<Base2a>>(m, "Base2a")
139
- .def(py::init<int>())
140
- .def("bar", &Base2a::bar);
141
-
142
- py::class_<Base12a, /* Base1 missing */ Base2a,
143
- std::shared_ptr<Base12a>>(m, "Base12a", py::multiple_inheritance())
144
- .def(py::init<int, int>());
145
-
146
- m.def("bar_base2a", [](Base2a *b) { return b->bar(); });
147
- m.def("bar_base2a_sharedptr", [](const std::shared_ptr<Base2a> &b) { return b->bar(); });
148
-
149
- // test_mi_unaligned_base
150
- // test_mi_base_return
151
- // Issue #801: invalid casting to derived type with MI bases
152
- // Unregistered classes:
153
- struct I801B3 { int c = 3; virtual ~I801B3() = default; };
154
- struct I801E : I801B3, I801D {};
155
-
156
- py::class_<I801B1, std::shared_ptr<I801B1>>(m, "I801B1").def(py::init<>()).def_readonly("a", &I801B1::a);
157
- py::class_<I801B2, std::shared_ptr<I801B2>>(m, "I801B2").def(py::init<>()).def_readonly("b", &I801B2::b);
158
- py::class_<I801C, I801B1, I801B2, std::shared_ptr<I801C>>(m, "I801C").def(py::init<>());
159
- py::class_<I801D, I801C, std::shared_ptr<I801D>>(m, "I801D").def(py::init<>());
160
-
161
- // Two separate issues here: first, we want to recognize a pointer to a base type as being a
162
- // known instance even when the pointer value is unequal (i.e. due to a non-first
163
- // multiple-inheritance base class):
164
- m.def("i801b1_c", [](I801C *c) { return static_cast<I801B1 *>(c); });
165
- m.def("i801b2_c", [](I801C *c) { return static_cast<I801B2 *>(c); });
166
- m.def("i801b1_d", [](I801D *d) { return static_cast<I801B1 *>(d); });
167
- m.def("i801b2_d", [](I801D *d) { return static_cast<I801B2 *>(d); });
168
-
169
- // Second, when returned a base class pointer to a derived instance, we cannot assume that the
170
- // pointer is `reinterpret_cast`able to the derived pointer because, like above, the base class
171
- // pointer could be offset.
172
- m.def("i801c_b1", []() -> I801B1 * { return new I801C(); });
173
- m.def("i801c_b2", []() -> I801B2 * { return new I801C(); });
174
- m.def("i801d_b1", []() -> I801B1 * { return new I801D(); });
175
- m.def("i801d_b2", []() -> I801B2 * { return new I801D(); });
176
-
177
- // Return a base class pointer to a pybind-registered type when the actual derived type
178
- // isn't pybind-registered (and uses multiple-inheritance to offset the pybind base)
179
- m.def("i801e_c", []() -> I801C * { return new I801E(); });
180
- m.def("i801e_b2", []() -> I801B2 * { return new I801E(); });
181
-
182
-
183
- // test_mi_static_properties
184
- py::class_<Vanilla>(m, "Vanilla")
185
- .def(py::init<>())
186
- .def("vanilla", &Vanilla::vanilla);
187
-
188
- py::class_<WithStatic1>(m, "WithStatic1")
189
- .def(py::init<>())
190
- .def_static("static_func1", &WithStatic1::static_func1)
191
- .def_readwrite_static("static_value1", &WithStatic1::static_value1);
192
-
193
- py::class_<WithStatic2>(m, "WithStatic2")
194
- .def(py::init<>())
195
- .def_static("static_func2", &WithStatic2::static_func2)
196
- .def_readwrite_static("static_value2", &WithStatic2::static_value2);
197
-
198
- py::class_<VanillaStaticMix1, Vanilla, WithStatic1, WithStatic2>(
199
- m, "VanillaStaticMix1")
200
- .def(py::init<>())
201
- .def_static("static_func", &VanillaStaticMix1::static_func)
202
- .def_readwrite_static("static_value", &VanillaStaticMix1::static_value);
203
-
204
- py::class_<VanillaStaticMix2, WithStatic1, Vanilla, WithStatic2>(
205
- m, "VanillaStaticMix2")
206
- .def(py::init<>())
207
- .def_static("static_func", &VanillaStaticMix2::static_func)
208
- .def_readwrite_static("static_value", &VanillaStaticMix2::static_value);
209
-
210
-
211
- struct WithDict { };
212
- struct VanillaDictMix1 : Vanilla, WithDict { };
213
- struct VanillaDictMix2 : WithDict, Vanilla { };
214
- py::class_<WithDict>(m, "WithDict", py::dynamic_attr()).def(py::init<>());
215
- py::class_<VanillaDictMix1, Vanilla, WithDict>(m, "VanillaDictMix1").def(py::init<>());
216
- py::class_<VanillaDictMix2, WithDict, Vanilla>(m, "VanillaDictMix2").def(py::init<>());
217
-
218
- // test_diamond_inheritance
219
- // Issue #959: segfault when constructing diamond inheritance instance
220
- // All of these have int members so that there will be various unequal pointers involved.
221
- struct B { int b; B() = default; B(const B&) = default; virtual ~B() = default; };
222
- struct C0 : public virtual B { int c0; };
223
- struct C1 : public virtual B { int c1; };
224
- struct D : public C0, public C1 { int d; };
225
- py::class_<B>(m, "B")
226
- .def("b", [](B *self) { return self; });
227
- py::class_<C0, B>(m, "C0")
228
- .def("c0", [](C0 *self) { return self; });
229
- py::class_<C1, B>(m, "C1")
230
- .def("c1", [](C1 *self) { return self; });
231
- py::class_<D, C0, C1>(m, "D")
232
- .def(py::init<>());
233
- }
@@ -1,360 +0,0 @@
1
- # -*- coding: utf-8 -*-
2
- import pytest
3
-
4
- import env # noqa: F401
5
- from pybind11_tests import ConstructorStats
6
- from pybind11_tests import multiple_inheritance as m
7
-
8
-
9
- def test_multiple_inheritance_cpp():
10
- mt = m.MIType(3, 4)
11
-
12
- assert mt.foo() == 3
13
- assert mt.bar() == 4
14
-
15
-
16
- @pytest.mark.skipif("env.PYPY and env.PY2")
17
- @pytest.mark.xfail("env.PYPY and not env.PY2")
18
- def test_multiple_inheritance_mix1():
19
- class Base1:
20
- def __init__(self, i):
21
- self.i = i
22
-
23
- def foo(self):
24
- return self.i
25
-
26
- class MITypePy(Base1, m.Base2):
27
- def __init__(self, i, j):
28
- Base1.__init__(self, i)
29
- m.Base2.__init__(self, j)
30
-
31
- mt = MITypePy(3, 4)
32
-
33
- assert mt.foo() == 3
34
- assert mt.bar() == 4
35
-
36
-
37
- def test_multiple_inheritance_mix2():
38
- class Base2:
39
- def __init__(self, i):
40
- self.i = i
41
-
42
- def bar(self):
43
- return self.i
44
-
45
- class MITypePy(m.Base1, Base2):
46
- def __init__(self, i, j):
47
- m.Base1.__init__(self, i)
48
- Base2.__init__(self, j)
49
-
50
- mt = MITypePy(3, 4)
51
-
52
- assert mt.foo() == 3
53
- assert mt.bar() == 4
54
-
55
-
56
- @pytest.mark.skipif("env.PYPY and env.PY2")
57
- @pytest.mark.xfail("env.PYPY and not env.PY2")
58
- def test_multiple_inheritance_python():
59
- class MI1(m.Base1, m.Base2):
60
- def __init__(self, i, j):
61
- m.Base1.__init__(self, i)
62
- m.Base2.__init__(self, j)
63
-
64
- class B1(object):
65
- def v(self):
66
- return 1
67
-
68
- class MI2(B1, m.Base1, m.Base2):
69
- def __init__(self, i, j):
70
- B1.__init__(self)
71
- m.Base1.__init__(self, i)
72
- m.Base2.__init__(self, j)
73
-
74
- class MI3(MI2):
75
- def __init__(self, i, j):
76
- MI2.__init__(self, i, j)
77
-
78
- class MI4(MI3, m.Base2):
79
- def __init__(self, i, j):
80
- MI3.__init__(self, i, j)
81
- # This should be ignored (Base2 is already initialized via MI2):
82
- m.Base2.__init__(self, i + 100)
83
-
84
- class MI5(m.Base2, B1, m.Base1):
85
- def __init__(self, i, j):
86
- B1.__init__(self)
87
- m.Base1.__init__(self, i)
88
- m.Base2.__init__(self, j)
89
-
90
- class MI6(m.Base2, B1):
91
- def __init__(self, i):
92
- m.Base2.__init__(self, i)
93
- B1.__init__(self)
94
-
95
- class B2(B1):
96
- def v(self):
97
- return 2
98
-
99
- class B3(object):
100
- def v(self):
101
- return 3
102
-
103
- class B4(B3, B2):
104
- def v(self):
105
- return 4
106
-
107
- class MI7(B4, MI6):
108
- def __init__(self, i):
109
- B4.__init__(self)
110
- MI6.__init__(self, i)
111
-
112
- class MI8(MI6, B3):
113
- def __init__(self, i):
114
- MI6.__init__(self, i)
115
- B3.__init__(self)
116
-
117
- class MI8b(B3, MI6):
118
- def __init__(self, i):
119
- B3.__init__(self)
120
- MI6.__init__(self, i)
121
-
122
- mi1 = MI1(1, 2)
123
- assert mi1.foo() == 1
124
- assert mi1.bar() == 2
125
-
126
- mi2 = MI2(3, 4)
127
- assert mi2.v() == 1
128
- assert mi2.foo() == 3
129
- assert mi2.bar() == 4
130
-
131
- mi3 = MI3(5, 6)
132
- assert mi3.v() == 1
133
- assert mi3.foo() == 5
134
- assert mi3.bar() == 6
135
-
136
- mi4 = MI4(7, 8)
137
- assert mi4.v() == 1
138
- assert mi4.foo() == 7
139
- assert mi4.bar() == 8
140
-
141
- mi5 = MI5(10, 11)
142
- assert mi5.v() == 1
143
- assert mi5.foo() == 10
144
- assert mi5.bar() == 11
145
-
146
- mi6 = MI6(12)
147
- assert mi6.v() == 1
148
- assert mi6.bar() == 12
149
-
150
- mi7 = MI7(13)
151
- assert mi7.v() == 4
152
- assert mi7.bar() == 13
153
-
154
- mi8 = MI8(14)
155
- assert mi8.v() == 1
156
- assert mi8.bar() == 14
157
-
158
- mi8b = MI8b(15)
159
- assert mi8b.v() == 3
160
- assert mi8b.bar() == 15
161
-
162
-
163
- def test_multiple_inheritance_python_many_bases():
164
- class MIMany14(m.BaseN1, m.BaseN2, m.BaseN3, m.BaseN4):
165
- def __init__(self):
166
- m.BaseN1.__init__(self, 1)
167
- m.BaseN2.__init__(self, 2)
168
- m.BaseN3.__init__(self, 3)
169
- m.BaseN4.__init__(self, 4)
170
-
171
- class MIMany58(m.BaseN5, m.BaseN6, m.BaseN7, m.BaseN8):
172
- def __init__(self):
173
- m.BaseN5.__init__(self, 5)
174
- m.BaseN6.__init__(self, 6)
175
- m.BaseN7.__init__(self, 7)
176
- m.BaseN8.__init__(self, 8)
177
-
178
- class MIMany916(
179
- m.BaseN9,
180
- m.BaseN10,
181
- m.BaseN11,
182
- m.BaseN12,
183
- m.BaseN13,
184
- m.BaseN14,
185
- m.BaseN15,
186
- m.BaseN16,
187
- ):
188
- def __init__(self):
189
- m.BaseN9.__init__(self, 9)
190
- m.BaseN10.__init__(self, 10)
191
- m.BaseN11.__init__(self, 11)
192
- m.BaseN12.__init__(self, 12)
193
- m.BaseN13.__init__(self, 13)
194
- m.BaseN14.__init__(self, 14)
195
- m.BaseN15.__init__(self, 15)
196
- m.BaseN16.__init__(self, 16)
197
-
198
- class MIMany19(MIMany14, MIMany58, m.BaseN9):
199
- def __init__(self):
200
- MIMany14.__init__(self)
201
- MIMany58.__init__(self)
202
- m.BaseN9.__init__(self, 9)
203
-
204
- class MIMany117(MIMany14, MIMany58, MIMany916, m.BaseN17):
205
- def __init__(self):
206
- MIMany14.__init__(self)
207
- MIMany58.__init__(self)
208
- MIMany916.__init__(self)
209
- m.BaseN17.__init__(self, 17)
210
-
211
- # Inherits from 4 registered C++ classes: can fit in one pointer on any modern arch:
212
- a = MIMany14()
213
- for i in range(1, 4):
214
- assert getattr(a, "f" + str(i))() == 2 * i
215
-
216
- # Inherits from 8: requires 1/2 pointers worth of holder flags on 32/64-bit arch:
217
- b = MIMany916()
218
- for i in range(9, 16):
219
- assert getattr(b, "f" + str(i))() == 2 * i
220
-
221
- # Inherits from 9: requires >= 2 pointers worth of holder flags
222
- c = MIMany19()
223
- for i in range(1, 9):
224
- assert getattr(c, "f" + str(i))() == 2 * i
225
-
226
- # Inherits from 17: requires >= 3 pointers worth of holder flags
227
- d = MIMany117()
228
- for i in range(1, 17):
229
- assert getattr(d, "f" + str(i))() == 2 * i
230
-
231
-
232
- def test_multiple_inheritance_virtbase():
233
- class MITypePy(m.Base12a):
234
- def __init__(self, i, j):
235
- m.Base12a.__init__(self, i, j)
236
-
237
- mt = MITypePy(3, 4)
238
- assert mt.bar() == 4
239
- assert m.bar_base2a(mt) == 4
240
- assert m.bar_base2a_sharedptr(mt) == 4
241
-
242
-
243
- def test_mi_static_properties():
244
- """Mixing bases with and without static properties should be possible
245
- and the result should be independent of base definition order"""
246
-
247
- for d in (m.VanillaStaticMix1(), m.VanillaStaticMix2()):
248
- assert d.vanilla() == "Vanilla"
249
- assert d.static_func1() == "WithStatic1"
250
- assert d.static_func2() == "WithStatic2"
251
- assert d.static_func() == d.__class__.__name__
252
-
253
- m.WithStatic1.static_value1 = 1
254
- m.WithStatic2.static_value2 = 2
255
- assert d.static_value1 == 1
256
- assert d.static_value2 == 2
257
- assert d.static_value == 12
258
-
259
- d.static_value1 = 0
260
- assert d.static_value1 == 0
261
- d.static_value2 = 0
262
- assert d.static_value2 == 0
263
- d.static_value = 0
264
- assert d.static_value == 0
265
-
266
-
267
- # Requires PyPy 6+
268
- def test_mi_dynamic_attributes():
269
- """Mixing bases with and without dynamic attribute support"""
270
-
271
- for d in (m.VanillaDictMix1(), m.VanillaDictMix2()):
272
- d.dynamic = 1
273
- assert d.dynamic == 1
274
-
275
-
276
- def test_mi_unaligned_base():
277
- """Returning an offset (non-first MI) base class pointer should recognize the instance"""
278
-
279
- n_inst = ConstructorStats.detail_reg_inst()
280
-
281
- c = m.I801C()
282
- d = m.I801D()
283
- # + 4 below because we have the two instances, and each instance has offset base I801B2
284
- assert ConstructorStats.detail_reg_inst() == n_inst + 4
285
- b1c = m.i801b1_c(c)
286
- assert b1c is c
287
- b2c = m.i801b2_c(c)
288
- assert b2c is c
289
- b1d = m.i801b1_d(d)
290
- assert b1d is d
291
- b2d = m.i801b2_d(d)
292
- assert b2d is d
293
-
294
- assert ConstructorStats.detail_reg_inst() == n_inst + 4 # no extra instances
295
- del c, b1c, b2c
296
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
297
- del d, b1d, b2d
298
- assert ConstructorStats.detail_reg_inst() == n_inst
299
-
300
-
301
- def test_mi_base_return():
302
- """Tests returning an offset (non-first MI) base class pointer to a derived instance"""
303
-
304
- n_inst = ConstructorStats.detail_reg_inst()
305
-
306
- c1 = m.i801c_b1()
307
- assert type(c1) is m.I801C
308
- assert c1.a == 1
309
- assert c1.b == 2
310
-
311
- d1 = m.i801d_b1()
312
- assert type(d1) is m.I801D
313
- assert d1.a == 1
314
- assert d1.b == 2
315
-
316
- assert ConstructorStats.detail_reg_inst() == n_inst + 4
317
-
318
- c2 = m.i801c_b2()
319
- assert type(c2) is m.I801C
320
- assert c2.a == 1
321
- assert c2.b == 2
322
-
323
- d2 = m.i801d_b2()
324
- assert type(d2) is m.I801D
325
- assert d2.a == 1
326
- assert d2.b == 2
327
-
328
- assert ConstructorStats.detail_reg_inst() == n_inst + 8
329
-
330
- del c2
331
- assert ConstructorStats.detail_reg_inst() == n_inst + 6
332
- del c1, d1, d2
333
- assert ConstructorStats.detail_reg_inst() == n_inst
334
-
335
- # Returning an unregistered derived type with a registered base; we won't
336
- # pick up the derived type, obviously, but should still work (as an object
337
- # of whatever type was returned).
338
- e1 = m.i801e_c()
339
- assert type(e1) is m.I801C
340
- assert e1.a == 1
341
- assert e1.b == 2
342
-
343
- e2 = m.i801e_b2()
344
- assert type(e2) is m.I801B2
345
- assert e2.b == 2
346
-
347
-
348
- def test_diamond_inheritance():
349
- """Tests that diamond inheritance works as expected (issue #959)"""
350
-
351
- # Issue #959: this shouldn't segfault:
352
- d = m.D()
353
-
354
- # Make sure all the various distinct pointers are all recognized as registered instances:
355
- assert d is d.c0()
356
- assert d is d.c1()
357
- assert d is d.b()
358
- assert d is d.c0().b()
359
- assert d is d.c1().b()
360
- assert d is d.c0().c1().b().c0().b()