UnitMatchPy 3.2.7__tar.gz → 3.2.9__tar.gz

{unitmatchpy-3.2.7/UnitMatchPy.egg-info → unitmatchpy-3.2.9}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: UnitMatchPy
-Version: 3.2.7
+Version: 3.2.9
 Summary: Automatic matching of neurons across sessions
-Author: Enny van Beest, Suyash Agarwal, Wentao Qiu
+Author: Enny van Beest, Célian Bimbard, Suyash Agarwal, Wentao Qiu
 License: CC BY-NC-SA 4.0 International
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -10,11 +10,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
-Classifier: License :: Other/Proprietary License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<3.0,>=2.0
+Requires-Dist: numpy<2.0,>=1.21
 Requires-Dist: scipy<2.0,>=1.9
 Requires-Dist: pandas<3.0,>=1.5
 Requires-Dist: matplotlib<4.0,>=3.6
@@ -24,8 +23,6 @@ Requires-Dist: h5py<4.0,>=3.8
 Requires-Dist: scikit-learn<2.0,>=1.2
 Requires-Dist: mtscomp
 Requires-Dist: torch<3.0,>=2.1
-Requires-Dist: mat73<1.0,>=0.62
-Requires-Dist: spikeinterface<0.120,>=0.100
 Provides-Extra: full
 Requires-Dist: mat73<1.0,>=0.62; extra == "full"
 Requires-Dist: spikeinterface<0.120,>=0.100; extra == "full"

{unitmatchpy-3.2.7 → unitmatchpy-3.2.9}/UnitMatchPy/default_params.py

@@ -25,7 +25,8 @@ def get_default_param(param = None):
             'min_angle_dist' : 0.1, # smallest distance for and angle to be consider
             'min_new_shank_distance' : 100, #The smallest distance which separates 2 shanks
             'units_per_shank_thrs' : 15, # threshold for doing per shank drift correction
-            'match_threshold' : 0.5 # probability threshold to consider as a match
+            'match_threshold' : 0.5, # probability threshold to consider as a match
+            'curve_fit_maxfev' : 10000, # max evaluations for decay curve fitting
         }
     
     tmp['score_vector'] = np.arange(tmp['stepsz']/2 ,1 ,tmp['stepsz'])

{unitmatchpy-3.2.7 → unitmatchpy-3.2.9}/UnitMatchPy/param_functions.py

@@ -175,6 +175,7 @@ def decay_and_average_waveform(waveform, channel_pos, good_idx, max_site, max_si
     new_peak_loc = param['peak_loc']
     waveidx = param['waveidx']
     channel_radius = param['channel_radius']
+    maxfev = param.get('curve_fit_maxfev', 10000)
     session_id = clus_info['session_id']
 
     spatial_decay_fit = np.zeros((n_units,2))
@@ -196,7 +197,14 @@ def decay_and_average_waveform(waveform, channel_pos, good_idx, max_site, max_si
             dist_to_max_chan = dist_to_max_chan[dist_to_max_chan != 0]
 
             # there is variation in how different programming languages/options fit to a curve
-            popt, pcurve = sp.optimize.curve_fit(exponential_func, dist_to_max_chan.T , tmp_amp, p0 = (np.max(tmp_amp), 0.05), method = 'trf', maxfev=2000)
+            popt, pcurve = sp.optimize.curve_fit(
+                exponential_func,
+                dist_to_max_chan.T,
+                tmp_amp,
+                p0=(np.max(tmp_amp), 0.05),
+                method='trf',
+                maxfev=maxfev,
+            )
             #popt, pcurve = sp.optimize.least_squares(exponential_func, Dist2MaxChan, TmpAmp, p0 = (np.max(TmpAmp), 0.05) )
 
             spatial_decay_fit[i,cv] = popt[1]
@@ -406,4 +414,4 @@ def get_avg_waveform_per_tp(waveform, channel_pos, d_10, max_site_mean, amplitud
                 avg_waveform_per_tp[dim, uid, good_wave_idxs[uid,:,cv].astype(bool), cv] = gaussian_filter(avg_waveform_per_tp[dim, uid, good_wave_idxs[uid,:,cv].astype(bool), cv], 1, radius = 2, axes = 0)
         
     return waveform_duration, avg_waveform_per_tp, good_wave_idxs
-        
+        

{unitmatchpy-3.2.7 → unitmatchpy-3.2.9/UnitMatchPy.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: UnitMatchPy
-Version: 3.2.7
+Version: 3.2.9
 Summary: Automatic matching of neurons across sessions
-Author: Enny van Beest, Suyash Agarwal, Wentao Qiu
+Author: Enny van Beest, Célian Bimbard, Suyash Agarwal, Wentao Qiu
 License: CC BY-NC-SA 4.0 International
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -10,11 +10,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
-Classifier: License :: Other/Proprietary License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<3.0,>=2.0
+Requires-Dist: numpy<2.0,>=1.21
 Requires-Dist: scipy<2.0,>=1.9
 Requires-Dist: pandas<3.0,>=1.5
 Requires-Dist: matplotlib<4.0,>=3.6
@@ -24,8 +23,6 @@ Requires-Dist: h5py<4.0,>=3.8
 Requires-Dist: scikit-learn<2.0,>=1.2
 Requires-Dist: mtscomp
 Requires-Dist: torch<3.0,>=2.1
-Requires-Dist: mat73<1.0,>=0.62
-Requires-Dist: spikeinterface<0.120,>=0.100
 Provides-Extra: full
 Requires-Dist: mat73<1.0,>=0.62; extra == "full"
 Requires-Dist: spikeinterface<0.120,>=0.100; extra == "full"

{unitmatchpy-3.2.7 → unitmatchpy-3.2.9}/UnitMatchPy.egg-info/requires.txt

@@ -1,4 +1,4 @@
-numpy<3.0,>=2.0
+numpy<2.0,>=1.21
 scipy<2.0,>=1.9
 pandas<3.0,>=1.5
 matplotlib<4.0,>=3.6
@@ -8,8 +8,6 @@ h5py<4.0,>=3.8
 scikit-learn<2.0,>=1.2
 mtscomp
 torch<3.0,>=2.1
-mat73<1.0,>=0.62
-spikeinterface<0.120,>=0.100
 
 [dev]
 pytest

{unitmatchpy-3.2.7 → unitmatchpy-3.2.9}/pyproject.toml

@@ -4,12 +4,16 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "UnitMatchPy"
-version = "3.2.7"  # bump on each release 
+version = "3.2.9"  # bump on each release 
 description = "Automatic matching of neurons across sessions"
 readme = "README.md"         # keep a README.md inside UnitMatchPy/
 requires-python = ">=3.9"
-authors = [{ name = "Enny van Beest, Suyash Agarwal, Wentao Qiu" }]
-
+authors = [
+  { name = "Enny van Beest" },
+  { name = "Célian Bimbard" },
+  { name = "Suyash Agarwal" },
+  { name = "Wentao Qiu" },
+]
 # CC BY-NC-SA 4.0 is not OSI-approved; declare clearly
 license = { text = "CC BY-NC-SA 4.0 International" }
 
@@ -20,11 +24,10 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Operating System :: OS Independent",
-  "License :: Other/Proprietary License",
-]
+ ]
 
 dependencies = [
-  "numpy>=2.0,<3.0",
+  "numpy>=1.21,<2.0",
   "scipy>=1.9,<2.0",
   "pandas>=1.5,<3.0",
   "matplotlib>=3.6,<4.0",
@@ -33,11 +36,7 @@ dependencies = [
   "h5py>=3.8,<4.0",
   "scikit-learn>=1.2,<2.0",
   "mtscomp",
-  "torch>=2.1,<3.0",
-  # If your code imports these unconditionally, keep them here.
-  # If not, move them to extras (recommended).
-  "mat73>=0.62,<1.0",
-  "spikeinterface>=0.100,<0.120",
+  "torch>=2.1,<3.0", 
 ]
 
 [project.optional-dependencies]