Swp2 plot but reversed

sfs_tools.py

@@ -241,7 +241,7 @@ def barplot_sfs(sfs,  xlab, ylab, folded=True, title = "Barplot", transformed =
             # then plot a theoritical distribution as 1/i
             expected_y = [1/(2*x+1) for x in list(sfs.keys())]
             print(sum(expected_y))
-            plt.plot([x for x in list(sfs.keys())], expected_y, color='r', linestyle='-')
+            #plt.plot([x for x in list(sfs.keys())], expected_y, color='r', linestyle='-')
             #print(expected_y)
             
     customgraphics.barplot(x = [x for x in list(sfs.keys())], y= sfs_val, xlab = xlab, ylab = ylab, title = title)

swp2.py

@@ -35,7 +35,9 @@ def return_x_y_from_stwp_theta_file(stwp_theta_file, breaks, mu, tgen):
     # list of thetas 
     theta_L = []
     sum_t = 0
+    #groups.sort(reverse=True)
     for group_nb, group in enumerate(groups):
+        print(group_nb, group)
         # store all the thetas one by one, with one theta per group
         theta_L.append(float(theta_site[group_nb]))
         # if the group is of size 1
@@ -58,11 +60,13 @@ def return_x_y_from_stwp_theta_file(stwp_theta_file, breaks, mu, tgen):
         sum_t = t[i]
     # build the y axis (sizes)
     y = []
+    #theta_L.sort(reverse=True)
     for theta in theta_L:
         # with size N = theta/4mu
         size = theta / (4*mu)
         y.append(size)
         y.append(size)
+    
     # build the time x axis
     x = [0]
     for time in range(0, len(t.values())-1):
@@ -70,6 +74,9 @@ def return_x_y_from_stwp_theta_file(stwp_theta_file, breaks, mu, tgen):
         x.append(list(t.values())[time])
     x.append(list(t.values())[len(t.values())-1])
 
+    #x.sort(reverse=True)
+    #y.sort(reverse=True)
+    
     return x,y,likelihood
 
 def plot_3epochs_thetafolder(folder_path, mu, tgen, breaks = 2, title = "Title"):