Emittance calculation

Hello, There are a few changes that need to be verified. I've changed the way emittance is computed. For nonzero dispersion, it gives the correct results. When dispersion is included, I think the difference is minimal for realistic values. But I am not sure.

• Calculation of emittances and CS invariants for nonzero dispersion (based on PyHEADTAIL "cobra" functions)
• Different ion species data in impedance.ions

mbtrack2/tracking/particles.py

@@ -318,12 +318,14 @@ class Bunch:
         """
         xb = self['x'] - self['delta'] * self.ring.optics.local_dispersion[0]
         yy = self['y'] - self['delta'] * self.ring.optics.local_dispersion[2]
+        xpb = self['xp'] - self['delta'] * self.ring.optics.local_dispersion[1]
+        ypb = self['yp'] - self['delta'] * self.ring.optics.local_dispersion[3]
         Jx = (self.ring.optics.local_gamma[0] * xb**2) + \
-              (2*self.ring.optics.local_alpha[0] *xb)*self['xp'] + \
-              (self.ring.optics.local_beta[0] * self['xp']**2)
+              (2*self.ring.optics.local_alpha[0] *xb*xpb) + \
+              (self.ring.optics.local_beta[0] * xpb**2)
         Jy = (self.ring.optics.local_gamma[1] * yb**2) + \
-              (2*self.ring.optics.local_alpha[1] * yb*self['yp']) + \
-              (self.ring.optics.local_beta[1] * self['yp']**2)
+              (2*self.ring.optics.local_alpha[1] * yb*ypb) + \
+              (self.ring.optics.local_beta[1] * ypb**2)
         Js = (self.ring.long_gamma * self['tau']**2) + \
               (2*self.ring.long_alpha * self['tau']*self['delta']) + \
               (self.ring.long_beta * self['delta']**2)