Merge dev into diadems

diff --cc timeside/analyzer/core.py
Simple merge

diff --cc timeside/analyzer/irit_speech_entropy.py
index 1d91cbe3fa983698a8f79fa462a030f0cead6706,febf1a4ddab24eb4a73ac741cefcc80a1488fa83..1de8d77e7be7a7ec4f39c189ce7db186184d13e1
--- 1/timeside/analyzer/irit_speech_entropy.py
--- 2/timeside/analyzer/irit_speech_entropy.py
+++ b/timeside/analyzer/irit_speech_entropy.py
@@@ -110,11 -98,10 +111,11 @@@ class IRITSpeechEntropy(Analyzer)
          segs.label_metadata.label = label
  
          segs.data_object.label = [convert[s[2]] for s in segList]
 -        segs.data_object.time = [(float(s[0]) * self.blocksize() /
 +        segs.data_object.time = [(float(s[0]) * self.input_blocksize /
                                   self.samplerate())
                                   for s in segList]
-         segs.data_object.duration = [(float(s[1]-s[0]+1) * self.blocksize() /
 +
+         segs.data_object.duration = [(float(s[1] - s[0] + 1) * self.blocksize() /
                                       self.samplerate())
                                       for s in segList]
  

diff --cc timeside/analyzer/utils.py
Simple merge