add Nick's changes from #164

Author: Jai Bhagat

+hw/+ptb/Window.m

@@ -479,6 +479,7 @@ function applyCalibration(obj, cal)
       tt = (1:ns)/acqRate;
 
       figure; plot(tt,clock);
+      ylabel('clock signal'); title('Clock');
 
       upCrossings = find(diff( clock > 1 ) ==  1);
       dnCrossings = find(diff( clock > 1 ) == -1);
@@ -490,7 +491,7 @@ function applyCalibration(obj, cal)
       end
       plot( tt, light ); hold on
       xlabel('Time (s)');
-      ylabel('Signal (Volts)');
+      ylabel('Photodiode Signal (Volts)');
       set(gca,'ylim',[0 1.1*max(light)]);
       title(sprintf('In this plot. digital has been delayed by %2.2f ms', delay));
 

+srv/expServer.m

@@ -359,11 +359,13 @@ function whiteScreen()
   function calibrateGamma()
     stimWindow = rig.stimWindow;
     DaqDev = rig.daqController.DaqIds;
-    lightIn = 'ai0'; % defaults from hw.psy.Window
-    clockIn = 'ai1';
-    clockOut = 'port1/line0 (PFI4)';
-    log(['Please connect photodiode to %s, clockIn to %s and clockOut to %s.\r'...
-        'Press any key to contiue\n'],lightIn,clockIn,clockOut);
+    lightIn = 'ai1'; % defaults from hw.psy.Window
+    clockIn = 'ai0';
+    clockOut = 'port1/line0';
+    clockOutHint = 'PFI4';
+    log(['Please connect photodiode to %s, clockIn to %s and clockOut to '... 
+        '%s (%s).\r Press any key to contiue\n'],...
+        lightIn,clockIn,clockOut, clockOutHint);
     pause; % wait for keypress
     stimWindow.Calibration = stimWindow.calibration(DaqDev); % calibration
     pause(1);