From f27db5cdc2ebbe414c97b4845cdf3bb0b0b0eb17 Mon Sep 17 00:00:00 2001
From: Gamelin Alexis <gamelin@synchrotron-soleil.fr>
Date: Thu, 8 Apr 2021 13:20:13 +0200
Subject: [PATCH] [Fix] problem with mpi case
Wrong data shared in Beam.mpi_share_distributions
Old names in CavityResonator.track corrected
---
tracking/particles.py | 2 +-
tracking/rf.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tracking/particles.py b/tracking/particles.py
index cf03762..4e51537 100644
--- a/tracking/particles.py
+++ b/tracking/particles.py
@@ -715,7 +715,7 @@ class Beam:
self.mpi.comm.Allgather([center, MPI.DOUBLE], [self.mpi.__getattribute__(dim + "_center"), MPI.DOUBLE])
self.mpi.__setattr__(dim + "_profile", np.empty((len(self), len(profile)), dtype=np.int64))
- self.mpi.comm.Allgather([center, MPI.INT64_T], [self.mpi.__getattribute__(dim + "_profile"), MPI.INT64_T])
+ self.mpi.comm.Allgather([profile, MPI.INT64_T], [self.mpi.__getattribute__(dim + "_profile"), MPI.INT64_T])
self.mpi.__setattr__(dim + "_sorted_index", sorted_index)
diff --git a/tracking/rf.py b/tracking/rf.py
index ead6d7a..9fb4755 100644
--- a/tracking/rf.py
+++ b/tracking/rf.py
@@ -215,12 +215,12 @@ class CavityResonator():
if beam.mpi_switch:
# mpi -> get shared bunch profile for current bunch
- center = beam.mpi.center_all[index]
- profile = beam.mpi.profile_all[index]
+ center = beam.mpi.tau_center[index]
+ profile = beam.mpi.tau_profile[index]
bin_length = center[1]-center[0]
charge_per_mp = beam.mpi.charge_per_mp_all[index]
if index == self.bunch_index:
- sorted_index = beam.mpi.sorted_index
+ sorted_index = beam.mpi.tau_sorted_index
else:
# no mpi -> get bunch profile for current bunch
(bins, sorted_index, profile, center) = bunch.binning()
@@ -294,8 +294,8 @@ class CavityResonator():
if beam.mpi_switch:
# get shared bunch profile for current bunch
- center = beam.mpi.center_all[j]
- profile = beam.mpi.profile_all[j]
+ center = beam.mpi.tau_center[j]
+ profile = beam.mpi.tau_profile[j]
bin_length = center[1]-center[0]
charge_per_mp = beam.mpi.charge_per_mp_all[j]
else:
--
GitLab