Changeset 202


Ignore:
Timestamp:
Jun 27, 2012, 8:09:35 PM (7 years ago)
Author:
tjniskan
Message:
  • Fixed a bug which prevented pelist from being used be aedes_readvnmr

M aedes_readvnmr.m
M aedes_revision.m

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • aedes_readvnmr.m

    r180 r202  
    520520
    521521%% Read phasetable if necessary
    522 if isfield(procpar,'petable') && isempty(Dat.phasetable) && ...
    523     ~isempty(procpar.petable{1}) && ~strcmpi(procpar.petable{1},'n') && ...
    524     Dat.Sorting
     522if Dat.Sorting
     523       
    525524  % Look in preferences for tablib-directory
    526   try
    527     tabpath = getpref('Aedes','TabLibDir');
    528   catch
    529     % If the table path was not found in preferences, try to use aedes
    530     % directory
    531     tmp_path = which('aedes');
    532     if ~isempty(tmp_path)
    533       aedes_path=fileparts(tmp_path);
    534       tabpath = [aedes_path,filesep,'tablib',filesep];
    535     else
    536       % If all else fails, look in the current directory
    537       tabpath = [pwd,filesep,'tablib',filesep];
    538     end
    539   end
    540   [phasetable,msg] = aedes_readphasetable([tabpath,procpar.petable{1}]);
    541  
     525  if isfield(procpar,'petable') && ~strcmpi(procpar.petable{1},'n')
     526                try
     527                        tabpath = getpref('Aedes','TabLibDir');
     528                catch
     529                        % If the table path was not found in preferences, try to use aedes
     530                        % directory
     531                        tmp_path = which('aedes');
     532                        if ~isempty(tmp_path)
     533                                aedes_path=fileparts(tmp_path);
     534                                tabpath = [aedes_path,filesep,'tablib',filesep];
     535                        else
     536                                % If all else fails, look in the current directory
     537                                tabpath = [pwd,filesep,'tablib',filesep];
     538                        end
     539                end
     540                [phasetable,msg] = aedes_readphasetable([tabpath,procpar.petable{1}]);
     541        else
     542                phasetable = [];
     543        end
     544               
    542545  % If petable cannot be found, check if it is in procpar...
    543546  if isempty(phasetable) && isfield(procpar,'pe_table')
     
    11321135  seqcon(2:3) = 'sc';
    11331136end
     1137if isfield(procpar,'nseg')
     1138        nseg = procpar.nseg;
     1139else
     1140        nseg = 1;
     1141end
     1142
    11341143
    11351144% Check dimensions
  • aedes_revision.m

    r201 r202  
    9393% bash-script every time it is called so that this file "aedes_revision.m" is
    9494% always in the list of committed files. DO NOT EDIT THE NEXT LINE!!!
    95 % - SVN Hook -
     95% - Svn Hook -
Note: See TracChangeset for help on using the changeset viewer.

Powered by Trac 1.0.9.Copyright © Juha-Pekka Niskanen 2008