okay finally okay to record now

balajisriram · Jul 28, 2017 · 6b4ccbe · 6b4ccbe
1 parent 4f69caf
commit 6b4ccbe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/classes/core/BCoreUtil.m b/classes/core/BCoreUtil.m
@@ -975,9 +975,13 @@ function replicateTrialRecords(paths,deleteOnSuccess)
             try
                 out = max(ranges(2,:));
             catch ex
-                getReport(ex);
-                keyboard
-                out = 0;
+                switch ex.identifier
+                    case 'MATLAB:badsubscript'
+                        disp('came here because this is probably the first trial for the animal');
+                        out = 0;
+                    otherwise
+                        rethrow(ex)
+                end
             end
         end
 

diff --git a/classes/core/protocols/trialManagers/trialManager.m b/classes/core/protocols/trialManagers/trialManager.m
@@ -1055,7 +1055,6 @@
                                     = tm.updateFrameIndexUsingTextureCache(frameIndexed, loop, trigger, timeIndexed, frameIndex, indexedFrames, size(stim,3), isRequesting, ...
                                     i, frameNum, timedFrames, responseOptions, done, doFramePulse, didPulse, scheduledFrameNum);
                                 indexPulse=getIndexPulse(spec,i);
-                                fprintf('\ndone is %d\n',done)
                                 switch strategy
                                     case 'textureCache'
                                         tm.drawFrameUsingTextureCache(window, i, frameNum, size(stim,3), lastI, dontclear, textures(i), destRect, ...
@@ -1187,7 +1186,6 @@
                 end
 
                 timestamps.enteringPhaseLogic=GetSecs;
-                fprintf('\ndone is %d\n',done)
                 if ~paused
                     result = trialRecords(trialInd).result;
                     tD = trialRecords(trialInd).trialDetails;

diff --git a/classes/core/stations/standardVisionPhysiologyStationWithLED.m b/classes/core/stations/standardVisionPhysiologyStationWithLED.m
@@ -123,7 +123,7 @@ function sendZMQ(s,str)
                 while keepWorking
                     trialNum=trialNum+1;
 
-                    s.sendZMQ(sprintf('TrialStart::%d'),trialNum+lastTrialNumForSubject);
+                    s.sendZMQ(sprintf('TrialStart::%d',trialNum+lastTrialNumForSubject));
                     [subject, r, keepWorking, ~, trialRecords, s]= ...
                         subject.doTrial(r,s,rn,trialRecords,sessionNumber,compiledRecords);
                     s.sendZMQ('TrialEnd');

diff --git a/util/phys/zeromq/libzmq-v120-mt-4_0_4.dll b/util/phys/zeromq/libzmq-v120-mt-4_0_4.dll
diff --git a/util/phys/zeromq/zeroMQwrapper.mexw32 b/util/phys/zeromq/zeroMQwrapper.mexw32