Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian

* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  provide human-readable descriptions for positions and employer (venue)

diff --git a/survey/makestats b/survey/makestats
index 7da486e97ba46760ec4e3beb84f5e43ad3f53964..070400b045b26f499f53eea9534b3ae4acf55d94 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -180,7 +180,7 @@ class DB(dict):
 
 
 def mkpic_os_per_env(db, destdir):
-    envs = ['pers', 'man', 'virt', 'virt']
+    envs = ['pers_os', 'man_os', 'virt_host_os', 'virt_guest_os']
     env_names = ['Personal', 'Managed', 'Virt. Host', 'Virt. Guest']
     env_stats = {}
     for env in envs:
@@ -237,7 +237,7 @@ def mkpic_time_per_env(db, destdir):
     pl.ylim(-0.4, len(envs))
     pl.title("Research activity time by environment")
     pl.xlabel("Fraction of submissions")
-    pl.savefig('%s/ospref_by_env.png' % destdir, format='png', dpi=80)
+    pl.savefig('%s/time_by_env.png' % destdir, format='png', dpi=80)
 
 
 def mkpic_submissions_per_key(db, destdir, key, title, sortby='name',