bmtool 0.5.7.1__py3-none-any.whl → 0.5.7.2__py3-none-any.whl

bmtool/bmplot.py

@@ -197,7 +197,7 @@ def probability_connection_matrix(config=None,nodes=None,edges=None,title=None,s
 
     return
 
-def convergence_connection_matrix(config=None,title=None,sources=None, targets=None, sids=None, tids=None, no_prepend_pop=False,save_file=None,convergence=True,method='mean+std',include_gap=True):
+def convergence_connection_matrix(config=None,title=None,sources=None, targets=None, sids=None, tids=None, no_prepend_pop=False,save_file=None,convergence=True,method='mean+std',include_gap=True,return_dict=None):
     """
     Generates connection plot displaying convergence data
     config: A BMTK simulation config 
@@ -213,9 +213,9 @@ def convergence_connection_matrix(config=None,title=None,sources=None, targets=N
         raise Exception("config not defined")
     if not sources or not targets:
         raise Exception("Sources or targets not defined")
-    return divergence_connection_matrix(config,title ,sources, targets, sids, tids, no_prepend_pop, save_file ,convergence, method,include_gap=include_gap)
+    return divergence_connection_matrix(config,title ,sources, targets, sids, tids, no_prepend_pop, save_file ,convergence, method,include_gap=include_gap,return_dict=return_dict)
 
-def divergence_connection_matrix(config=None,title=None,sources=None, targets=None, sids=None, tids=None, no_prepend_pop=False,save_file=None,convergence=False,method='mean+std',include_gap=True):
+def divergence_connection_matrix(config=None,title=None,sources=None, targets=None, sids=None, tids=None, no_prepend_pop=False,save_file=None,convergence=False,method='mean+std',include_gap=True,return_dict=None):
     """
     Generates connection plot displaying divergence data
     config: A BMTK simulation config 
@@ -264,8 +264,12 @@ def divergence_connection_matrix(config=None,title=None,sources=None, targets=No
             title = title + "Synaptic Convergence"
         else:
             title = title + "Synaptic Divergence"
-    plot_connection_info(syn_info,data,source_labels,target_labels,title, save_file=save_file)
-    return
+    if return_dict:
+        dict = plot_connection_info(syn_info,data,source_labels,target_labels,title, save_file=save_file,return_dict=return_dict)
+        return dict
+    else:
+        plot_connection_info(syn_info,data,source_labels,target_labels,title, save_file=save_file)
+        return
 
 def gap_junction_matrix(config=None,title=None,sources=None, targets=None, sids=None,tids=None, no_prepend_pop=False,save_file=None,type='convergence'):
     """
@@ -448,7 +452,7 @@ def edge_histogram_matrix(config=None,sources = None,targets=None,sids=None,tids
     fig.text(0.04, 0.5, 'Source', va='center', rotation='vertical')
     plt.draw()
 
-def plot_connection_info(text, num, source_labels,target_labels, title, syn_info='0', save_file=None):
+def plot_connection_info(text, num, source_labels,target_labels, title, syn_info='0', save_file=None,return_dict=None):
     """
     write about function here
     """
@@ -472,10 +476,12 @@ def plot_connection_info(text, num, source_labels,target_labels, title, syn_info
     plt.setp(ax1.get_xticklabels(), rotation=45, ha="right",
             rotation_mode="anchor", size=12, weight = 'semibold')
     
+    graph_dict = {}
     # Loop over data dimensions and create text annotations.
     for i in range(num_source):
         for j in range(num_target):
             edge_info = text[i,j]
+            graph_dict[str(source_labels[i])+'2'+str(target_labels[j])] = edge_info
             if syn_info =='2' or syn_info =='3':
                 if num_source > 8 and num_source <20:
                     fig_text = ax1.text(j, i, edge_info,
@@ -499,7 +505,10 @@ def plot_connection_info(text, num, source_labels,target_labels, title, syn_info
         fig1.show()
     if save_file:
         plt.savefig(save_file)
-    return
+    if return_dict:
+        return graph_dict
+    else:
+        return
 
 def connector_percent_matrix(csv_path: str = None, exclude_shell: bool = True, 
                              exclude_assembly: bool = False, title: str = 'Percent connection matrix') -> None:

{bmtool-0.5.7.1.dist-info → bmtool-0.5.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bmtool
-Version: 0.5.7.1
+Version: 0.5.7.2
 Summary: BMTool
 Home-page: https://github.com/cyneuro/bmtool
 Download-URL: 
@@ -30,6 +30,7 @@ Requires-Dist: questionary
 Requires-Dist: pynmodlt
 Requires-Dist: xarray
 Requires-Dist: fooof
+Requires-Dist: requests
 
 # bmtool
 A collection of modules to make developing [Neuron](https://www.neuron.yale.edu/neuron/) and [BMTK](https://alleninstitute.github.io/bmtk/) models easier.

{bmtool-0.5.7.1.dist-info → bmtool-0.5.7.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 bmtool/SLURM.py,sha256=AX5MKV7dD-XwS8SROnW1IyesZ3jDwMf0txO6mHxTbuw,13694
 bmtool/__init__.py,sha256=ZStTNkAJHJxG7Pwiy5UgCzC4KlhMS5pUNPtUJZVwL_Y,136
 bmtool/__main__.py,sha256=TmFkmDxjZ6250nYD4cgGhn-tbJeEm0u-EMz2ajAN9vE,650
-bmtool/bmplot.py,sha256=-kw4VOcTnA22JVQi1PzH2E308pcmY1Xo7oqgCnm0cC8,46260
+bmtool/bmplot.py,sha256=C0zlEtUWtP7mSYXYqRjvLhKqMp8wRKe241aHUSnep30,46687
 bmtool/connectors.py,sha256=d5Pt66f9UHm8YY2qJ0mtYbASimczOzfviFxZQWkazjs,71804
 bmtool/graphs.py,sha256=K8BiughRUeXFVvAgo8UzrwpSClIVg7UfmIcvtEsEsk0,6020
 bmtool/manage.py,sha256=_lCU0qBQZ4jSxjzAJUd09JEetb--cud7KZgxQFbLGSY,657
@@ -16,9 +16,9 @@ bmtool/util/commands.py,sha256=zJF-fiLk0b8LyzHDfvewUyS7iumOxVnj33IkJDzux4M,64396
 bmtool/util/util.py,sha256=24E5rUoDU86nqypDF4uZJkuJKO1BrwrQE8lZzAxu1kw,56770
 bmtool/util/neuron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bmtool/util/neuron/celltuner.py,sha256=xSRpRN6DhPFz4q5buq_W8UmsD7BbUrkzYBEbKVloYss,87194
-bmtool-0.5.7.1.dist-info/LICENSE,sha256=qrXg2jj6kz5d0EnN11hllcQt2fcWVNumx0xNbV05nyM,1068
-bmtool-0.5.7.1.dist-info/METADATA,sha256=cgwZVmUCp3LN20uI_TD0FkTlxfvlNDei3HlW1-PVHi4,24107
-bmtool-0.5.7.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-bmtool-0.5.7.1.dist-info/entry_points.txt,sha256=0-BHZ6nUnh0twWw9SXNTiRmKjDnb1VO2DfG_-oprhAc,45
-bmtool-0.5.7.1.dist-info/top_level.txt,sha256=gpd2Sj-L9tWbuJEd5E8C8S8XkNm5yUE76klUYcM-eWM,7
-bmtool-0.5.7.1.dist-info/RECORD,,
+bmtool-0.5.7.2.dist-info/LICENSE,sha256=qrXg2jj6kz5d0EnN11hllcQt2fcWVNumx0xNbV05nyM,1068
+bmtool-0.5.7.2.dist-info/METADATA,sha256=7zLPFl5uVwrzMwlXm_D6iJMrwQUk2oXNXIGqvyzgapM,24131
+bmtool-0.5.7.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+bmtool-0.5.7.2.dist-info/entry_points.txt,sha256=0-BHZ6nUnh0twWw9SXNTiRmKjDnb1VO2DfG_-oprhAc,45
+bmtool-0.5.7.2.dist-info/top_level.txt,sha256=gpd2Sj-L9tWbuJEd5E8C8S8XkNm5yUE76klUYcM-eWM,7
+bmtool-0.5.7.2.dist-info/RECORD,,