Merge pull request #10 from chrhaeusler/master

segmented annotation of speech now included

.gitmodules

@@ -13,3 +13,7 @@
 [submodule "src/bodycontact"]
 	path = src/bodycontact
 	url = https://github.com/psychoinformatics-de/studyforrest-paper-bodycontactannotation.git
+[submodule "src/speech"]
+	path = src/speech
+	url = osf://f5j3e
+	datalad-id = cacc9298-faed-11e9-9b76-e86a64c80559

code/researchcut2segments.py

@@ -153,6 +153,14 @@ def write_segmented_annos(infilename, stimulus, run_dict, out_dir):
     '''
     '''
     basefilename = basename(infilename)[:-4]
+    # rename the speech annotation (since it did not run through the importer
+    # script that renamed e.g. structure.csv to locations.tsv
+    # name it 'speech_ad' because the narrator will also be in it if
+    # segmented into timings of the movie (-> e.g. for control contrasts)
+    print(basefilename)
+    if basefilename == 'fg_rscut_ad_ger_speech_tagged':
+        basefilename = 'speech_ad'
+
     outdir = opj(out_dir, stimulus)
     if not exists(outdir):
         os.makedirs(outdir)

src/speech

@@ -0,0 +1 @@
+Subproject commit dd07b14ee30651f4bdbb46af3b67c43cdc7fb07a