celldetective 1.3.9.post5__py3-none-any.whl → 1.4.0__py3-none-any.whl

celldetective/gui/neighborhood_options.py

@@ -1,6 +1,5 @@
-from PyQt5.QtWidgets import QApplication, QComboBox, QFrame, QCheckBox, QVBoxLayout, QWidget, QLabel, QHBoxLayout, QPushButton
+from PyQt5.QtWidgets import QApplication, QComboBox, QFrame, QCheckBox, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QIcon
 from celldetective.gui.gui_utils import center_window, ListWidget, DistanceChoice
 from superqt.fonticon import icon
 from fonticon_mdi6 import MDI6
@@ -10,9 +9,10 @@ import os
 from glob import glob
 import pandas as pd
 from celldetective.gui.viewers import CellSizeViewer, CellEdgeVisualizer
-from celldetective.gui import Styles
+from celldetective.gui import CelldetectiveWidget
 
-class ConfigNeighborhoods(QWidget, Styles):
+
+class ConfigNeighborhoods(CelldetectiveWidget):
 	
 	"""
 	Widget to configure neighborhood measurements.
@@ -24,7 +24,6 @@ class ConfigNeighborhoods(QWidget, Styles):
 		super().__init__(*args, **kwargs)
 		self.parent_window = parent_window
 		self.attr_parent = self.parent_window.parent_window
-		self.setWindowIcon(QIcon(os.sep.join(['celldetective','icons','logo.png'])))
 
 		self.neighborhood_type = neighborhood_type
 		self.neighborhood_parameter_name = neighborhood_parameter_name
@@ -43,7 +42,6 @@ class ConfigNeighborhoods(QWidget, Styles):
 		self.generate_main_layout()
 		self.load_previous_neighborhood_instructions()
 		center_window(self)
-		self.setAttribute(Qt.WA_DeleteOnClose)
 
 	def generate_main_layout(self):
 
@@ -140,7 +138,7 @@ class ConfigNeighborhoods(QWidget, Styles):
 
 		layout.addLayout(list_header_layout)
 
-		self.measurements_list = ListWidget(DistanceChoice, initial_features=["60"], dtype=int)
+		self.measurements_list = ListWidget(DistanceChoice, initial_features=[], dtype=int)
 		self.measurements_list.setToolTip('Neighborhoods to compute.')
 		layout.addWidget(self.measurements_list)
 
@@ -211,7 +209,7 @@ class ConfigNeighborhoods(QWidget, Styles):
 		population_layout = QHBoxLayout()
 		population_layout.addWidget(QLabel('population: '),30)
 		self.reference_population_cb = QComboBox()
-		self.reference_population_cb.addItems(['targets','effectors'])
+		self.reference_population_cb.addItems(self.parent_window.parent_window.populations)
 		self.reference_population_cb.setToolTip('Select a reference population.')
 		population_layout.addWidget(self.reference_population_cb,70)
 		layout.addLayout(population_layout)
@@ -271,7 +269,7 @@ class ConfigNeighborhoods(QWidget, Styles):
 		population_layout = QHBoxLayout()
 		population_layout.addWidget(QLabel('population: '),30)
 		self.neighbor_population_cb = QComboBox()
-		self.neighbor_population_cb.addItems(['targets','effectors'])
+		self.neighbor_population_cb.addItems(self.parent_window.parent_window.populations)
 		self.neighbor_population_cb.setToolTip('Select a neighbor population.')
 		population_layout.addWidget(self.neighbor_population_cb,70)
 		layout.addLayout(population_layout)
@@ -315,15 +313,14 @@ class ConfigNeighborhoods(QWidget, Styles):
 		population = self.neighbor_population_cb.currentText()
 		class_cols, status_cols, group_cols, time_cols = self.locate_population_specific_columns(population)
 		self.neighbor_population_status_cb.clear()
-		self.neighbor_population_status_cb.addItems(['--','class', 'status']+class_cols+status_cols+group_cols)
+		self.neighbor_population_status_cb.addItems(list(np.unique(['--','class', 'status']+class_cols+status_cols+group_cols)))
 
 	def fill_cbs_of_reference_population(self):
 
 		population = self.reference_population_cb.currentText()
 		class_cols, status_cols, group_cols, time_cols = self.locate_population_specific_columns(population)
-		self.reference_population_status_cb.clear()
-		self.reference_population_status_cb.addItems(['--','class', 'status']+class_cols+status_cols+group_cols)
-		self.event_time_cb.addItems(['--', 't0']+time_cols)
+		self.event_time_cb.clear()
+		self.event_time_cb.addItems(list(np.unique(['--', 't0']+time_cols)))
 
 	def switch_not_reference(self):
 		

celldetective/gui/plot_measurements.py

@@ -1,10 +1,10 @@
 from PyQt5.QtWidgets import QMessageBox, QScrollArea, QButtonGroup, QComboBox, \
-    QCheckBox, QVBoxLayout, QWidget, QLabel, QHBoxLayout, QPushButton, \
+    QCheckBox, QVBoxLayout, QLabel, QHBoxLayout, QPushButton, \
     QRadioButton, QSizePolicy
 from PyQt5.QtCore import Qt, QRect
-from PyQt5.QtGui import QIcon, QDoubleValidator
+from PyQt5.QtGui import QDoubleValidator
 
-from celldetective.gui import Styles
+from celldetective.gui import CelldetectiveWidget
 from celldetective.gui.gui_utils import center_window, FigureCanvas
 
 from superqt.fonticon import icon
@@ -12,7 +12,6 @@ from fonticon_mdi6 import MDI6
 from celldetective.utils import get_software_location, _extract_labels_from_config
 from celldetective.io import load_experiment_tables, get_experiment_antibodies, get_experiment_cell_types, get_experiment_concentrations, \
     get_positions_in_well, get_experiment_wells
-from celldetective.signals import mean_signal
 import numpy as np
 import json
 import os
@@ -26,7 +25,7 @@ import math
 import seaborn as sns
 
 
-class ConfigMeasurementsPlot(QWidget,Styles):
+class ConfigMeasurementsPlot(CelldetectiveWidget):
     """
     UI to set survival instructions.
 
@@ -37,7 +36,6 @@ class ConfigMeasurementsPlot(QWidget,Styles):
         super().__init__()
         self.parent_window = parent_window
         self.setWindowTitle("Configure signal plot")
-        self.setWindowIcon(QIcon(os.sep.join(['celldetective', 'icons', 'mexican-hat.png'])))
         self.exp_dir = self.parent_window.exp_dir
         self.soft_path = get_software_location()
         self.exp_config = self.exp_dir + "config.ini"
@@ -109,7 +107,7 @@ class ConfigMeasurementsPlot(QWidget,Styles):
         main_layout.addWidget(panel_title, alignment=Qt.AlignCenter)
 
         labels = [QLabel('population: '), QLabel('class: '), QLabel('group: ')]  # , QLabel('time of\ninterest: ')]
-        self.cb_options = [['targets', 'effectors'], ['class'], ['group']]  # , ['t0','first detection']]
+        self.cb_options = [self.parent_window.parent_window.populations, ['class'], ['group']]  # , ['t0','first detection']]
         self.cbs = [QComboBox() for i in range(len(labels))]
         self.cbs[0].currentIndexChanged.connect(self.set_classes_and_times)
 
@@ -145,7 +143,7 @@ class ConfigMeasurementsPlot(QWidget,Styles):
         # self.abs_time_checkbox = QCheckBox('absolute time')
         # self.frame_slider = QLabeledSlider()
         # self.frame_slider.setSingleStep(1)
-        # self.frame_slider.setOrientation(1)
+        # self.frame_slider.setOrientation(Qt.Horizontal)
         # self.frame_slider.setRange(0,self.parent.parent.len_movie)
         # self.frame_slider.setValue(0)
         # self.frame_slider.setEnabled(False)
@@ -202,14 +200,20 @@ class ConfigMeasurementsPlot(QWidget,Styles):
         class_idx = np.array([s.startswith('class_') for s in self.all_columns])
         group_idx = np.array([s.startswith('group_') for s in self.all_columns])
 
+        print(f'{class_idx=} {group_idx=} {self.all_columns=}')
         # time_idx = np.array([s.startswith('t_') for s in self.all_columns])
-
         try:
-            class_columns = list(self.all_columns[class_idx])
-            group_columns = list(self.all_columns[group_idx])
+            if len(class_idx)>0:
+                class_columns = list(self.all_columns[class_idx])
+            else:
+                class_columns = []
+            if len(group_idx)>0:
+                group_columns = list(self.all_columns[group_idx])
+            else:
+                group_columns = []
         # time_columns = list(self.all_columns[time_idx])
-        except:
-            print('columns not found')
+        except Exception as e:
+            print(f'L210 columns not found {e}')
             self.auto_close = True
             return None
 
@@ -227,7 +231,7 @@ class ConfigMeasurementsPlot(QWidget,Styles):
         is_number = np.vectorize(lambda x: np.issubdtype(x, np.number))
         feats = cols[is_number(self.df.dtypes)]
 
-        self.feature_choice_widget = QWidget()
+        self.feature_choice_widget = CelldetectiveWidget()
         self.feature_choice_widget.setWindowTitle("Select numeric feature")
         layout = QVBoxLayout()
         self.feature_choice_widget.setLayout(layout)
@@ -250,7 +254,7 @@ class ConfigMeasurementsPlot(QWidget,Styles):
         is_number = np.vectorize(lambda x: np.issubdtype(x, np.number))
         feats = cols[is_number(self.df.dtypes)]
 
-        self.feature_choice_widget = QWidget()
+        self.feature_choice_widget = CelldetectiveWidget()
         self.feature_choice_widget.setWindowTitle("Select numeric feature")
         layout = QVBoxLayout()
         self.feature_choice_widget.setLayout(layout)
@@ -299,7 +303,7 @@ class ConfigMeasurementsPlot(QWidget,Styles):
             # prepare survival
 
             # plot survival
-            self.survivalWidget = QWidget()
+            self.survivalWidget = CelldetectiveWidget()
             self.scroll = QScrollArea()
             self.survivalWidget.setMinimumHeight(int(0.8 * self.screen_height))
             self.survivalWidget.setWindowTitle('signals')
@@ -500,7 +504,7 @@ class ConfigMeasurementsPlot(QWidget,Styles):
                 if name + ':' in lbl:
                     self.usable_well_labels.append(lbl)
 
-        self.line_choice_widget = QWidget()
+        self.line_choice_widget = CelldetectiveWidget()
         self.line_check_vbox = QVBoxLayout()
         self.line_choice_widget.setLayout(self.line_check_vbox)
         if len(self.well_indices) > 1:

celldetective/gui/plot_signals_ui.py

@@ -1,9 +1,9 @@
-from PyQt5.QtWidgets import QMessageBox, QComboBox, \
-	QCheckBox, QLineEdit, QVBoxLayout, QWidget, QLabel, QHBoxLayout, QPushButton
+from PyQt5.QtWidgets import QComboBox, \
+	QCheckBox, QLineEdit, QVBoxLayout, QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QIcon, QDoubleValidator
+from PyQt5.QtGui import QDoubleValidator
 
-from celldetective.gui.gui_utils import center_window
+from celldetective.gui.gui_utils import center_window, generic_message
 from celldetective.gui.generic_signal_plot import GenericSignalPlotWidget
 from superqt import QLabeledSlider, QColormapComboBox, QSearchableComboBox
 from celldetective.utils import get_software_location, _extract_labels_from_config, extract_cols_from_table_list
@@ -16,12 +16,14 @@ plt.rcParams['svg.fonttype'] = 'none'
 from glob import glob
 from natsort import natsorted
 import math
-from celldetective.gui import Styles
+from celldetective.gui import CelldetectiveWidget
 from matplotlib import colormaps
 import matplotlib.cm
+from celldetective.relative_measurements import expand_pair_table
+from celldetective.neighborhood import extract_neighborhood_in_pair_table
 
 
-class ConfigSignalPlot(QWidget, Styles):
+class ConfigSignalPlot(CelldetectiveWidget):
 	
 	"""
 	UI to set survival instructions.
@@ -33,7 +35,6 @@ class ConfigSignalPlot(QWidget, Styles):
 		super().__init__()
 		self.parent_window = parent_window
 		self.setWindowTitle("Configure signal plot")
-		self.setWindowIcon(QIcon(os.sep.join(['celldetective','icons','mexican-hat.png'])))
 		self.exp_dir = self.parent_window.exp_dir
 		self.soft_path = get_software_location()		
 		self.exp_config = self.exp_dir +"config.ini"
@@ -57,7 +58,6 @@ class ConfigSignalPlot(QWidget, Styles):
 
 		if self.auto_close:
 			self.close()
-		self.setAttribute(Qt.WA_DeleteOnClose)
 
 	def interpret_pos_location(self):
 		
@@ -92,10 +92,30 @@ class ConfigSignalPlot(QWidget, Styles):
 		main_layout.addWidget(panel_title, alignment=Qt.AlignCenter)
 
 		pops = []
-		for population in ['effectors','targets','pairs']:
+		self.cols_per_pop = {}
+		for population in self.parent_window.parent_window.populations:
 			tables = glob(self.exp_dir+os.sep.join(['W*','*','output','tables',f'trajectories_{population}.csv']))
 			if len(tables)>0:
 				pops.append(population)
+				cols = extract_cols_from_table_list(tables)
+				
+				# check for neighbor pairs
+				neigh_cols = [c for c in cols if c.startswith('inclusive_count_neighborhood')]
+				neigh_pairs = [c.split('_(')[-1].split(')_')[0].split('-') for c in neigh_cols]
+				neigh_pairs = ['-'.join(c) for c in neigh_pairs]
+				for k in range(len(neigh_pairs)):
+					if "_self_" in neigh_pairs[k]:
+						neigh_pairs[k] = '-'.join([population, population])
+				pops.extend(neigh_pairs)
+
+				self.cols_per_pop.update({population: cols})
+
+		# pops = []
+		# for population in self.parent_window.parent_window.populations+['pairs']:
+		# 	tables = glob(self.exp_dir+os.sep.join(['W*','*','output','tables',f'trajectories_{population}.csv']))
+		# 	if len(tables)>0:
+		# 		pops.append(population)
+
 
 		labels = [QLabel('population: '), QLabel('class: '), QLabel('time of\ninterest: '), QLabel('cmap: ')]
 		self.cb_options = [pops,[], [], []]
@@ -128,7 +148,7 @@ class ConfigSignalPlot(QWidget, Styles):
 		self.abs_time_checkbox = QCheckBox('absolute time')
 		self.frame_slider = QLabeledSlider()
 		self.frame_slider.setSingleStep(1)
-		self.frame_slider.setOrientation(1)
+		self.frame_slider.setOrientation(Qt.Horizontal)
 		self.frame_slider.setRange(0,self.parent_window.parent_window.len_movie)
 		self.frame_slider.setValue(0)
 		self.frame_slider.setEnabled(False)
@@ -168,7 +188,7 @@ class ConfigSignalPlot(QWidget, Styles):
 		n_cells_layout.setContentsMargins(20,3,20,3)
 		self.n_cells_slider = QLabeledSlider()
 		self.n_cells_slider.setSingleStep(1)
-		self.n_cells_slider.setOrientation(1)
+		self.n_cells_slider.setOrientation(Qt.Horizontal)
 		self.n_cells_slider.setRange(1,100)
 		self.n_cells_slider.setValue(2)
 		n_cells_layout.addWidget(QLabel('min # cells\nfor pool:'), 33)
@@ -188,35 +208,83 @@ class ConfigSignalPlot(QWidget, Styles):
 		# self.show()
 
 	def set_classes_and_times(self):
-
-		# Look for all classes and times
-		population = self.cbs[0].currentText()
-		tables = natsorted(glob(self.exp_dir+os.sep.join(['W*','*','output','tables',f'trajectories_{population}.csv'])))
 		
-		self.all_columns = extract_cols_from_table_list(tables)
+		# Look for all classes and times
+		self.neighborhood_keys = None
+		self.population = self.cbs[0].currentText()
+		pop_split = self.population.split('-')
+
+		if len(pop_split)==2:
+
+			self.population = 'pairs'
+			tables_pairs = glob(self.exp_dir+os.sep.join(['W*','*','output','tables',f'trajectories_pairs.csv']))
+			if not tables_pairs:
+				print('No pair table found... please compute the pair measurements...')
+				return None
+			self.cols_pairs = extract_cols_from_table_list(tables_pairs)
+
+			self.population_reference = pop_split[0]
+			self.population_neigh = pop_split[1]
+
+			cols_ref = self.cols_per_pop[self.population_reference]
+			cols_neigh = self.cols_per_pop[self.population_neigh]
+
+			time_cols_ref = np.array([s.startswith('t_') or s=='t0' for s in cols_ref])
+			if len(time_cols_ref)>0:
+				time_cols_ref = list(cols_ref[time_cols_ref])
+				time_cols_ref = ['reference_'+t for t in time_cols_ref]
+
+			time_cols_neigh = np.array([s.startswith('t_') or s=='t0' for s in cols_neigh])
+			if len(time_cols_neigh)>0:
+				time_cols_neigh = list(cols_neigh[time_cols_neigh])
+				time_cols_neigh = ['neighbor_'+t for t in time_cols_neigh]
+
+			if self.population_reference!=self.population_neigh:
+				self.neighborhood_keys = [c[16:] for c in cols_ref if c.startswith('inclusive_count_neighborhood') and str(self.population_neigh) in c]
+			else:
+				self.neighborhood_keys = [c[16:] for c in cols_ref if c.startswith('inclusive_count_neighborhood') and str(self.population_neigh) not in c]
+
+			time_idx = np.array([s.startswith('t_') or s.startswith('t0') for s in self.cols_pairs])
+			time_cols_pairs = list(self.cols_pairs[time_idx])
+			time_columns = time_cols_ref + time_cols_neigh + time_cols_pairs
+
+			class_cols_ref = [c.replace('reference_t_','reference_class_') for c in time_cols_ref]
+			class_cols_neigh = [c.replace('neighbor_t_','neighbor_class_') for c in time_cols_neigh]
+			class_cols_pairs = [c.replace('t_','class_') for c in time_cols_neigh if c.startswith('t_')]
+			class_columns = class_cols_ref + class_cols_neigh + class_cols_pairs
+		else:
+			tables = natsorted(glob(self.exp_dir+os.sep.join(['W*','*','output','tables',f'trajectories_{self.population}.csv'])))
+			self.all_columns = extract_cols_from_table_list(tables)
+
+			class_idx = np.array([s.startswith('class_') for s in self.all_columns])
+			time_idx = np.array([s.startswith('t_') or s.startswith('t0_') for s in self.all_columns])
+			print(f'{class_idx=} {time_idx=} {self.all_columns=}')
+
+			try:
+				if len(class_idx)>0:
+					class_columns = list(self.all_columns[class_idx])
+				else:
+					class_columns = []
+				if len(time_idx)>0:
+					time_columns = list(self.all_columns[time_idx])
+				else:
+					time_columns = []
+			except Exception as e:
+				print(f'L266 columns not found {e}')
+				self.auto_close = True
+				return None
+			
+			if 'class' in self.all_columns:
+				class_columns.append("class")
+			if 't0' in self.all_columns:
+				time_columns.append('t0')
 
-		class_idx = np.array([s.startswith('class_') for s in self.all_columns])
-		time_idx = np.array([s.startswith('t_') for s in self.all_columns])
-		
-		try:
-			class_columns = list(self.all_columns[class_idx])
-			time_columns = list(self.all_columns[time_idx])
-		except:
-			print('columns not found')
-			self.auto_close = True
-			return None
-		
-		if 'class' in self.all_columns:
-			class_columns.append("class")
-		if 't0' in self.all_columns:
-			time_columns.append('t0')
-		
 		self.class_columns = np.unique(class_columns)
 		self.time_columns = np.unique(time_columns)
-		thresh = 18
+		thresh = 30
 		self.class_truncated = [w[:thresh - 3]+'...' if len(w)>thresh else w for w in self.class_columns]
 		self.time_truncated = [w[:thresh - 3]+'...' if len(w)>thresh else w for w in self.time_columns]
-
+	
 		self.cbs[2].clear()
 		self.cbs[2].addItems(self.time_truncated)
 		for i in range(len(self.time_columns)):
@@ -233,7 +301,7 @@ class ConfigSignalPlot(QWidget, Styles):
 		is_number = np.vectorize(lambda x: np.issubdtype(x, np.number))
 		feats = cols[is_number(self.df.dtypes)]
 
-		self.feature_choice_widget = QWidget()
+		self.feature_choice_widget = CelldetectiveWidget()
 		self.feature_choice_widget.setWindowTitle("Select numeric feature")
 		layout = QVBoxLayout()
 		self.feature_choice_widget.setLayout(layout)
@@ -256,7 +324,7 @@ class ConfigSignalPlot(QWidget, Styles):
 		is_number = np.vectorize(lambda x: np.issubdtype(x, np.number))
 		feats = cols[is_number(self.df.dtypes)]
 
-		self.feature_choice_widget = QWidget()
+		self.feature_choice_widget = CelldetectiveWidget()
 		self.feature_choice_widget.setWindowTitle("Select numeric feature")
 		layout = QVBoxLayout()
 		self.feature_choice_widget.setLayout(layout)
@@ -316,14 +384,8 @@ class ConfigSignalPlot(QWidget, Styles):
 		if self.df is not None:
 
 			if class_col not in list(self.df.columns):
-				msgBox = QMessageBox()
-				msgBox.setIcon(QMessageBox.Warning)
-				msgBox.setText("The class of interest could not be found in the data. Abort.")
-				msgBox.setWindowTitle("Warning")
-				msgBox.setStandardButtons(QMessageBox.Ok)
-				returnValue = msgBox.exec()
-				if returnValue == QMessageBox.Ok:
-					return None
+				generic_message("The class of interest could not be found in the data. Abort.")
+				return None
 			else:
 				self.ask_for_features()
 		else:
@@ -341,23 +403,17 @@ class ConfigSignalPlot(QWidget, Styles):
 		self.well_option = self.parent_window.parent_window.well_list.getSelectedIndices()		
 		self.position_option = self.parent_window.parent_window.position_list.getSelectedIndices()
 
-		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=self.well_option, position_option=self.position_option, population=self.cbs[0].currentText(), return_pos_info=True)
+		self.df, self.df_pos_info = load_experiment_tables(self.exp_dir, well_option=self.well_option, position_option=self.position_option, population=self.population, return_pos_info=True)
+
+		if self.population=='pairs':
+			self.df = expand_pair_table(self.df)
+			self.df = extract_neighborhood_in_pair_table(self.df, reference_population=self.population_reference, neighbor_population=self.population_neigh, neighborhood_key=self.neighborhood_keys[0], contact_only=True)
 
 		if self.df is None:
-			
 			print('No table could be found...')
-			msgBox = QMessageBox()
-			msgBox.setIcon(QMessageBox.Warning)
-			msgBox.setText("No table could be found to compute survival...")
-			msgBox.setWindowTitle("Warning")
-			msgBox.setStandardButtons(QMessageBox.Ok)
-			returnValue = msgBox.exec()
-			if returnValue == QMessageBox.Ok:
-				self.close()
-				return None
-			else:
-				self.close()
-				return None
+			generic_message("No table could be found to compute survival...")
+			self.close()
+			return None
 		else:
 			self.df_well_info = self.df_pos_info.loc[:,['well_path', 'well_index', 'well_name', 'well_number', 'well_alias']].drop_duplicates()
 
@@ -366,14 +422,7 @@ class ConfigSignalPlot(QWidget, Styles):
 		# Check to move at the beginning
 		self.open_widget = True
 		if len(self.time_columns)==0:
-			msgBox = QMessageBox()
-			msgBox.setIcon(QMessageBox.Warning)
-			msgBox.setText("No synchronizing time is available...")
-			msgBox.setWindowTitle("Warning")
-			msgBox.setStandardButtons(QMessageBox.Ok)
-			returnValue = msgBox.exec()
-			if returnValue == QMessageBox.Ok:
-				pass
+			generic_message("No synchronizing time is available...")
 			self.open_widget = False
 			return None
 
@@ -383,6 +432,10 @@ class ConfigSignalPlot(QWidget, Styles):
 			print('Warning... The dataset is empty. Please check your filters. Abort...')
 			return None
 
+		pairs=False
+		if self.population=='pairs':
+			pairs=True
+
 		max_time = int(self.df.FRAME.max()) + 1
 		class_col = self.class_columns[self.cbs[1].currentIndex()]
 		time_col = self.time_columns[self.cbs[2].currentIndex()]
@@ -391,9 +444,9 @@ class ConfigSignalPlot(QWidget, Styles):
 
 		for block,movie_group in self.df.groupby(['well','position']):
 
-			well_signal_mean, well_std_mean, timeline_all, matrix_all = mean_signal(movie_group, self.feature_selected, class_col, time_col=time_col, class_value=None, return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value())
-			well_signal_event, well_std_event, timeline_event, matrix_event = mean_signal(movie_group, self.feature_selected, class_col, time_col=time_col, class_value=[0], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value())
-			well_signal_no_event, well_std_no_event, timeline_no_event, matrix_no_event = mean_signal(movie_group, self.feature_selected, class_col, time_col=time_col, class_value=[1], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value())
+			well_signal_mean, well_std_mean, timeline_all, matrix_all = mean_signal(movie_group, self.feature_selected, class_col, time_col=time_col, class_value=None, return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value(),pairs=pairs)
+			well_signal_event, well_std_event, timeline_event, matrix_event = mean_signal(movie_group, self.feature_selected, class_col, time_col=time_col, class_value=[0], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value(),pairs=pairs)
+			well_signal_no_event, well_std_no_event, timeline_no_event, matrix_no_event = mean_signal(movie_group, self.feature_selected, class_col, time_col=time_col, class_value=[1], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value(),pairs=pairs)
 			self.mean_plots_timeline = timeline_all
 
 			self.df_pos_info.loc[self.df_pos_info['pos_path'] == block[1], 'signal'] = [
@@ -406,9 +459,9 @@ class ConfigSignalPlot(QWidget, Styles):
 		# Per well
 		for well,well_group in self.df.groupby('well'):
 
-			well_signal_mean, well_std_mean, timeline_all, matrix_all = mean_signal(well_group, self.feature_selected, class_col, time_col=time_col, class_value=None, return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value())
-			well_signal_event, well_std_event, timeline_event, matrix_event = mean_signal(well_group, self.feature_selected, class_col, time_col=time_col, class_value=[0], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value())			
-			well_signal_no_event, well_std_no_event, timeline_no_event, matrix_no_event = mean_signal(well_group, self.feature_selected, class_col, time_col=time_col, class_value=[1], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value())
+			well_signal_mean, well_std_mean, timeline_all, matrix_all = mean_signal(well_group, self.feature_selected, class_col, time_col=time_col, class_value=None, return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value(),pairs=pairs)
+			well_signal_event, well_std_event, timeline_event, matrix_event = mean_signal(well_group, self.feature_selected, class_col, time_col=time_col, class_value=[0], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value(),pairs=pairs)			
+			well_signal_no_event, well_std_no_event, timeline_no_event, matrix_no_event = mean_signal(well_group, self.feature_selected, class_col, time_col=time_col, class_value=[1], return_matrix=True, forced_max_duration=max_time, projection=self.pool_option_cb.currentText(), min_nbr_values=self.n_cells_slider.value(),pairs=pairs)
 			
 			self.df_well_info.loc[self.df_well_info['well_path']==well,'signal'] = [{'mean_all': well_signal_mean, 'std_all': well_std_mean,'matrix_all': matrix_all,'mean_event': well_signal_event, 'std_event': well_std_event,
 																					'matrix_event': matrix_event,'mean_no_event': well_signal_no_event, 'std_no_event': well_std_no_event, 'matrix_no_event': matrix_no_event, 'timeline':  self.mean_plots_timeline}]