Skip to content
Snippets Groups Projects
Commit ef80ed6f authored by Maximilian Schmidt's avatar Maximilian Schmidt
Browse files

Fix calculation of pop_LvR

parent 1a6dfdb0
No related branches found
No related tags found
1 merge request!1Add all necessary files for the multi-area model
...@@ -61,7 +61,8 @@ class Analysis: ...@@ -61,7 +61,8 @@ class Analysis:
Specifies which type of data is to load. Defaults to ['spikes']. Specifies which type of data is to load. Defaults to ['spikes'].
load_areas : list of strings with area names, optional load_areas : list of strings with area names, optional
Specifies the areas for which data is to be loaded. Specifies the areas for which data is to be loaded.
Default value is None and leads to loading of data for all areas. Default value is None and leads to loading of data for all
simulated areas.
""" """
self.network = network self.network = network
...@@ -77,10 +78,10 @@ class Analysis: ...@@ -77,10 +78,10 @@ class Analysis:
self.areas_simulated = self.simulation.areas_simulated self.areas_simulated = self.simulation.areas_simulated
self.areas_recorded = self.simulation.areas_recorded self.areas_recorded = self.simulation.areas_recorded
if load_areas: if load_areas is None:
self.areas_loaded = load_areas
else:
self.areas_loaded = self.areas_simulated self.areas_loaded = self.areas_simulated
else:
self.areas_loaded = load_areas
assert(all([area in self.areas_recorded for area in assert(all([area in self.areas_recorded for area in
self.areas_loaded])), "Tried to load areas which " self.areas_loaded])), "Tried to load areas which "
...@@ -636,7 +637,7 @@ class Analysis: ...@@ -636,7 +637,7 @@ class Analysis:
2.0, 2.0,
params['t_min'], params['t_min'],
params['t_max'], params['t_max'],
self.network.N[area][pop]) int(self.network.N[area][pop]))[0]
self.pop_LvR = d.to_dict() self.pop_LvR = d.to_dict()
# ______________________________________________________________________________ # ______________________________________________________________________________
...@@ -955,6 +956,7 @@ class Analysis: ...@@ -955,6 +956,7 @@ class Analysis:
for i in range(0, len(members)): for i in range(0, len(members)):
if members[i][0] in save_list_json: if members[i][0] in save_list_json:
f = open(self.output_dir + members[i][0] + '.json', 'w') f = open(self.output_dir + members[i][0] + '.json', 'w')
print(members[i][0])
json.dump(members[i][1], f) json.dump(members[i][1], f)
f.close() f.close()
if members[i][0] in save_list_npy: if members[i][0] in save_list_npy:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment