comparison multithreshold 1.46/subjGUI_MT.m @ 22:45f28c49461e master

removing duplicate changes
author Ray Meddis <rmeddis@essex.ac.uk>
date Mon, 13 Jun 2011 18:21:05 +0100
parents fafe69c43108
children 6cce421531e2
comparison
equal deleted inserted replaced
21:c489ebada16e 22:45f28c49461e
242 betweenRuns.forceThresholds=[]; 242 betweenRuns.forceThresholds=[];
243 betweenRuns.observationCount=[]; 243 betweenRuns.observationCount=[];
244 betweenRuns.catchTrials=[]; 244 betweenRuns.catchTrials=[];
245 betweenRuns.timesOfFirstReversals=[]; 245 betweenRuns.timesOfFirstReversals=[];
246 betweenRuns.bestThresholdTracks=[]; 246 betweenRuns.bestThresholdTracks=[];
247 betweenRuns.bestThresholdMeanTracks=[];
248 betweenRuns.bestThresholdMedianTracks=[];
249 betweenRuns.levelTracks=[]; 247 betweenRuns.levelTracks=[];
250 betweenRuns.responseTracks=[]; 248 betweenRuns.responseTracks=[];
251 betweenRuns.slopeKTracks=[]; 249 betweenRuns.slopeKTracks=[];
252 betweenRuns.gainTracks=[]; 250 betweenRuns.gainTracks=[];
253 betweenRuns.VminTracks=[]; 251 betweenRuns.VminTracks=[];
1258 stdev=NaN; 1256 stdev=NaN;
1259 otherwise 1257 otherwise
1260 switch experiment.threshEstMethod 1258 switch experiment.threshEstMethod
1261 case {'MaxLikelihood', 'oneIntervalUpDown'} 1259 case {'MaxLikelihood', 'oneIntervalUpDown'}
1262 % last value in the list 1260 % last value in the list
1263 threshold=withinRuns.meanEstTrack(end); 1261 % threshold=withinRuns.meanEstTrack(end);
1264 threshold=withinRuns.thresholdEstimateTrack(end); 1262 threshold=withinRuns.thresholdEstimateTrack(end);
1265 stdev=NaN; 1263 stdev=NaN;
1266 1264
1267 case {'2I2AFC++', '2I2AFC+++'} 1265 case {'2I2AFC++', '2I2AFC+++'}
1268 % use peaks and troughs 1266 % use peaks and troughs
1300 [betweenRuns.catchTrials withinRuns.catchTrialCount]; 1298 [betweenRuns.catchTrials withinRuns.catchTrialCount];
1301 1299
1302 % add variable length tracks to cell arrays 1300 % add variable length tracks to cell arrays
1303 if withinRuns.beginningOfPhase2>0 1301 if withinRuns.beginningOfPhase2>0
1304 betweenRuns.bestThresholdTracks{length(betweenRuns.thresholds)}=... 1302 betweenRuns.bestThresholdTracks{length(betweenRuns.thresholds)}=...
1305 withinRuns.thresholdEstimateTrack; 1303 withinRuns.thresholdEstimateTrack;
1306 betweenRuns.bestThresholdMeanTracks...
1307 {length(betweenRuns.thresholds_mean)}=...
1308 withinRuns.thresholdEstimateTrack;
1309 betweenRuns.bestThresholdMedianTracks...
1310 {length(betweenRuns.thresholds_median)}=...
1311 withinRuns.thresholdEstimateTrack;
1312
1313 betweenRuns.levelTracks{length(betweenRuns.thresholds)}=... 1304 betweenRuns.levelTracks{length(betweenRuns.thresholds)}=...
1314 withinRuns.levelList(withinRuns.beginningOfPhase2:end); 1305 withinRuns.levelList(withinRuns.beginningOfPhase2:end);
1315 betweenRuns.responseTracks{length(betweenRuns.thresholds)}=... 1306 betweenRuns.responseTracks{length(betweenRuns.thresholds)}=...
1316 withinRuns.responseList(withinRuns.beginningOfPhase2:end); 1307 withinRuns.responseList(withinRuns.beginningOfPhase2:end);
1317 else 1308 else
1318 betweenRuns.bestThresholdTracks{length(betweenRuns.thresholds)}=[]; 1309 betweenRuns.bestThresholdTracks{length(betweenRuns.thresholds)}=[];
1319 betweenRuns.bestThresholdMeanTracks{length(betweenRuns.thresholds)}=[];
1320 betweenRuns.bestThresholdMedianTracks{length(betweenRuns.thresholds)}=...
1321 [];
1322 betweenRuns.levelTracks{length(betweenRuns.thresholds)}=[]; 1310 betweenRuns.levelTracks{length(betweenRuns.thresholds)}=[];
1323 betweenRuns.responseTracks{length(betweenRuns.thresholds)}=[]; 1311 betweenRuns.responseTracks{length(betweenRuns.thresholds)}=[];
1324 end 1312 end
1325 1313
1326 betweenRuns.bestGain=[betweenRuns.bestGain rareEvent.bestGain]; 1314 betweenRuns.bestGain=[betweenRuns.bestGain rareEvent.bestGain];