polishing snirf toolbox, handling root object names

Author: fangq

loadjsnirf.m

@@ -44,7 +44,7 @@
 end
 
 if(~isempty(regexp(filename,'\.[Ss][Nn][Ii][Rr][Ff]$', 'once')) || ~isempty(regexp(filename,'\.[Hh]5$', 'once')))
-    jnirs=loadsnirf(filename);
+    jnirs=loadsnirf(filename,varargin);
 elseif(regexp(filename,'\.[Jj][Nn][Ii][Rr][Ss]$'))
     jnirs=loadjson(filename,varargin{:});
 elseif(regexp(filename,'\.[Bb][Nn][Ii][Rr][Ss]$'))

loadsnirf.m

@@ -36,9 +36,18 @@
     error('you must provide a file name');
 end
 
-opt=varargin2struct(varargin{:});
 data=loadh5(fname);
-data=snirfdecode(data,'snirf');
+
+opt=struct;
+
+if(length(varargin)==1)
+    data=snirfdecode(data,varargin{:});
+elseif(length(varargin)>=2)
+    opt=varargin2struct(varargin{:});
+    data=snirfdecode(data,varargin{:});
+else
+    data=snirfdecode(data);
+end
 
 outfile=jsonopt('FileName','',opt);
 if(~isempty(outfile))

savesnirf.m

@@ -20,7 +20,7 @@ function savesnirf(data, outfile,varargin)
 %
 %    example:
 %        data=loadsnirf('test.snirf');
-%        snirfdata(data,'newfile.snirf');
+%        savesnirf(data,'newfile.snirf');
 %
 %    this file is part of JSNIRF specification: https://github.com/fangq/jsnirf
 %
@@ -33,7 +33,7 @@ function savesnirf(data, outfile,varargin)
 
 opt=varargin2struct(varargin{:});
 if(~isfield(opt,'root'))
-    opt.root=inputname(1);
+    opt.root='';
 end
 
 if(isfield(data,'SNIRFData'))

snirfdecode.m

@@ -37,7 +37,15 @@
 
 data=regrouph5(root, varargin{:});
 
-if(isfield(data,'nirs') && isfield(data,'formatVersion') && ~isfield(data,'SNIRFData'))
+issnirf=1;
+
+if(~isempty(varargin))
+    if(ischar(varargin{1}) && strcmpi(varargin{1},'jsnirf'))
+        issnirf=0;
+    end
+end
+
+if(issnirf==0 && isfield(data,'nirs') && isfield(data,'formatVersion') && ~isfield(data,'SNIRFData'))
     data.SNIRFData=data.nirs;
     if(iscell(data.nirs))
         for i=1:length(data.nirs)