changeset 20:fafe69c43108

ExpGUI update

--- a/multithreshold 1.46/expGUI_MT.m	Tue Jun 07 17:50:05 2011 +0100
+++ b/multithreshold 1.46/expGUI_MT.m	Mon Jun 13 17:30:57 2011 +0100
@@ -1292,8 +1292,6 @@
 betweenRuns.observationCount=	[];
 betweenRuns.timesOfFirstReversals=	[];
 betweenRuns.bestThresholdTracks='';
-betweenRuns.bestThresholdMeanTracks='';
-betweenRuns.bestThresholdMedianTracks='';
 betweenRuns.levelTracks='';
 betweenRuns.responseTracks='';
 betweenRuns.slopeKTracks=	[];

--- a/multithreshold 1.46/printReport.m	Tue Jun 07 17:50:05 2011 +0100
+++ b/multithreshold 1.46/printReport.m	Mon Jun 13 17:30:57 2011 +0100
@@ -26,15 +26,16 @@
     if experiment.saveData
         saveFileName=['savedData/' experiment.name '_' experiment.date '_' experiment.paradigm];
     else
-        % overwrite existing file just in case
+        % save this data (just in case)
         saveFileName=['savedData/mostRecentResults'];
     end
     experiment.minElapsed=etime(clock, betweenRuns.timeNow)/60;
-    save(saveFileName, 'experiment', 'stimulusParameters', 'betweenRuns', 'withinRuns', 'statsModel', 'expGUIhandles')
+    save(saveFileName, 'experiment', 'stimulusParameters',...
+        'betweenRuns', 'withinRuns', 'statsModel', 'expGUIhandles')
     disp(['data saved as: ' saveFileName]);
     
 else
-    % reprint request
+    % reprint request (i.e print out old data)
     printReportGuide.fileName=fileName;
     load(printReportGuide.fileName)
     saveFileName=printReportGuide.fileName;
@@ -46,17 +47,18 @@
 end
 
 fprintf('******** multithreshold ')
+
 x=pwd; disp(['version ' x(end-3:end)])
 fprintf('\nName:\t%s ', experiment.name)
 fprintf('\nparadigm:\t%s ', experiment.paradigm)
 fprintf('\nEar:\t%s ', experiment.ear)
+
 method=experiment.threshEstMethod;
 if stimulusParameters.includeCue && ~strcmp(method(1:6),'2I2AFC')
     method=[method '/ withCue'];
 end
 fprintf('\nmethod:\t%s ', method)
 fprintf('\ndate:\t%s ', experiment.date)
-
 fprintf('\n\n')
 
 if isempty(betweenRuns.thresholds)
@@ -64,12 +66,11 @@
 end
 
 % prepare results as matrices ready to print
+%  first sort the actual sequence into a more readable sequence
 [idx1, idx2, var1values, var2values]=...
-    sortVariables(betweenRuns.variableList1, betweenRuns.variableList2, betweenRuns.var1Sequence, betweenRuns.var2Sequence);
+    sortVariables(betweenRuns.variableList1, betweenRuns.variableList2,...
+    betweenRuns.var1Sequence, betweenRuns.var2Sequence);
 
-% if strcmp(betweenRuns.variableName2, 'none')
-%     betweenRuns.variableName2=' ';
-% end
 header1=betweenRuns.variableName1;
 header2=betweenRuns.variableName2;
 header1 = strrep(header1, 'none', ' '); % none is not a useful header
@@ -77,7 +78,8 @@
 headers=strvcat([header1 '/'], header2);
 
 disp('thresholds')
-msg=printTabTable(sortTablesForPrinting(idx1,idx2,var1values,var2values, betweenRuns.thresholds),  headers);
+msg=printTabTable(sortTablesForPrinting(idx1,idx2,...
+    var1values,var2values, betweenRuns.thresholds),  headers);
 addToMsg(msg,0)
 fprintf('\n')
 
@@ -85,7 +87,6 @@
 betweenRuns.levelTracks=betweenRuns.levelTracks(idx1);
 betweenRuns.responseTracks=betweenRuns.responseTracks(idx1);
 betweenRuns.bestThresholdTracks=betweenRuns.bestThresholdTracks(idx1);
-
 betweenRuns.levelTracks=betweenRuns.levelTracks(idx2);
 betweenRuns.responseTracks=betweenRuns.responseTracks(idx2);
 betweenRuns.bestThresholdTracks=betweenRuns.bestThresholdTracks(idx2);
@@ -136,21 +137,6 @@
         header=strvcat(header, 'mean');
     end
     
-    disp(' '); disp('threshold (mean) tracks starting from the first reversal')
-    for i=1:length(betweenRuns.bestThresholdTracks)
-        if printReportGuide.HorizontalTracks
-        end
-        printTabTable(betweenRuns.bestThresholdMeanTracks{i});
-        header=strvcat(header, 'mean');
-    end
-    disp(' '); disp('threshold tracks (median) starting from the first reversal')
-    for i=1:length(betweenRuns.bestThresholdMedianTracks)
-        if printReportGuide.HorizontalTracks
-        end
-        printTabTable(betweenRuns.bestThresholdTracks{i});
-        header=strvcat(header, 'mean');
-    end
-    
 end
 
 switch experiment.ear

Binary file multithreshold 1.46/savedData/mostRecentResults.mat has changed

--- a/multithreshold 1.46/subjGUI_MT.m	Tue Jun 07 17:50:05 2011 +0100
+++ b/multithreshold 1.46/subjGUI_MT.m	Mon Jun 13 17:30:57 2011 +0100
@@ -244,8 +244,6 @@
 betweenRuns.catchTrials=[];
 betweenRuns.timesOfFirstReversals=[];
 betweenRuns.bestThresholdTracks=[];
-betweenRuns.bestThresholdMeanTracks=[];
-betweenRuns.bestThresholdMedianTracks=[];
 betweenRuns.levelTracks=[];
 betweenRuns.responseTracks=[];
 betweenRuns.slopeKTracks=[];
@@ -1260,7 +1258,7 @@
             switch experiment.threshEstMethod
                 case {'MaxLikelihood', 'oneIntervalUpDown'}
                     % last value in the list
-                    threshold=withinRuns.meanEstTrack(end);
+%                     threshold=withinRuns.meanEstTrack(end);
                     threshold=withinRuns.thresholdEstimateTrack(end);
                     stdev=NaN;
                     
@@ -1302,23 +1300,13 @@
 % add variable length tracks to cell arrays
 if withinRuns.beginningOfPhase2>0
     betweenRuns.bestThresholdTracks{length(betweenRuns.thresholds)}=...
-        withinRuns.thresholdEstimateTrack;
-    betweenRuns.bestThresholdMeanTracks...
-        {length(betweenRuns.thresholds_mean)}=...
-        withinRuns.thresholdEstimateTrack;
-    betweenRuns.bestThresholdMedianTracks...
-        {length(betweenRuns.thresholds_median)}=...
-        withinRuns.thresholdEstimateTrack;
-    
+        withinRuns.thresholdEstimateTrack;   
     betweenRuns.levelTracks{length(betweenRuns.thresholds)}=...
         withinRuns.levelList(withinRuns.beginningOfPhase2:end);
     betweenRuns.responseTracks{length(betweenRuns.thresholds)}=...
         withinRuns.responseList(withinRuns.beginningOfPhase2:end);
 else
     betweenRuns.bestThresholdTracks{length(betweenRuns.thresholds)}=[];
-    betweenRuns.bestThresholdMeanTracks{length(betweenRuns.thresholds)}=[];
-    betweenRuns.bestThresholdMedianTracks{length(betweenRuns.thresholds)}=...
-        [];
     betweenRuns.levelTracks{length(betweenRuns.thresholds)}=[];
     betweenRuns.responseTracks{length(betweenRuns.thresholds)}=[];
 end