a fix for iterating CTS twice

PsychoinformaticsLab · Jun 1, 2018 · 4e938d7 · 4e938d7
1 parent f13698e
commit 4e938d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pliers/stimuli/text.py b/pliers/stimuli/text.py
@@ -195,8 +195,10 @@ def __iter__(self):
         """ Iterate text elements. """
         for elem in self._elements:
             offset = 0.0 if self.onset is None else self.onset
-            elem.onset = offset if elem.onset is None else offset + elem.onset
-            yield elem
+            # Calculate element onset relative to this stimulus
+            rel_onset = offset if elem.onset is None else offset + elem.onset
+            yield TextStim(elem.filename, elem.text, rel_onset, elem.duration,
+                           elem.order)
 
     def _to_tup(self, sec):
         hours = int(sec / 3600)

diff --git a/pliers/tests/test_stims.py b/pliers/tests/test_stims.py
@@ -148,6 +148,7 @@ def test_complex_text_stim():
     stim = ComplexTextStim(join(text_dir, 'complex_stim_no_header.txt'),
                            columns='ot', default_duration=0.2, onset=4.2)
     assert stim.elements[2].onset == 38.2
+    assert stim.elements[1].onset == 24.2
     stim = ComplexTextStim(join(text_dir, 'complex_stim_with_header.txt'))
     assert len(stim.elements) == 4
     assert stim.elements[2].duration == 0.1