Added Stanford Research shutters to laser box, removed Elliptek slide…

…r from laser box, added 2-position Elliptek slider to detection box (for BFP/GFP)
leiferlab · Sep 13, 2019 · d23c45c · d23c45c
1 parent 3f55390
commit d23c45c
Show file tree

Hide file tree

Showing 67 changed files with 13 additions and 1 deletion.
diff --git a/acquisitionGetVolume.vi b/acquisitionGetVolume.vi
diff --git a/acquisitionSaveFrames.vi b/acquisitionSaveFrames.vi
diff --git a/csuClose.vi b/csuClose.vi
diff --git a/csuCloseShutter.vi b/csuCloseShutter.vi
diff --git a/csuOpen.vi b/csuOpen.vi
diff --git a/csuOpenShutter.vi b/csuOpenShutter.vi
diff --git a/cwlaser.vi b/cwlaser.vi
diff --git a/cwlaserClose.vi b/cwlaserClose.vi
diff --git a/cwlaserOpen.vi b/cwlaserOpen.vi
diff --git a/cwlaserSelectorEnable.vi b/cwlaserSelectorEnable.vi
diff --git a/cwlaserSelectorOpen.vi b/cwlaserSelectorOpen.vi
diff --git a/cwlaserSetPower.vi b/cwlaserSetPower.vi
diff --git a/cwlaserShutterFromWavelength.vi b/cwlaserShutterFromWavelength.vi
diff --git a/cwlaserShutterOpenClose.vi b/cwlaserShutterOpenClose.vi
diff --git a/cwlaserShutterOpenOneCloseOthers.vi b/cwlaserShutterOpenOneCloseOthers.vi
diff --git a/daqCreateFile.vi b/daqCreateFile.vi
diff --git a/daqRead.vi b/daqRead.vi
diff --git a/fileAsynchronousClose.vi b/fileAsynchronousClose.vi
diff --git a/fileAsynchronousCreate.vi b/fileAsynchronousCreate.vi
diff --git a/filterWheelClose.vi b/filterWheelClose.vi
diff --git a/filterWheelGetPosition.vi b/filterWheelGetPosition.vi
diff --git a/filterWheelMove.vi b/filterWheelMove.vi
diff --git a/filterWheelOpen.vi b/filterWheelOpen.vi
diff --git a/focusKnobClose.vi b/focusKnobClose.vi
diff --git a/focusKnobMove.vi b/focusKnobMove.vi
diff --git a/focusKnobOpen.vi b/focusKnobOpen.vi
diff --git a/globalDevices.vi b/globalDevices.vi
diff --git a/hamamatsuBufferComplete.vi b/hamamatsuBufferComplete.vi
diff --git a/hamamatsuBufferIndexesAndFrames.vi b/hamamatsuBufferIndexesAndFrames.vi
diff --git a/hamamatsuClose.vi b/hamamatsuClose.vi
diff --git a/hamamatsuExposureTimeChange.vi b/hamamatsuExposureTimeChange.vi
diff --git a/hamamatsuFrameCounterClose.vi b/hamamatsuFrameCounterClose.vi
diff --git a/hamamatsuFrameCounterOpen.vi b/hamamatsuFrameCounterOpen.vi
diff --git a/hamamatsuOpen.vi b/hamamatsuOpen.vi
diff --git a/hamamatsuRead.vi b/hamamatsuRead.vi
diff --git a/hamamatsuReadToBuffer.vi b/hamamatsuReadToBuffer.vi
diff --git a/hamamatsuSetExternalTrigger.vi b/hamamatsuSetExternalTrigger.vi
diff --git a/initVariables.vi b/initVariables.vi
diff --git a/ludlRead.vi b/ludlRead.vi
diff --git a/mainBeadAlignment.vi b/mainBeadAlignment.vi
diff --git a/mainMultiColorWorm.vi b/mainMultiColorWorm.vi
diff --git a/mainWholeBrainImager.vi b/mainWholeBrainImager.vi
diff --git a/multicolorWormSetLaserAndFilter.vi b/multicolorWormSetLaserAndFilter.vi
diff --git a/piezoAutofocus.vi b/piezoAutofocus.vi
diff --git a/piezoReadClose.vi b/piezoReadClose.vi
diff --git a/piezoReadOpen.vi b/piezoReadOpen.vi
diff --git a/piezoUSBWrite.vi b/piezoUSBWrite.vi
diff --git a/piezoWriteClose.vi b/piezoWriteClose.vi
diff --git a/piezoWriteOpen.vi b/piezoWriteOpen.vi
diff --git a/piezoWriteWrite.vi b/piezoWriteWrite.vi
diff --git a/piezoWriteWriteFuncGen.vi b/piezoWriteWriteFuncGen.vi
diff --git a/pump-probe.lvlps b/pump-probe.lvlps
@@ -1,3 +1,3 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "94,980,776,1500"
+ProjectExplorer.ClassicPosition[String] = "110,666,792,1186"
 
diff --git a/pump-probe.lvproj b/pump-probe.lvproj
@@ -80,6 +80,7 @@
 			<Item Name="stage.vi" Type="VI" URL="../stage.vi"/>
 			<Item Name="viewAndTarget.vi" Type="VI" URL="../viewAndTarget.vi"/>
 			<Item Name="volumeOpenAndDisplay.vi" Type="VI" URL="../volumeOpenAndDisplay.vi"/>
+			<Item Name="wholeBrainImagerGreenBlue.vi" Type="VI" URL="../wholeBrainImagerGreenBlue.vi"/>
 			<Item Name="xbox.vi" Type="VI" URL="../xbox.vi"/>
 		</Item>
 		<Item Name="main" Type="Folder">
@@ -126,6 +127,9 @@
 			<Item Name="subvi-devices" Type="Folder">
 				<Property Name="NI.SortType" Type="Int">0</Property>
 				<Item Name="subvi-devicesUtilities" Type="Folder">
+					<Item Name="cwlaserSelectorEnable.vi" Type="VI" URL="../cwlaserSelectorEnable.vi"/>
+					<Item Name="cwlaserSelectorOpen.vi" Type="VI" URL="../cwlaserSelectorOpen.vi"/>
+					<Item Name="cwlaserShutterFromWavelength.vi" Type="VI" URL="../cwlaserShutterFromWavelength.vi"/>
 					<Item Name="etlCalibration.vi" Type="VI" URL="../etlCalibration.vi"/>
 					<Item Name="etlConversion01.vi" Type="VI" URL="../etlConversion01.vi"/>
 					<Item Name="galvoGeneratePositionsGrid.vi" Type="VI" URL="../galvoGeneratePositionsGrid.vi"/>
@@ -143,6 +147,7 @@
 					<Item Name="piezoTestCalibration.vi" Type="VI" URL="../piezoTestCalibration.vi"/>
 					<Item Name="piezoTriangleWave.vi" Type="VI" URL="../piezoTriangleWave.vi"/>
 					<Item Name="remoteFocussingConversion.vi" Type="VI" URL="../remoteFocussingConversion.vi"/>
+					<Item Name="shutterGetList.vi" Type="VI" URL="../shutterGetList.vi"/>
 					<Item Name="xboxToggle.vi" Type="VI" URL="../xboxToggle.vi"/>
 				</Item>
 				<Item Name="csuClose.vi" Type="VI" URL="../csuClose.vi"/>
@@ -155,6 +160,8 @@
 				<Item Name="cwlaserOnOff.vi" Type="VI" URL="../cwlaserOnOff.vi"/>
 				<Item Name="cwlaserOpen.vi" Type="VI" URL="../cwlaserOpen.vi"/>
 				<Item Name="cwlaserSetPower.vi" Type="VI" URL="../cwlaserSetPower.vi"/>
+				<Item Name="cwlaserShutterOpenClose.vi" Type="VI" URL="../cwlaserShutterOpenClose.vi"/>
+				<Item Name="cwlaserShutterOpenOneCloseOthers.vi" Type="VI" URL="../cwlaserShutterOpenOneCloseOthers.vi"/>
 				<Item Name="daqCreateFile.vi" Type="VI" URL="../daqCreateFile.vi"/>
 				<Item Name="daqRead.vi" Type="VI" URL="../daqRead.vi"/>
 				<Item Name="daqReadEtl.vi" Type="VI" URL="../daqReadEtl.vi"/>
@@ -236,7 +243,12 @@
 				<Item Name="piezoWriteWriteFuncGen.vi" Type="VI" URL="../piezoWriteWriteFuncGen.vi"/>
 				<Item Name="piezoWriteWriteFuncGenNew.vi" Type="VI" URL="../piezoWriteWriteFuncGenNew.vi"/>
 				<Item Name="piezoWriteWriteSingleVolume.vi" Type="VI" URL="../piezoWriteWriteSingleVolume.vi"/>
+				<Item Name="shuttersClose.vi" Type="VI" URL="../shuttersClose.vi"/>
+				<Item Name="shuttersCloseShutter.vi" Type="VI" URL="../shuttersCloseShutter.vi"/>
+				<Item Name="shuttersOpen.vi" Type="VI" URL="../shuttersOpen.vi"/>
+				<Item Name="shuttersOpenShutter.vi" Type="VI" URL="../shuttersOpenShutter.vi"/>
 				<Item Name="sliderClose.vi" Type="VI" URL="../sliderClose.vi"/>
+				<Item Name="sliderFwBw.vi" Type="VI" URL="../sliderFwBw.vi"/>
 				<Item Name="sliderGetPosition.vi" Type="VI" URL="../sliderGetPosition.vi"/>
 				<Item Name="sliderMove.vi" Type="VI" URL="../sliderMove.vi"/>
 				<Item Name="sliderOpen.vi" Type="VI" URL="../sliderOpen.vi"/>

diff --git a/shutterGetList.vi b/shutterGetList.vi
diff --git a/shuttersClose.vi b/shuttersClose.vi
diff --git a/shuttersCloseShutter.vi b/shuttersCloseShutter.vi
diff --git a/shuttersOpen.vi b/shuttersOpen.vi
diff --git a/shuttersOpenShutter.vi b/shuttersOpenShutter.vi
diff --git a/slider.vi b/slider.vi
diff --git a/sliderClose.vi b/sliderClose.vi
diff --git a/sliderFwBw.vi b/sliderFwBw.vi
diff --git a/sliderGetPosition.vi b/sliderGetPosition.vi
diff --git a/sliderMove.vi b/sliderMove.vi
diff --git a/sliderOpen.vi b/sliderOpen.vi
diff --git a/sliderResetConnection.vi b/sliderResetConnection.vi
diff --git a/wholeBrainImagerGreenBlue.vi b/wholeBrainImagerGreenBlue.vi
diff --git a/xboxToggle.vi b/xboxToggle.vi