doRecompute on import

JaneliaSciComp · Nov 30, 2020 · 3903a23 · 3903a23
1 parent 94c9c13
commit 3903a23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/+jrclust/+import/kilosort.m b/+jrclust/+import/kilosort.m
@@ -289,6 +289,7 @@
               'pcFeatureInd', iNeighPC);
 
 hClust = jrclust.sort.TemplateClustering(hCfg, sRes, dRes);
+hClust.doRecompute();
 
 res = jrclust.utils.mergeStructs(dRes, sRes);
 res.hClust = hClust;

diff --git a/+jrclust/+sort/@DensityPeakClustering/DensityPeakClustering.m b/+jrclust/+sort/@DensityPeakClustering/DensityPeakClustering.m
@@ -79,7 +79,7 @@
 
             obj = obj@jrclust.interfaces.Clustering(hCfg, sRes, dRes);
 
-            if isfield(sRes, 'spikeClusters') && isfield(sRes, 'clusterCenters')
+            if isfield(sRes, 'clusterCenters')
                 obj.clusterCenters = sRes.clusterCenters;
             end
         end

diff --git a/+jrclust/+sort/@TemplateClustering/TemplateClustering.m b/+jrclust/+sort/@TemplateClustering/TemplateClustering.m
@@ -28,6 +28,13 @@
             end
 
             obj = obj@jrclust.interfaces.Clustering(hCfg, sRes, dRes);
+
+            if isfield(sRes, 'templatesByCluster')
+                obj.templatesByCluster = sRes.templatesByCluster;
+            elseif isfield(sRes, 'spikeClusters') && isfield(sRes, 'spikeTemplates')
+                obj.templatesByCluster = cellfun(@(sC) unique(obj.spikeTemplates(sC)), ...
+                    obj.spikesByCluster, 'UniformOutput', 0);
+            end
         end
     end