xcoll 0.2.0__py3-none-any.whl → 0.2.2__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 (8) hide show
  1. xcoll/__init__.py +1 -1
  2. xcoll/beam_elements/collimators_src/absorber.h +1 -1
  3. xcoll/beam_elements/collimators_src/everest_collimator.h +1 -1
  4. xcoll/beam_elements/collimators_src/everest_crystal.h +2 -2
  5. {xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/METADATA +19 -2
  6. {xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/RECORD +8 -8
  7. {xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/LICENSE +0 -0
  8. {xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/WHEEL +0 -0
xcoll/__init__.py CHANGED
@@ -6,4 +6,4 @@ from .scattering_routines.everest.materials import GeneralMaterial, Material, Cr
6
6
  from .manager import CollimatorManager
7
7
  from .colldb import CollimatorDatabase, load_SixTrack_colldb
8
8
 
9
- __version__ = '0.2.0'
9
+ __version__ = '0.2.2'
xcoll/beam_elements/collimators_src/absorber.h CHANGED
@@ -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 (abs(sin_zL-sin_zR) > 1.e-10 || abs(cos_zL-cos_zR) > 1.e-10 ){
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);
xcoll/beam_elements/collimators_src/everest_collimator.h CHANGED
@@ -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 (abs(sin_zL-sin_zR) > 1.e-10 || abs(cos_zL-cos_zR) > 1.e-10 ){
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);
xcoll/beam_elements/collimators_src/everest_crystal.h CHANGED
@@ -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 (abs(sin_zL-sin_zR) > 1.e-10 || abs(cos_zL-cos_zR) > 1.e-10 ){
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 (abs(c_tilt1) > 1.e-10){
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.0.dist-info → xcoll-0.2.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xcoll
3
- Version: 0.2.0
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
  <!---![PyPI - Python Version](https://img.shields.io/pypi/pyversions/xcoll?logo=PyPI?style=plastic) ![PyPI - Wheel](https://img.shields.io/pypi/wheel/xcoll?logo=PyPI?style=plastic)-->
22
32
 
23
- ![GitHub release (latest by date)](https://img.shields.io/github/v/release/xsuite/xcoll?style=plastic) ![GitHub](https://img.shields.io/github/license/xsuite/xcoll?style=plastic) ![GitHub all releases](https://img.shields.io/github/downloads/xsuite/xcoll/total?logo=GitHub&style=plastic) ![GitHub issues](https://img.shields.io/github/issues/xsuite/xcoll?logo=GitHub&style=plastic) ![GitHub pull requests](https://img.shields.io/github/issues-pr/xsuite/xcoll?logo=GitHub&style=plastic) ![GitHub repo size](https://img.shields.io/github/repo-size/xsuite/xcoll?logo=GitHub&style=plastic)
33
+ ![GitHub release (latest by date)](https://img.shields.io/github/v/release/xsuite/xcoll?style=plastic)
34
+ ![GitHub](https://img.shields.io/github/license/xsuite/xcoll?style=plastic)
35
+ ![PyPi](https://img.shields.io/pypi/dm/xcoll?logo=PyPI&style=plastic)
36
+ ![GitHub all releases](https://img.shields.io/github/downloads/xsuite/xcoll/total?logo=GitHub&style=plastic)
37
+
38
+ ![GitHub pull requests](https://img.shields.io/github/issues-pr/xsuite/xcoll?logo=GitHub&style=plastic)
39
+ ![GitHub issues](https://img.shields.io/github/issues/xsuite/xcoll?logo=GitHub&style=plastic)
40
+ ![GitHub repo size](https://img.shields.io/github/repo-size/xsuite/xcoll?logo=GitHub&style=plastic)
24
41
 
25
42
  Collimation in xtrack simulations
26
43
 
{xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/RECORD RENAMED
@@ -1,13 +1,13 @@
1
1
  LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
2
2
  NOTICE,sha256=6DO_E7WCdRKc42vUoVVBPGttvQi4mRt9fAcxj9u8zy8,74
3
- xcoll/__init__.py,sha256=bcWlXnIraSxaf4aVJ7-8lQANsLCzzGin1VultZFC2hQ,392
3
+ xcoll/__init__.py,sha256=--3f_7wSH4x0CGOGFjTAjOC7SyVNON7d8kvbToWvRhs,392
4
4
  xcoll/beam_elements/__init__.py,sha256=gRh3_nGA1waVKDIOPftqJ5Sg_rf6HjHlfTvKZBwttG0,224
5
5
  xcoll/beam_elements/absorber.py,sha256=xr7w6HjwlpP-XnaC_m0ln__y4NwrTGsflqj2EOW52E8,1248
6
6
  xcoll/beam_elements/base_collimator.py,sha256=RbCYVzE1JSFTYGeQMXIJNQJ6twxML8QKuKEqnEKTgk8,14594
7
- xcoll/beam_elements/collimators_src/absorber.h,sha256=8BVE4IDJFK2jjy12O6_9iiA6Syk_RL4w6YsVMBmi94A,8598
7
+ xcoll/beam_elements/collimators_src/absorber.h,sha256=MegENOJwTB-NW0wNqOd6ie09naey_brNCAlut_o2KRY,8600
8
8
  xcoll/beam_elements/collimators_src/base_collimator.h,sha256=fcZc1P3B7_FJRvK9_CgQYmIQleofklp-ukDQHSiSClg,413
9
- xcoll/beam_elements/collimators_src/everest_collimator.h,sha256=f7PrtlTkRyCLCEmIKQfrzrNGoBC-df_Cv9hT3ynLIUY,3772
10
- xcoll/beam_elements/collimators_src/everest_crystal.h,sha256=EM5PBVhppC3F45m5yTKP5Y-1sGzo7mSDO7dWK95Zqzg,4669
9
+ xcoll/beam_elements/collimators_src/everest_collimator.h,sha256=wlDwDAgX7fTkQfH3fzM70MdPavwMF09u2wV9EbO-q8k,3774
10
+ xcoll/beam_elements/collimators_src/everest_crystal.h,sha256=jiH9NOk9f_NTqldDRLdyhSOsb65bHhEP2G3vJXg5HNY,4672
11
11
  xcoll/beam_elements/collimators_src/invalid_collimator.h,sha256=xwaZgI6EiZbmEi5SS-uDDzShL9_uAQ3AnydHYTfdUPg,433
12
12
  xcoll/beam_elements/everest_collimator.py,sha256=OHoyjDhUkv6BWldkvgcEpMUOvHMwcci0NKsQbXeNNZ0,6559
13
13
  xcoll/colldb.py,sha256=KW1slCLZmQ7oWSj7cGiwvndsDJMRkScb7qqLIzH7mQI,39298
@@ -25,7 +25,7 @@ xcoll/scattering_routines/everest/scatter.h,sha256=HUWWD-UPtAwhyRkMwWcjvhZRFbqer
25
25
  xcoll/scattering_routines/everest/scatter_crystal.h,sha256=Xocndn980QQybKU9oJrTd3e7_I5imL3koizQt_Rn3yg,9368
26
26
  xcoll/scattering_routines/everest/scatter_init.h,sha256=BUYtOC8ByUPo8HNADkcEbgtdTludC7Nc9McpzwcWmvw,2863
27
27
  xcoll/tables.py,sha256=MafMa2bxX-ldHqvBl6gXNprTrLA2Rp6XeBvXkQuf_GU,1919
28
- xcoll-0.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
29
- xcoll-0.2.0.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
30
- xcoll-0.2.0.dist-info/METADATA,sha256=SJrMupAlU4ADAyUNEFN6RZCg_Z3HWjXQvqhtXctzoZU,2276
31
- xcoll-0.2.0.dist-info/RECORD,,
28
+ xcoll-0.2.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
29
+ xcoll-0.2.2.dist-info/WHEEL,sha256=vxFmldFsRN_Hx10GDvsdv1wroKq8r5Lzvjp6GZ4OO8c,88
30
+ xcoll-0.2.2.dist-info/METADATA,sha256=p28bXC4yrMGTByFU2k56n1ga9ZPUaP6BR2fbx0m6yYU,2733
31
+ xcoll-0.2.2.dist-info/RECORD,,
{xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/LICENSE RENAMED
File without changes
{xcoll-0.2.0.dist-info → xcoll-0.2.2.dist-info}/WHEEL RENAMED
File without changes