Color-coded amplitude scatter plots. But wait there's more. Grids.

Author: edmerix

@SplitMerge/SplitMerge.m

@@ -499,7 +499,7 @@ function saveAsSpikes(app,~)
             % set app.Data.modified to 1 to force re-plots when changing
             % tabs, or after a merge, etc. One flag for each tab.
             app.Data.modified = [0 0 0 0 0 0];
-            app.Data.modifylist = [];
+            app.Data.modifyList = [];
 
             if ~app.Settings.Debugging
                 warning('off','MATLAB:callback:error');

@SplitMerge/UnitSelection.m

@@ -23,6 +23,8 @@ function UnitSelection(app,event)
     end
     xlim(app.MergedWaves,[t(1) t(end)]);
     ylim(app.MergedWaves,[mn-10 mx+10])
+    app.MergedWaves.XGrid = 'on';
+    app.MergedWaves.YGrid = 'on';
 
     if ~isempty(app.Data.Selected)
         plotDetectionCriterion(app,app.MergedMissing);

@SplitMerge/mergeNow.m

@@ -6,14 +6,15 @@ function mergeNow(app,~)
 
     app.MergeButton.Enable = 'off';
     app.GarbageButton.Enable = 'off';
-
+    app.Data.modifyList(end+1) = app.Data.Selected(1);
+    
     for s = 2:length(app.Data.Selected)
         if app.Settings.Debugging
             disp([9 'Merging ' num2str(app.Data.Selected(s)) ' with ' num2str(app.Data.Selected(1))])
         end
         % dependent on merge_clusters from UMS:
         app.Data.spikes = merge_clusters(app.Data.spikes,app.Data.Selected(1),app.Data.Selected(s));
-
+        app.Data.modifyList(end+1) = app.Data.Selected(s);
         %pushHistory(app,'m',app.Data.Selected(s),app.Data.Selected(1));
     end
     app.Data.modified = ones(1,length(app.Data.modified)); % one flag for each tab

@SplitMerge/plotAC.m

@@ -48,5 +48,6 @@ function plotAC(app,ax,ids)
     set(ax,'YLim',[0 ymax])
     xlabel(ax,'Time lag (ms)')
     ylabel(ax,'Autocorrelation (Hz)')
+    grid(ax,'on');
     title(ax,['\color{' rpvCol '}' num2str(rpv) ' RPV' plural ' (' num2str((rpv/length(spiketimes))*100,'%2.2f') '%)'])
 end

@SplitMerge/plotDetectionCriterion.m

@@ -28,6 +28,7 @@ function plotDetectionCriterion(app,ax,ids)
     line(ax,[1 1]*my_sign, get(ax,'YLim'),'LineStyle','--','Color',[0 0 0],'LineWidth',2);
 
     set(ax,'XLim',sort([global_ex 0]));
+    grid(ax,'on');
 
     title(ax,['Estimated missing spikes: ' num2str(p*100,'%2.1f') '%']);
 

@SplitMerge/plotFR.m

@@ -44,17 +44,31 @@ function plotFR(app,ax,ids)
     yyaxis(ax,'right');
     cla(ax)
     memberwaves = app.Data.spikes.waveforms(ids,:);
+    assigns = app.Data.spikes.assigns(ids);
+    unq = unique(assigns);
     amp = range(memberwaves');
 
+    %{
     if isequal(app.Data.spikes.params.display.max_scatter, 'all')
         ind = 1:length(amp);
     else
         choice = randperm(length(amp));
         max_pos = min(length(amp), app.Data.spikes.params.display.max_scatter);
         ind = choice(1:max_pos);
     end
-    l = scatter(ax,spiketimes(ind),amp(ind));
-    set(l,'Marker','.','MarkerEdgeColor',[.3 .5 .3],'MarkerEdgeAlpha',0.4,'MarkerFaceAlpha',0.5)
+    %}
+    hold(ax,'on');
+    for u = 1:length(unq)
+        sub = assigns == unq(u); % If turning on the isequal clause above, this should be: sub = assigns(ind) == unq(u);
+        col = unique(app.Data.spikes.assigns) == unq(u);
+        scatter(ax,spiketimes(sub),amp(sub),20,'filled',...
+            'MarkerEdgeColor',app.Data.colors(col,:),...
+            'MarkerEdgeAlpha',0.4,'MarkerFaceAlpha',0.5,...
+            'MarkerFaceColor',app.Data.colors(col,:));
+        set(ax,'Xlim',tlims)
+    end
+    %l = scatter(ax,spiketimes(ind),amp(ind));
+    %set(l,'Marker','.','MarkerEdgeColor',[.3 .5 .3],'MarkerEdgeAlpha',0.4,'MarkerFaceAlpha',0.5)
     set(ax,'Xlim',tlims)
     set(ax,'YLim',[0 max(amp)])
     xlabel(ax,'Time (s)')

@SplitMerge/plotUnits.m

@@ -1,7 +1,7 @@
 function plotUnits(app)
     if app.Data.modified(1) || app.Data.doFirstPlot(1)
         %TODO: we now store which cluster IDs have been modified in
-        % app.Data.modifylist. We should only update those axes!
+        % app.Data.modifyList. We should only update those axes!
         app.Data.loader = uiprogressdlg(app.UIFigure,'Title','Please Wait',...
             'Message','Loading clusters');
         % Delete all previous spike panels