Fix bug in the application of the stretch_factor and the timeshift. B…

…oth can occur independently from each other, so you need to if tests.

The division by 2 in case of the timeshift is maybe not right, but it was working for my data.

jointly/synchronizer.py

@@ -189,9 +189,10 @@ def get_synced_data(self, recalculate=False):
         start_time = self.ref_signals.index.min()
         for source_name, source in self.sources.items():
             data = source['data'].copy()
-            if source['stretch_factor'] is not 1:
+            if source['stretch_factor'] != 1:
                 data = Synchronizer._stretch_signals(data, source['stretch_factor'], start_time)
-                data = data.shift(1, freq=source['timeshift'])
+            if source['timeshift'] is not None:
+                data = data.shift(1, freq=source['timeshift'] / 2)
             synced_data[source_name] = data
         return synced_data