Merge branch 'develop' of...

Merge branch 'develop' of https://gitlab.synchrotron-soleil.fr/PA/collective-effects/mbtrack2 into develop

LICENSE

 BSD 3-Clause License
 
-Copyright (c) 2021, SOLEIL Synchrotron
+Copyright (c) 2021-2023, SOLEIL Synchrotron
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -50,6 +50,8 @@ Examples
 Jupyter notebooks demonstrating mbtrack2 features are available in the example folder and can be opened online using google colab:
 + mbtrack2 base features [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/GamelinAl/mbtrack2_examples/blob/main/mbtrack2_demo.ipynb)
 + dealing with RF cavities and longitudinal beam dynamics [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/GamelinAl/mbtrack2_examples/blob/main/mbtrack2_cavity_resonator.ipynb)
++ collective effects [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/GamelinAl/mbtrack2_examples/blob/main/mbtrack2_collective_effects.ipynb)
++ bunch by bunch feedback [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/GamelinAl/mbtrack2_examples/blob/main/mbtrack2_BxB_FB.ipynb)
 
 References
 ----------

mbtrack2/__init__.py

 # -*- coding: utf-8 -*-
+__version__="0.4"
 from mbtrack2.tracking import *
 from mbtrack2.impedance import *
 from mbtrack2.instability import *

mbtrack2/tracking/feedback.py

@@ -79,7 +79,7 @@ class FIRDamper(Element):
         Gain of the FIR filter.
     phase : float
         Phase of the FIR filter in [degree].
-    meas_error : float, optional
+    bpm_error : float, optional
         RMS measurement error applied to the computed mean position.
         Unit is [m] if the plane is "x" or "y" and [s] if the plane is "s".
         The default is None.

mbtrack2/tracking/particles.py

@@ -160,7 +160,7 @@ class Bunch:
     
     def __repr__(self):
         """Return representation of alive particles"""
-        return f'{pd.DataFrame(self[:])!r}'
+        return f'Bunch with macro-particles: \n {pd.DataFrame(self[:])!r}'
         
     @property
     def mp_number(self):
@@ -583,7 +583,7 @@ class Beam:
     
     def __repr__(self):
         """Return representation of the beam filling pattern"""
-        return f'{list((self.filling_pattern))!r}'
+        return f'Beam with bunch current:\n {list((self.bunch_current))!r}'
    
     @property             
     def not_empty(self):