From dc0e3908e01e9bf9ebdf19e48b27ebeb6058c2c6 Mon Sep 17 00:00:00 2001 From: naotoY <naotino@gmail.com> Date: Thu, 9 Nov 2023 11:14:24 +0900 Subject: [PATCH] [fix] to be able to work on KEK machine --- mbtrack2/impedance/impedance_model.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mbtrack2/impedance/impedance_model.py b/mbtrack2/impedance/impedance_model.py index bc3da3c..46f649c 100644 --- a/mbtrack2/impedance/impedance_model.py +++ b/mbtrack2/impedance/impedance_model.py @@ -5,7 +5,7 @@ Module where the ImpedanceModel class is defined. import pandas as pd import numpy as np import matplotlib.pyplot as plt -from matplotlib import colormaps +#from matplotlib import colormaps import pickle from copy import deepcopy from scipy.integrate import trapz @@ -338,14 +338,15 @@ class ImpedanceModel(): legend.append("Spectral density for sigma = " + str(sigma) + " s") # Main plot - colorblind = colormaps['tab10'].colors + #colorblind = colormaps['tab10'].colors for index in sorted_index: attr = attr_list[index] # Set all impedances with common indexes using + zero_impedance try: sum_imp = getattr(getattr(self, attr), Z_type) + zero_impedance ax.fill_between(sum_imp.data.index*1e-9, total_imp, - total_imp + sum_imp.data[component]*scale[leg], edgecolor=colorblind[index % 10], color=colorblind[index % 10]) + total_imp + sum_imp.data[component]*scale[leg]) + #total_imp + sum_imp.data[component]*scale[leg], edgecolor=colorblind[index % 10], color=colorblind[index % 10]) total_imp += sum_imp.data[component]*scale[leg] if attr[:4] == "sum_": legend.append(attr[4:]) @@ -378,7 +379,8 @@ class ImpedanceModel(): sum_imp = getattr(getattr(self, attr), Z_type) + zero_impedance in_ax.fill_between(sum_imp.data.index*1e-3, total_imp, - total_imp + sum_imp.data[component]*1e-9, edgecolor=colorblind[index % 10], color=colorblind[index % 10]) + total_imp + sum_imp.data[component]*1e-9) + # total_imp + sum_imp.data[component]*1e-9, edgecolor=colorblind[index % 10], color=colorblind[index % 10]) total_imp += sum_imp.data[component]*1e-9 except AttributeError: pass -- GitLab