switched to v2

README.md

@@ -1,7 +1,3 @@
-# DEPRECATION NOTICE
-
-`spikesort` in this form will not be developed further. It will be replaced by a modern, class-based framework that is data and method agnostic. See [here](https://github.com/sg-s/spikesort/tree/v2-class-based) for information on how it is progressing, or if you want to try it out.
-
 # spikesort
 
 > Looking for the old `spikesort`? Go [here](https://github.com/sg-s/spikesort/tree/bf519e8e0caaf886ea14cc87c3b94d424574241d)

build_number

@@ -1 +1 @@
-     228
+     247

default.m

@@ -15,10 +15,6 @@
 
 %% ~~~~~~~~~~~~~~~~~  GENERAL  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
-ssDebug = false; 			% should spikesort run in debug mode?
-=======
->>>>>>> v2-class-based
 useFastBandPass = false; 	% use a fast, FFT-based bandPass? 
 
 %% ~~~~~~~~~~~~~~~~~  DISPLAY  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -32,7 +28,7 @@
 show_r2 = false;			% show r2 in firing rate plot
 fs = 14; 					% UI font size
 fw = 'bold'; 				% UI font weight
-plot_control = false; 		% should spikesort plot the control signals instead of the stimulus?
+plot_control = true; 		% should spikesort plot the control signals instead of the stimulus?
 
 % UI
 smart_scroll = true; 				% intelligently scroll so we keep # visible spikes constant 
@@ -60,7 +56,7 @@
 minimum_peak_distance = 1; 			% how separated should the peaks be?
 V_cutoff = -1; 						% ignore peaks beyond this limit 
 band_pass = [100 1000]; 			% in Hz. band pass V to find spikes more easily 
-invert_V = false; 					% sometimes, it is easier to find spikes if you invert V
+invert_V = true; 					% sometimes, it is easier to find spikes if you invert V
 
 % spike resolution
 remove_doublets = true;				% resolve doublet peaks, which are very likely AB or BA, not AA or BB