Changeset 473 for trunk

Timestamp:

10/30/10 21:49:11 (19 months ago)

Author:

emuller

Message:

Updated stgen examples

Location:

trunk/examples/stgen

Files:

• inh_2Dmarkov_psth.py (modified) (3 diffs)
• inh_gamma_psth.py (modified) (3 diffs)

trunk/examples/stgen/inh_2Dmarkov_psth.py

@@ -9 +9 @@
 
 
-import numpy
+import numpy,sys
 from NeuroTools import stgen
 from pylab import zeros_like, plot
@@ -35 +35 @@
 t_stop = 1000.0
 
-trials = 10000
+trials = 5000
+print "Running %d trials of %.2f milliseconds" % (trials, t_stop)
+for i in xrange(trials):
+    if i%100==0:
+        print "%d" % i,
+        sys.stdout.flush()
+    st = stg.inh_2Dadaptingmarkov_generator(a,bq,tau_s,tau_r,qrqs,t,t_stop,array=True)
+    psth[1:]+=numpy.histogram(st,t)[0]
 
-for i in xrange(trials):
-    st = stg.inh_2Dadaptingmarkov_generator(a,bq,tau_s,tau_r,qrqs,t,t_stop,array=True)
-    psth+=numpy.histogram(st,t, new=False)[0]
+print "\n"
 
 # normalize
@@ -46 +51 @@
 psth/= dt*float(trials)/1000.0
 
+# this is for correct 'steps' plotting only
+psth[0] = psth[1]
+
 plot(t,psth,linestyle='steps')
 

trunk/examples/stgen/inh_gamma_psth.py

@@ -7 +7 @@
 from NeuroTools import stgen
 from pylab import zeros_like, plot
-
+import sys
 
 dt = 10.0
@@ -27 +27 @@
 stg = stgen.StGen()
 
-for i in xrange(10000):
+trials = 5000
+tsim = 1000.0
+print "Running %d trials of %.2f milliseconds" % (trials, tsim)
+for i in xrange(trials):
+    if i%100==0:
+        print "%d" % i,
+        sys.stdout.flush()
     st = stg.inh_gamma_generator(a,b,t,1000.0,array=True)
-    psth+=numpy.histogram(st,t,new=False)[0]
+    psth[1:]+=numpy.histogram(st,t)[0]
+
+print "\n"
 
 # normalize
@@ -36 +44 @@
 psth/= dt*10000.0/1000.0
 
+# this is for plotting only
+psth[0] = psth[1]
+
 plot(t,psth,linestyle='steps')