fix project down compatibility in TA

Author: mca-sh

.githooks/pre-commit

@@ -1,4 +1,4 @@
 {
 "tag" : "1.3.1",
-"prev_commit_hash" : "ae13bbbf"
+"prev_commit_hash" : "e0bc2229"
 }

MASH-FRET/.release_version.json

@@ -13,7 +13,7 @@ function edit_TA_mdlJmax_Callback(obj,evd,h_fig)
 set(obj, 'String', num2str(val));
 if ~(numel(val)==1 && ~isnan(val) && val>0)
     set(obj, 'BackgroundColor', [1 0.75 0.75]);
-    setContPan('The maximum number of degenerated levels is ill-defined.',...
+    setContPan('The maximum number of degenerate levels is ill-defined.',...
         'error',h_fig);
     return
 end

MASH-FRET/source/mod_transition_analysis/_callbacks/edit_TA_mdlJmax_Callback.m

@@ -17,17 +17,18 @@ function edit_TA_slBin_Callback(obj,evd,h_fig)
 proj = p.curr_proj;
 tpe = p.curr_type(proj);
 tag = p.curr_tag(proj);
-prm = p.proj{proj}.prm{tag,tpe};
 def = p.proj{proj}.def{tag,tpe};
+prm = p.proj{proj}.prm{tag,tpe};
+curr = p.proj{proj}.curr{tag,tpe};
 
-prm.lft_start{2}(3) = val;
+curr.lft_start{2}(3) = val;
 
 % recalculate histograms and reset fit results
 J = prm.lft_start{2}(1);
-prm = ud_kinPrm(prm,def,J);
+curr = ud_kinPrm(curr,def,J);
 
-p.proj{proj}.prm{tag,tpe} = prm;
-p.proj{proj}.curr{tag,tpe} = prm;
+p.proj{proj}.curr{tag,tpe} = curr;
+p.proj{proj}.prm{tag,tpe} = curr;
 h.param.TDP = p;
 guidata(h_fig, h);
 

MASH-FRET/source/mod_transition_analysis/_callbacks/edit_TA_slBin_Callback.m

@@ -1,4 +1,4 @@
-function popupmenu_TA_mdlDtState_Callback(obj,evd,h_fig)
+function popupmenu_TA_mdlMeth_Callback(obj,evd,h_fig)
 
 h = guidata(h_fig);
 p = h.param.TDP;

MASH-FRET/source/mod_transition_analysis/_callbacks/popupmenu_TA_mdlMeth_Callback.m

@@ -104,7 +104,6 @@
 curr.lft_def = prm.lft_def;
 curr.lft_start = prm.lft_start;
 curr.lft_res = prm.lft_res;
-curr.mdl_start = prm.mdl_start;
 curr.mdl_res = prm.mdl_res;
 
 p.proj{proj}.prm{tag,tpe} = prm;

MASH-FRET/source/mod_transition_analysis/clustering/clusterTDP.m

@@ -1,4 +1,4 @@
-function plotKinMdl(h_axes,prm,v_res)
+function plotKinMdl(h_axes,prm,def,v_res)
 
 % defaults
 norm = 1;
@@ -12,18 +12,13 @@ function plotKinMdl(h_axes,prm,v_res)
 end
 
 % collect results
-if ~(isfield(prm,'mdl_res'))
-    mdl_res = [];
-else
-    mdl_res = prm.mdl_res;
-end
-if isempty(mdl_res)
+if ~(isfield(prm,'mdl_res')) || isequal(prm.mdl_res,def.mdl_res)
     states = [];
 else
-    tp = mdl_res{1};
-    simdat = mdl_res{4};
-    states = mdl_res{5};
-    BICres = mdl_res{6}{1};
+    tp = prm.mdl_res{1};
+    simdat = prm.mdl_res{4};
+    states = prm.mdl_res{5};
+    BICres = prm.mdl_res{6}{1};
 end
 
 % draw state diagram

MASH-FRET/source/mod_transition_analysis/kinetic_model/plotKinMdl.m

@@ -21,7 +21,7 @@ function ud_kinMdl(h_fig)
 % set all control off-enabled
 setProp(h.uipanel_TA_kineticModel, 'Enable', 'off');
 
-if ~(isfield(curr,'clst_res') && ~isempty(curr.clst_res{1}))
+if ~(isfield(prm,'clst_res') && ~isempty(prm.clst_res{1}))
     return
 end
 

MASH-FRET/source/mod_transition_analysis/kinetic_model/ud_kinMdl.m

@@ -17,6 +17,7 @@
 if isfield(prm,'plot') && size(prm.plot{1},1)<4
     prm.plot = def.plot;
 end
+
 % add boba parameters if none
 if isfield(prm,'clst_start') && size(prm.clst_start,2)>=1 && ...
         size(prm.clst_start{1},2)<8
@@ -251,6 +252,11 @@
             prm.lft_start{2} = [prm.kin_start{2},bin,excl,rearr];
         end
 
+        % adjust current state id after state binning
+        if prm.lft_start{2}(2)>V
+            prm.lft_start{2}(2) = V;
+        end
+        
         % recalculate histograms
         prm2 = ud_kinPrm(prm,def,J);
         prm.clst_res{4} = prm2.clst_res{4};
@@ -270,6 +276,14 @@
     prm = rmfield(prm,'kin_res');
 end
 
+if ~isfield(prm,'mdl_start')
+    prm.mdl_start = def.mdl_start;
+end
+
+if ~isfield(prm,'mdl_res')
+    prm.mdl_res = def.mdl_res;
+end
+
 p_proj.prm{tag,tpe} = prm;
 
 

MASH-FRET/source/mod_transition_analysis/management/downCompatibilityTDP.m

@@ -40,6 +40,7 @@ function updateTAplots(h_fig,varargin)
 
 tag = p.curr_tag(proj);
 tpe = p.curr_type(proj);
+def = p.proj{proj}.def{tag,tpe};
 curr = p.proj{proj}.curr{tag,tpe};
 prm = p.proj{proj}.prm{tag,tpe};
 v_lft = curr.lft_start{2}(2);
@@ -55,5 +56,5 @@ function updateTAplots(h_fig,varargin)
 end
 if strcmp(opt,'all') || strcmp(opt,'mdl')
     plotKinMdl([h.axes_TDPplot3,h.axes_TA_mdlPop,h.axes_TA_mdlTrans,...
-        h.axes_TA_mdlDt,h.axes_TA_mdlBIC],prm,v_mdl);
+        h.axes_TA_mdlDt,h.axes_TA_mdlBIC],prm,def,v_mdl);
 end