From 2f0797d29544c54a7c0de44758a347ef633df7d5 Mon Sep 17 00:00:00 2001
From: Gamelin Alexis <alexis.gamelin@synchrotron-soleil.fr>
Date: Mon, 26 Jun 2023 11:00:47 +0200
Subject: [PATCH] Convert np.float and np.complex to python default
np.float and np.complex are deprecated since NumPy 1.20.
---
mbtrack2/tracking/particles.py | 12 ++++++------
mbtrack2/tracking/rf.py | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mbtrack2/tracking/particles.py b/mbtrack2/tracking/particles.py
index 9dfd691..e663ee0 100644
--- a/mbtrack2/tracking/particles.py
+++ b/mbtrack2/tracking/particles.py
@@ -119,12 +119,12 @@ class Bunch:
current = 0
self._mp_number = int(mp_number)
- self.dtype = np.dtype([('x',np.float),
- ('xp',np.float),
- ('y',np.float),
- ('yp',np.float),
- ('tau',np.float),
- ('delta',np.float)])
+ self.dtype = np.dtype([('x', float),
+ ('xp', float),
+ ('y', float),
+ ('yp', float),
+ ('tau', float),
+ ('delta', float)])
self.particles = np.zeros(self.mp_number, self.dtype)
self.track_alive = track_alive
diff --git a/mbtrack2/tracking/rf.py b/mbtrack2/tracking/rf.py
index aa4eb68..69a1c20 100644
--- a/mbtrack2/tracking/rf.py
+++ b/mbtrack2/tracking/rf.py
@@ -200,8 +200,8 @@ class CavityResonator():
self.detune = detune
self.Vc = Vc
self.theta = theta
- self.beam_phasor = np.zeros(1, dtype=np.complex)
- self.beam_phasor_record = np.zeros((self.ring.h), dtype=np.complex)
+ self.beam_phasor = np.zeros(1, dtype=complex)
+ self.beam_phasor_record = np.zeros((self.ring.h), dtype=complex)
self.tracking = False
self.Vg = 0
self.theta_g = 0
--
GitLab