revert struct SimData. back to plain NT

Author: tfiers

nb/2022-09-11__Fit_function_to_STA.ipynb

@@ -46,6 +46,12 @@ p = get_params(
 
 s = cached(sim, [p.sim]);
 
+snt = s.data;
+
+
+
+
+
 s = augment(s, p);
 
 # ## ...

nb/2022-09-11__Fit_function_to_STA.jl

@@ -13,8 +13,7 @@ const datamodel_version = "2 (net)"
 include("units.jl")
 # [see file for exports]
 
-include("types.jl")
-export SimData
+const SimData = NamedTuple
 
 include("misc.jl")
 export LogNormal_with_mean, ptp, area, bin, jn

pkg/VoltoMapSim/src/VoltoMapSim.jl

@@ -138,7 +138,7 @@ function init_sim(p::NetworkSimParams)
         )
     end
 
-    return state = SimData(;
+    return state = (;
         #
         # Fixed at init:
         num_timesteps,

pkg/VoltoMapSim/src/sim/net/init.jl

@@ -1,5 +1,5 @@
 
-function step_sim!(state::SimData, params::NetworkSimParams, i)
+function step_sim!(state, params::NetworkSimParams, i)
 
     @unpack output_synapses, postsyn_neuron, neuron_type,
             syn_strengths, spike_tx_delay                        = state

pkg/VoltoMapSim/src/sim/net/step.jl

@@ -31,7 +31,7 @@ function augment(s::SimData, p::ExpParams)
     non_inputs = [[n for n in all if n ∉ inputs[m] && n != m] for m in all]
     num_inputs = [(exc = length(exc_inputs[m]), inh = length(inh_inputs[m])) for m in all]
 
-    return SimData(;
+    return (;
         s.data...,
         num_spikes_per_neuron,
         spike_rates,

pkg/VoltoMapSim/src/sim/post.jl

@@ -8,7 +8,7 @@ include("Nto1/step.jl")
 include("post.jl")
 
 function sim(params::SimParams)
-    state::SimData = init_sim(params)
+    state = init_sim(params)
     @showprogress (every = 400ms) "Running simulation: " (
     for i in 1:state.num_timesteps
         step_sim!(state, params, i)