Update graph.py

graph.py

@@ -26,18 +26,12 @@ def normalise_transcript(xcp):
 
 
 def get_pitch_tracks(wav_path):
-  f0_data = subprocess.run(["REAPER/build/reaper", "-i", wav_path, '-a']).stdout
-  #with open('tmp.f0','r') as handle:
-  f0_data = f0_data.split('EST_Header_End\n')[1].splitlines()
-  print(f0_data) #!!!!!!!!!!!!!!!!!!!!!
-  f0_data = [l.split(' ') for l in f0_data]
-  f0_data = [ [float(t), float(f)] for t,v,f in f0_data if v=='1']
-  f0_data = [[t,f0] for t,prob,f0 in f0_data if prob==1.0]
-  return f0_data
-
-
-
-
+    f0_data = subprocess.run(["REAPER/build/reaper", "-i", wav_path, '-f', '/dev/stdout', '-a'],capture_output=True).stdout
+    f0_data = f0_data.decode().split('EST_Header_End\n')[1].splitlines()
+    #print(f0_data) #!!!!!!!!!!!!!!!!!!!!!
+    f0_data = [l.split(' ') for l in f0_data[:-1]] # the last line is other info
+    f0_data = [ [float(t), float(f)] for t,v,f in f0_data if v=='1']
+    return f0_data
 
 
 # transcript could be from a corpus with the wav file,
@@ -45,6 +39,9 @@ def get_pitch_tracks(wav_path):
 # or from a previous speech recognition process
 def align_and_graph(wav_path, transcript, aligner_function):
 
+    plt.close('all')
+
+    
     # fetch data
     speech = readwav(wav_path)
     w_align, seg_align = aligner_function(speech,normalise_transcript(transcript))
@@ -106,7 +103,6 @@ def align_and_graph(wav_path, transcript, aligner_function):
     
     return fig
     
-    #plt.close('all')
 
 
 # uppboðssøla bussleiðini viðmerkingar upprunaligur