diff --git a/analysis.py b/analysis.py
index 8a35488..73b689a 100644
--- a/analysis.py
+++ b/analysis.py
@@ -17,7 +17,7 @@ def main():
     # parser.add_argument("dir", help="folder containing the cell folders with the fit results")
     # args = parser.parse_args()
 
-    dir_path = "results/final_sam/"  # args.dir
+    dir_path = "results/final_sam2/"  # args.dir
     plot_fi_curves_differences(dir_path)
     quit()
     # if not os.path.isdir(dir_path):
diff --git a/sam_experiments.py b/sam_experiments.py
index d7ce6c2..63b8121 100644
--- a/sam_experiments.py
+++ b/sam_experiments.py
@@ -10,7 +10,7 @@ import os
 
 
 def main():
-    run_sam_analysis_for_all_cells("results/final_sam")
+    run_sam_analysis_for_all_cells("results/final_sam2")
 
     # sam_analysis("results/final_2/2011-10-25-ad-invivo-1/")
 
@@ -29,7 +29,7 @@ def main():
 
 def run_sam_analysis_for_all_cells(folder):
     count = 0
-    for item in os.listdir(folder):
+    for item in sorted(os.listdir(folder)):
         cell_folder = os.path.join(folder, item)
         # fit = get_best_fit(cell_folder, use_comparable_error=False)
         # cell_data = fit.get_cell_data()
diff --git a/test.py b/test.py
index 6373fef..0068159 100644
--- a/test.py
+++ b/test.py
@@ -1,17 +1,36 @@
 import os
-
+from parser.CellData import CellData
 # from plottools.axes import labelaxes_params
+import matplotlib.pyplot as plt
+
+
+data_folder = "./data/final/"
+for cell in sorted(os.listdir(data_folder)):
+    print(cell)
+    cell_folder = os.path.join(data_folder, cell)
+    if not os.path.exists(os.path.join(cell_folder, "samspikes1.dat")):
+        continue
+
+    cell_data = CellData(cell_folder)
+    sam_spikes = cell_data.get_sam_spiketimes()
+    delta_freqs = cell_data.get_sam_delta_frequencies()
+    # [time_traces, v1_traces, eod_traces, local_eod_traces, stimulus_traces]
+    [time_traces, v1_traces, eod_traces, local_eod_traces, stimulus_traces] = cell_data.get_sam_traces()
+    print(len(time_traces))
+    # for i in range(len(delta_freqs)):
+    #
+    #     fig, axes = plt.subplots(2, 1, sharex="all")
+    #
+    #     axes[0].plot(time_traces[i], local_eod_traces[i])
+    #     axes[0].set_title("Local EOD - dF {}".format(delta_freqs[i]))
+    #     axes[1].plot(time_traces[i], v1_traces[i])
+    #     axes[1].set_title("v1 trace")
+    #     axes[1].eventplot(sam_spikes[i], lineoffsets=max(v1_traces[i]))
+    #     plt.show()
+    #     plt.close()
+    #     break
 
 
-directory = "data/final"
-count = 0
-for cell in sorted(os.listdir(directory)):
-    cell_dir = os.path.join(directory, cell)
-    if os.path.exists(cell_dir + "/samallspikes1.dat"):
-        print(cell)
-        count += 1
-
-print(count)