xcoll 0.2.1__tar.gz → 0.2.2__tar.gz
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.
- {xcoll-0.2.1 → xcoll-0.2.2}/PKG-INFO +19 -2
- {xcoll-0.2.1 → xcoll-0.2.2}/README.md +8 -1
- {xcoll-0.2.1 → xcoll-0.2.2}/pyproject.toml +14 -9
- xcoll-0.2.2/setup.py +43 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/__init__.py +1 -1
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/collimators_src/absorber.h +1 -1
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/collimators_src/everest_collimator.h +1 -1
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/collimators_src/everest_crystal.h +2 -2
- xcoll-0.2.1/setup.py +0 -28
- {xcoll-0.2.1 → xcoll-0.2.2}/LICENSE +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/NOTICE +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/__init__.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/absorber.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/base_collimator.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/collimators_src/base_collimator.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/collimators_src/invalid_collimator.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/beam_elements/everest_collimator.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/colldb.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/collimator_settings.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/general.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/headers/particle_states.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/manager.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/__init__.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/crystal.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/everest.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/everest.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/jaw.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/materials.py +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/scatter.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/scatter_crystal.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/scattering_routines/everest/scatter_init.h +0 -0
- {xcoll-0.2.1 → xcoll-0.2.2}/xcoll/tables.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: xcoll
|
|
3
|
-
Version: 0.2.
|
|
3
|
+
Version: 0.2.2
|
|
4
4
|
Summary: Xsuite collimation package
|
|
5
5
|
Home-page: https://github.com/xsuite/xcoll
|
|
6
6
|
License: Apache 2.0
|
|
@@ -13,6 +13,16 @@ Classifier: Programming Language :: Python :: 3.8
|
|
|
13
13
|
Classifier: Programming Language :: Python :: 3.9
|
|
14
14
|
Classifier: Programming Language :: Python :: 3.10
|
|
15
15
|
Classifier: Programming Language :: Python :: 3.11
|
|
16
|
+
Provides-Extra: tests
|
|
17
|
+
Requires-Dist: numpy (>=1.0)
|
|
18
|
+
Requires-Dist: pandas (>=1.4)
|
|
19
|
+
Requires-Dist: ruamel-yaml (>=0.17.31,<0.18.0); extra == "tests"
|
|
20
|
+
Requires-Dist: xcoll (>=0.2.1,<0.3.0)
|
|
21
|
+
Requires-Dist: xdeps (>=0.1.1,<0.2.0)
|
|
22
|
+
Requires-Dist: xfields (>=0.12.1,<0.13.0)
|
|
23
|
+
Requires-Dist: xobjects (>=0.2.6,<0.3.0)
|
|
24
|
+
Requires-Dist: xpart (>=0.15.0,<0.16.0)
|
|
25
|
+
Requires-Dist: xtrack (>=0.36.5,<0.37.0)
|
|
16
26
|
Project-URL: Repository, https://github.com/xsuite/xcoll
|
|
17
27
|
Description-Content-Type: text/markdown
|
|
18
28
|
|
|
@@ -20,7 +30,14 @@ Description-Content-Type: text/markdown
|
|
|
20
30
|
|
|
21
31
|
<!--- -->
|
|
22
32
|
|
|
23
|
-
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
24
41
|
|
|
25
42
|
Collimation in xtrack simulations
|
|
26
43
|
|
|
@@ -2,7 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
<!--- -->
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
6
13
|
|
|
7
14
|
Collimation in xtrack simulations
|
|
8
15
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "xcoll"
|
|
3
|
-
version = "0.2.
|
|
3
|
+
version = "0.2.2"
|
|
4
4
|
description = "Xsuite collimation package"
|
|
5
5
|
homepage = "https://github.com/xsuite/xcoll"
|
|
6
6
|
repository = "https://github.com/xsuite/xcoll"
|
|
@@ -17,16 +17,21 @@ include = [ "LICENSE", "NOTICE" ]
|
|
|
17
17
|
|
|
18
18
|
[tool.poetry.dependencies]
|
|
19
19
|
python = ">=3.8"
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
20
|
+
ruamel-yaml = { version = "^0.17.31", optional = true }
|
|
21
|
+
numpy = ">=1.0"
|
|
22
|
+
pandas = ">=1.4"
|
|
23
|
+
xobjects = "^0.2.6"
|
|
24
|
+
xdeps = "^0.1.1"
|
|
25
|
+
xpart = "^0.15.0"
|
|
26
|
+
xtrack = "^0.36.5"
|
|
27
|
+
xfields = "^0.12.1"
|
|
28
|
+
xcoll = "^0.2.1"
|
|
27
29
|
|
|
28
30
|
[tool.poetry.dev-dependencies]
|
|
29
|
-
pytest = "
|
|
31
|
+
pytest = ">=7.3"
|
|
32
|
+
|
|
33
|
+
[tool.poetry.extras]
|
|
34
|
+
tests = ["pytest", "ruamel-yaml"]
|
|
30
35
|
|
|
31
36
|
[build-system]
|
|
32
37
|
# Needed for pip install -e (BTW: need pip version 22)
|
xcoll-0.2.2/setup.py
ADDED
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
from setuptools import setup
|
|
3
|
+
|
|
4
|
+
packages = \
|
|
5
|
+
['xcoll', 'xcoll.beam_elements', 'xcoll.scattering_routines.everest']
|
|
6
|
+
|
|
7
|
+
package_data = \
|
|
8
|
+
{'': ['*'],
|
|
9
|
+
'xcoll': ['headers/*'],
|
|
10
|
+
'xcoll.beam_elements': ['collimators_src/*']}
|
|
11
|
+
|
|
12
|
+
install_requires = \
|
|
13
|
+
['numpy>=1.0',
|
|
14
|
+
'pandas>=1.4',
|
|
15
|
+
'xcoll>=0.2.1,<0.3.0',
|
|
16
|
+
'xdeps>=0.1.1,<0.2.0',
|
|
17
|
+
'xfields>=0.12.1,<0.13.0',
|
|
18
|
+
'xobjects>=0.2.6,<0.3.0',
|
|
19
|
+
'xpart>=0.15.0,<0.16.0',
|
|
20
|
+
'xtrack>=0.36.5,<0.37.0']
|
|
21
|
+
|
|
22
|
+
extras_require = \
|
|
23
|
+
{'tests': ['ruamel-yaml>=0.17.31,<0.18.0']}
|
|
24
|
+
|
|
25
|
+
setup_kwargs = {
|
|
26
|
+
'name': 'xcoll',
|
|
27
|
+
'version': '0.2.2',
|
|
28
|
+
'description': 'Xsuite collimation package',
|
|
29
|
+
'long_description': '# xcoll\n\n<!--- -->\n\n\n\n\n\n\n\n\n\n\nCollimation in xtrack simulations\n\n## Description\n\n## Getting Started\n\n### Dependencies\n\n* python >= 3.8\n * numpy\n * pandas\n * xsuite (in particular xobjects, xdeps, xtrack, xpart)\n\n### Installing\n`xcoll` is packaged using `poetry`, and can be easily installed with `pip`:\n```bash\npip install xcoll\n```\nFor a local installation, clone and install in editable mode (need to have `pip` >22):\n```bash\ngit clone git@github.com:xsuite/xcoll.git\npip install -e xcoll\n```\n\n### Example\n\n## Features\n\n## Authors\n\n* [Frederik Van der Veken](https://github.com/freddieknets) (frederik@cern.ch)\n* [Despina Demetriadou](https://github.com/ddemetriadou)\n* [Andrey Abramov](https://github.com/anabramo)\n* [Giovanni Iadarola](https://github.com/giadarol)\n\n\n## Version History\n\n* 0.1\n * Initial Release\n\n## License\n\nThis project is [Apache 2.0 licensed](./LICENSE).\n',
|
|
30
|
+
'author': 'Frederik F. Van der Veken',
|
|
31
|
+
'author_email': 'frederik@cern.ch',
|
|
32
|
+
'maintainer': 'None',
|
|
33
|
+
'maintainer_email': 'None',
|
|
34
|
+
'url': 'https://github.com/xsuite/xcoll',
|
|
35
|
+
'packages': packages,
|
|
36
|
+
'package_data': package_data,
|
|
37
|
+
'install_requires': install_requires,
|
|
38
|
+
'extras_require': extras_require,
|
|
39
|
+
'python_requires': '>=3.8',
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
setup(**setup_kwargs)
|
|
@@ -31,7 +31,7 @@ void BlackAbsorber_track_local_particle(BlackAbsorberData el, LocalParticle* par
|
|
|
31
31
|
double const cos_zL = BlackAbsorberData_get_cos_zL(el);
|
|
32
32
|
double const sin_zR = BlackAbsorberData_get_sin_zR(el);
|
|
33
33
|
double const cos_zR = BlackAbsorberData_get_cos_zR(el);
|
|
34
|
-
if (
|
|
34
|
+
if (fabs(sin_zL-sin_zR) > 1.e-10 || fabs(cos_zL-cos_zR) > 1.e-10 ){
|
|
35
35
|
kill_all_particles(part0, XC_ERR_NOT_IMPLEMENTED);
|
|
36
36
|
};
|
|
37
37
|
double const dx = BlackAbsorberData_get_ref_x(el);
|
|
@@ -31,7 +31,7 @@ void EverestCollimator_track_local_particle(EverestCollimatorData el, LocalParti
|
|
|
31
31
|
double const cos_zL = EverestCollimatorData_get_cos_zL(el);
|
|
32
32
|
double const sin_zR = EverestCollimatorData_get_sin_zR(el);
|
|
33
33
|
double const cos_zR = EverestCollimatorData_get_cos_zR(el);
|
|
34
|
-
if (
|
|
34
|
+
if (fabs(sin_zL-sin_zR) > 1.e-10 || fabs(cos_zL-cos_zR) > 1.e-10 ){
|
|
35
35
|
kill_all_particles(part0, XC_ERR_NOT_IMPLEMENTED);
|
|
36
36
|
};
|
|
37
37
|
double const c_aperture = EverestCollimatorData_get_jaw_L(el) - EverestCollimatorData_get_jaw_R(el);
|
|
@@ -32,14 +32,14 @@ void EverestCrystal_track_local_particle(EverestCrystalData el, LocalParticle* p
|
|
|
32
32
|
double const cos_zL = EverestCrystalData_get_cos_zL(el);
|
|
33
33
|
double const sin_zR = EverestCrystalData_get_sin_zR(el);
|
|
34
34
|
double const cos_zR = EverestCrystalData_get_cos_zR(el);
|
|
35
|
-
if (
|
|
35
|
+
if (fabs(sin_zL-sin_zR) > 1.e-10 || fabs(cos_zL-cos_zR) > 1.e-10 ){
|
|
36
36
|
kill_all_particles(part0, XC_ERR_NOT_IMPLEMENTED);
|
|
37
37
|
};
|
|
38
38
|
double const c_aperture = EverestCrystalData_get_jaw_L(el) - EverestCrystalData_get_jaw_R(el);
|
|
39
39
|
double const c_offset = ( EverestCrystalData_get_jaw_L(el) + EverestCrystalData_get_jaw_R(el) ) /2;
|
|
40
40
|
double const c_tilt0 = asin(EverestCrystalData_get_sin_yL(el));
|
|
41
41
|
double const c_tilt1 = asin(EverestCrystalData_get_sin_yR(el));
|
|
42
|
-
if (
|
|
42
|
+
if (fabs(c_tilt1) > 1.e-10){
|
|
43
43
|
kill_all_particles(part0, XC_ERR_INVALID_XOFIELD);
|
|
44
44
|
};
|
|
45
45
|
int const side = EverestCrystalData_get__side(el);
|
xcoll-0.2.1/setup.py
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
from setuptools import setup
|
|
3
|
-
|
|
4
|
-
packages = \
|
|
5
|
-
['xcoll', 'xcoll.beam_elements', 'xcoll.scattering_routines.everest']
|
|
6
|
-
|
|
7
|
-
package_data = \
|
|
8
|
-
{'': ['*'],
|
|
9
|
-
'xcoll': ['headers/*'],
|
|
10
|
-
'xcoll.beam_elements': ['collimators_src/*']}
|
|
11
|
-
|
|
12
|
-
setup_kwargs = {
|
|
13
|
-
'name': 'xcoll',
|
|
14
|
-
'version': '0.2.1',
|
|
15
|
-
'description': 'Xsuite collimation package',
|
|
16
|
-
'long_description': '# xcoll\n\n<!--- -->\n\n     \n\nCollimation in xtrack simulations\n\n## Description\n\n## Getting Started\n\n### Dependencies\n\n* python >= 3.8\n * numpy\n * pandas\n * xsuite (in particular xobjects, xdeps, xtrack, xpart)\n\n### Installing\n`xcoll` is packaged using `poetry`, and can be easily installed with `pip`:\n```bash\npip install xcoll\n```\nFor a local installation, clone and install in editable mode (need to have `pip` >22):\n```bash\ngit clone git@github.com:xsuite/xcoll.git\npip install -e xcoll\n```\n\n### Example\n\n## Features\n\n## Authors\n\n* [Frederik Van der Veken](https://github.com/freddieknets) (frederik@cern.ch)\n* [Despina Demetriadou](https://github.com/ddemetriadou)\n* [Andrey Abramov](https://github.com/anabramo)\n* [Giovanni Iadarola](https://github.com/giadarol)\n\n\n## Version History\n\n* 0.1\n * Initial Release\n\n## License\n\nThis project is [Apache 2.0 licensed](./LICENSE).\n',
|
|
17
|
-
'author': 'Frederik F. Van der Veken',
|
|
18
|
-
'author_email': 'frederik@cern.ch',
|
|
19
|
-
'maintainer': 'None',
|
|
20
|
-
'maintainer_email': 'None',
|
|
21
|
-
'url': 'https://github.com/xsuite/xcoll',
|
|
22
|
-
'packages': packages,
|
|
23
|
-
'package_data': package_data,
|
|
24
|
-
'python_requires': '>=3.8',
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
setup(**setup_kwargs)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|