Branch 3.0.1

git-svn-id: https://svn.code.sf.net/p/pspm/svn/trunk@91 23ec9670-3a1e-4a12-9187-a0ba8bce340d
bachlab · Jun 4, 2015 · 2435f93 · 2435f93
1 parent 98a428e
commit 2435f93
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/pspm.fig b/pspm.fig
diff --git a/scr_load1.m b/scr_load1.m
@@ -220,16 +220,14 @@
             data.stats = indata.glm.stats(condindx);
             data.names = indata.glm.names(condindx);
             clear condindx
-        elseif ~strcmpi(mdltype, 'glm')
+        else
             for iCond = 1:numel(indata.(mdltype).condnames)
                 condindx = strcmpi(indata.(mdltype).condnames{iCond}, indata.(mdltype).trlnames);
                 data.stats(iCond, :) = mean(indata.dcm.stats(condindx, :), 1);
             end;
             data.names = indata.(mdltype).names;
             data.trlnames = indata.(mdltype).trlnames;
             data.condnames = indata.(mdltype).condnames;
-        else
-            warning('%s''cond'' option is not defined', errmsg);
         end;
     case 'recon'
         if strcmpi(mdltype, 'glm')

diff --git a/scr_msg.txt b/scr_msg.txt
@@ -1,15 +1,14 @@
 $___________________________________________________________________________
 Welcome to PsPM - PsychoPhysiological Modelling
 (incorporating SCRalyze)
-Version 3.0 (04.02.2015)
+Version 3.0.1 (04.06.2015)
 $
 ------------------------------------------
 (c) 2008-2015 
 Dominik R Bach
-Wellcome Trust Centre for Neuroimaging
-12 Queen Square
-London WC1N 3GB
-United Kingdom
+* Wellcome Trust Centre for Neuroimaging
+University College London
+University of Zurich
 d.bach@ucl.ac.uk
 pspm.sourceforge.net
 ------------------------------------------