Fix bug in marginalizing data with no conditions.

MunskyGroup · Jul 23, 2024 · 0866f79 · 0866f79
1 parent 624e90f
commit 0866f79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/CommandLine/SSIT.m b/src/CommandLine/SSIT.m
@@ -1547,7 +1547,8 @@ function sampleDataFromFSP(obj,fspSoln,saveFile)
             tmp = solutions.ode(IA,J);
             vm(:) = tmp(:);
 
-            vd = zeros(nt*nds,1); vd(:) = obj.dataSet.mean(:);
+            vd = zeros(nt*nds,1); 
+            vd(:) = obj.dataSet.mean(:);
 
             vm = real(vm);
 

diff --git a/src/gui/data_loading/filterAndMarginalize.m b/src/gui/data_loading/filterAndMarginalize.m
@@ -32,8 +32,16 @@
 % not yet for more complicated conditions -- will require future testing.
 
 % this part determines which variables are conditioned over
-histDataStr = cellfun(@num2str,histDataRaw,'UniformOutput',false);                     % convert double in cell to str
-loopCond = [app.DataLoadingAndFittingTabOutputs.conditionOnArray{:,1}];
+try
+    histDataStr = cellfun(@num2str,histDataRaw,'UniformOutput',false);
+catch
+end
+% convert double in cell to str
+if ~isempty(app.DataLoadingAndFittingTabOutputs.conditionOnArray)
+    loopCond = [app.DataLoadingAndFittingTabOutputs.conditionOnArray{:,1}];
+else
+    loopCond=[];
+end
 
 if ~isempty(loopCond)
     for iC = 1:length(loopCond)