v3.2.4

Bugfix: Manual GUI: projection display is correctly updated.
Previously the second unit selection (shown in red) required two right
clicks to update.

Author: jamesjun

change_log.txt

@@ -2,6 +2,10 @@
 J. James Jun
 
 --------------------------------------------------------------------
+[2019/1/12: v3.2.4]
+Bugfix: Manual GUI: projection display is correctly updated.
+  Previously the second unit selection (shown in red) required two right clicks to update.
+
 [2019/1/3: v3.2.3]
 Bugfix: incorrect "gather" function was called for R2017b when Bigdata toolbox is installed.
 Faster and more robust fft_clean operation (run if `fft_thresh` > 0)

default.prm

@@ -16,7 +16,7 @@ fInverse_file = 0;          % Set to 1 to flip the polarity of the signal
 header_offset = 0;          % File header offset (set to 0 for files containing no header info (e.g. WHISPER format)
 
 % #Execution parameters
-version = 'v3.2.3';         % JRCLUST version. Updated on Jan 3, 2018
+version = 'v3.2.4';         % JRCLUST version. Updated on Jan 4, 2018
 fVerbose = 0;               % Verbose flag, set to 0 to suppress displaying extra information 
 fParfor = 1;                % Use Multiple CPU cores (if parallel processing toolbox is installed)
 fGpu = 1;                   % Use GPU if parallel processing toolbox is installed

jrc3.m

@@ -5757,7 +5757,7 @@ function keyPressFcn_FigProj_(hFig, event)
 figure_wait_(1);
 switch lower(event.Key)
     case {'uparrow', 'downarrow'}
-        rescale_FigProj_(event, hFig, S_fig);
+        rescale_FigProj_(event, hFig, S_fig, S0);
 
     case {'leftarrow', 'rightarrow'} % change channels
         fPlot = 0;
@@ -14062,22 +14062,19 @@ function auto_scale_proj_time_(S0, fPlot)
 if nargin<2, fPlot = 0; end
 
 autoscale_pct = get_set_(S0.P, 'autoscale_pct', 99.5);
-[hFig, S_fig] = get_fig_cache_('FigProj');
-% vrY = [S_fig.hPlot0.YData(:); S_fig.hPlot1.YData(:); S_fig.hPlot2.YData(:)];
-[mrMin0, mrMax0, mrMin1, mrMax1, mrMin2, mrMax2] = fet2proj_(S0, S_fig.viSites_show);
-% mrAmp = [mrMin0, mrMax0, mrMin1, mrMax1, mrMin2, mrMax2];
-% mrAmp = [mrMin1, mrMax1, mrMin2, mrMax2];
-% S_fig.maxAmp = quantile(mrAmp(:), autoscale_pct/100);
+[hFig_proj, S_fig_proj] = get_fig_cache_('FigProj');
+[mrMin0, mrMax0, mrMin1, mrMax1, mrMin2, mrMax2] = fet2proj_(S0, S_fig_proj.viSites_show);
 if isempty(mrMin2) || isempty(mrMax2)
     cmrAmp = {mrMin1, mrMax1};
 else
     cmrAmp = {mrMin1, mrMax1, mrMin2, mrMax2};
 end
-S_fig.maxAmp = max(cellfun(@(x)quantile(x(:), autoscale_pct/100), cmrAmp));
-% S_fig.maxAmp %debug
-set(hFig, 'UserData', S_fig);
+S_fig_proj.maxAmp = max(cellfun(@(x)quantile(x(:), autoscale_pct/100), cmrAmp));
+set(hFig_proj, 'UserData', S_fig_proj);
 
-[hFig, S_fig] = get_fig_cache_('FigTime');
+
+% Update time
+[hFig_time, S_fig_time] = get_fig_cache_('FigTime');
 iSite = S0.S_clu.viSite_clu(S0.iCluCopy);
 [vrFet0, vrTime0] = getFet_site_(iSite, [], S0);    % plot background    
 [vrFet1, vrTime1, vcYlabel, viSpk1] = getFet_site_(iSite, S0.iCluCopy, S0); % plot iCluCopy
@@ -14087,14 +14084,15 @@ function auto_scale_proj_time_(S0, fPlot)
     [vrFet2, vrTime2, vcYlabel, viSpk2] = getFet_site_(iSite, S0.iCluPaste, S0); % plot iCluCopy
     vrFet = [vrFet0(:); vrFet1(:); vrFet2(:)];
 end
-S_fig.maxAmp = quantile(vrFet, autoscale_pct/100);
-set(hFig, 'UserData', S_fig);
+S_fig_time.maxAmp = quantile(vrFet, autoscale_pct/100);
+set(hFig_time, 'UserData', S_fig_time);
 
+% plot
 if fPlot
-    keyPressFcn_cell_(get_fig_cache_('FigWav'), {'j', 't'}); 
+    keyPressFcn_cell_(get_fig_cache_('FigWav'), {'j', 't'}, S0); 
 else
-    rescale_FigProj_(S_fig.maxAmp);    
-    rescale_FigTime_(S_fig.maxAmp, S0, S0.P);
+    rescale_FigProj_(S_fig_proj.maxAmp, hFig_proj, S_fig_proj, S0);    
+    rescale_FigTime_(S_fig_time.maxAmp, S0, S0.P);
 end
 end %func
 
@@ -14965,7 +14963,7 @@ function uistack_(h, vc)
 if isempty(S_clu), S_clu = get0_('S_clu'); end
 
 if fText
-    csText_clu = arrayfun(@(i)sprintf('%d (%d)', i, S_clu.vnSpk_clu(i)), 1:S_clu.nClu, 'UniformOutput', 0);
+    csText_clu = arrayfun(@(i)sprintf('%d(%d)', i, S_clu.vnSpk_clu(i)), 1:S_clu.nClu, 'UniformOutput', 0);
 else
     csText_clu = arrayfun(@(i)sprintf('%d', i), 1:S_clu.nClu, 'UniformOutput', 0);
 end
@@ -17865,8 +17863,8 @@ function plot_aux_rate_(fSelectedUnit)
 % 9/29/17 JJJ: Displaying the version number of the program and what's used. #Tested
 function [vcVer, vcDate, vcVer_used] = jrc_version_(vcFile_prm)
 if nargin<1, vcFile_prm = ''; end
-vcVer = 'v3.2.3';
-vcDate = '1/3/2018';
+vcVer = 'v3.2.4';
+vcDate = '1/4/2018';
 vcVer_used = '';
 if nargout==0
     fprintf('%s (%s) installed\n', vcVer, vcDate);

prb/imec2aux.prb

@@ -0,0 +1,26 @@
+% Order of the probe sites in the recording file
+channels = 1 + [40  103 39	104	41	102	38	105	42	101	37	106	43	100	36	107, 44	99	35	108	45	98	34	109	46	97	33	110	47	96	32	111, 48	127	63	112	49	126	62	113	50	125	61	114	51	124	60	115, 52	116	59	123	53	117	58	122	54	118	57	121	55	119	56	120, 8	71	7	72	9	70	6	73	10	74	5	69	11	75	4	68, 12	76	3	67	13	77	2	66	14	78	1	65	15	79	0	64, 16	80	31	95	17	81	30	94	18	82	29	93	19	83	28	92,     20	84	27	91	21	85	26	90	22	86	25	89	23	87	24	88];
+channels(end+1:end+4) = 129:132;
+
+% Site location in micrometers (x and y)
+geometry = zeros(numel(channels), 2);
+geometry(1:2:128,1) = 0;
+geometry(2:2:128,1) = 28;
+geometry(1:2:128,2) = 20*(0:63);
+geometry(2:2:128,2) = geometry(1:2:128,2);
+
+% Reference sites are being excluded
+ref_sites = [1 18 33 50 65 82 97 114];
+channels(ref_sites) = []; 
+geometry(ref_sites,:) = []; 
+
+% Recording contact pad size in micrometers. Height x width
+pad = [12 12];
+
+% Default prm
+maxSite = 6.5;
+um_per_pix = 20;
+nSites_ref = 8;
+
+% Shanks
+% shank = ones(size(channels)); shank(geometry(:,1)>0)=2;