diff --git a/TunableLens/Optotune Lens Driver 4 Labview package/160620 Optotune Lens Driver 4 Labview package/Lens Driver (20.06.2016)/Lens Driver.lvproj b/TunableLens/Optotune Lens Driver 4 Labview package/160620 Optotune Lens Driver 4 Labview package/Lens Driver (20.06.2016)/Lens Driver.lvproj index efcc429..59fc2c4 100644 --- a/TunableLens/Optotune Lens Driver 4 Labview package/160620 Optotune Lens Driver 4 Labview package/Lens Driver (20.06.2016)/Lens Driver.lvproj +++ b/TunableLens/Optotune Lens Driver 4 Labview package/160620 Optotune Lens Driver 4 Labview package/Lens Driver (20.06.2016)/Lens Driver.lvproj @@ -1,5 +1,5 @@  - + 100 diff --git a/acquisitionFindFrameInBuffer.vi b/acquisitionFindFrameInBuffer.vi new file mode 100644 index 0000000..7443a14 Binary files /dev/null and b/acquisitionFindFrameInBuffer.vi differ diff --git a/acquisitionGetChannelsFromFrame.vi b/acquisitionGetChannelsFromFrame.vi index b5e7bfe..15e9bef 100644 Binary files a/acquisitionGetChannelsFromFrame.vi and b/acquisitionGetChannelsFromFrame.vi differ diff --git a/acquisitionGetFrame.vi b/acquisitionGetFrame.vi index 593b0ab..28e0791 100644 Binary files a/acquisitionGetFrame.vi and b/acquisitionGetFrame.vi differ diff --git a/acquisitionGetVolume.vi b/acquisitionGetVolume.vi index 4ad394d..9afa3c2 100644 Binary files a/acquisitionGetVolume.vi and b/acquisitionGetVolume.vi differ diff --git a/acquisitionGetZLatestVolume.vi b/acquisitionGetZLatestVolume.vi new file mode 100644 index 0000000..fac0d5c Binary files /dev/null and b/acquisitionGetZLatestVolume.vi differ diff --git a/acquisitionReorderFrames.vi b/acquisitionReorderFrames.vi new file mode 100644 index 0000000..17f68e0 Binary files /dev/null and b/acquisitionReorderFrames.vi differ diff --git a/acquisitionSaveFrames.vi b/acquisitionSaveFrames.vi index 9cc480a..0521166 100644 Binary files a/acquisitionSaveFrames.vi and b/acquisitionSaveFrames.vi differ diff --git a/acquisitionStepByStep.vi b/acquisitionStepByStep.vi index 8fe6a6a..b326a04 100644 Binary files a/acquisitionStepByStep.vi and b/acquisitionStepByStep.vi differ diff --git a/computeDisplayImages.vi b/computeDisplayImages.vi index 697afda..56008e8 100644 Binary files a/computeDisplayImages.vi and b/computeDisplayImages.vi differ diff --git a/configurePorts.vi b/configurePorts.vi index 782928d..f2dcebc 100644 Binary files a/configurePorts.vi and b/configurePorts.vi differ diff --git a/csu.vi b/csu.vi index ba6a9d7..3f0e294 100644 Binary files a/csu.vi and b/csu.vi differ diff --git a/csuClose.vi b/csuClose.vi index 099bc40..dd05a69 100644 Binary files a/csuClose.vi and b/csuClose.vi differ diff --git a/csuCloseShutter.vi b/csuCloseShutter.vi index c96d497..fa750b1 100644 Binary files a/csuCloseShutter.vi and b/csuCloseShutter.vi differ diff --git a/csuOpen.vi b/csuOpen.vi index 6819eb8..bfadc78 100644 Binary files a/csuOpen.vi and b/csuOpen.vi differ diff --git a/csuOpenShutter.vi b/csuOpenShutter.vi index f233608..8a2c6c4 100644 Binary files a/csuOpenShutter.vi and b/csuOpenShutter.vi differ diff --git a/cwlaserClose.vi b/cwlaserClose.vi index 218fc7d..a5490f2 100644 Binary files a/cwlaserClose.vi and b/cwlaserClose.vi differ diff --git a/cwlaserOpen.vi b/cwlaserOpen.vi index 46a4d2e..806451a 100644 Binary files a/cwlaserOpen.vi and b/cwlaserOpen.vi differ diff --git a/cwlaserSetPower.vi b/cwlaserSetPower.vi index 840a395..095feee 100644 Binary files a/cwlaserSetPower.vi and b/cwlaserSetPower.vi differ diff --git a/cwlaserShutterFromWavelength.vi b/cwlaserShutterFromWavelength.vi index 6791298..d96d01e 100644 Binary files a/cwlaserShutterFromWavelength.vi and b/cwlaserShutterFromWavelength.vi differ diff --git a/cwlaserShutterOpenOneCloseOthers.vi b/cwlaserShutterOpenOneCloseOthers.vi index 91dd63d..6527775 100644 Binary files a/cwlaserShutterOpenOneCloseOthers.vi and b/cwlaserShutterOpenOneCloseOthers.vi differ diff --git a/daqCreateFile.vi b/daqCreateFile.vi index 480deca..fa9a1bd 100644 Binary files a/daqCreateFile.vi and b/daqCreateFile.vi differ diff --git a/daqRead.vi b/daqRead.vi index 55f67f7..b9886a3 100644 Binary files a/daqRead.vi and b/daqRead.vi differ diff --git a/daqReadEtl.vi b/daqReadEtl.vi index 4c7566f..b280196 100644 Binary files a/daqReadEtl.vi and b/daqReadEtl.vi differ diff --git a/daqReadEtlSegment.vi b/daqReadEtlSegment.vi new file mode 100644 index 0000000..9d1b201 Binary files /dev/null and b/daqReadEtlSegment.vi differ diff --git a/displayVolume.vi b/displayVolume.vi index 0b2b2db..23b026e 100644 Binary files a/displayVolume.vi and b/displayVolume.vi differ diff --git a/dll/wormUtilities/.vs/wormUtilities/v15/.suo b/dll/wormUtilities/.vs/wormUtilities/v15/.suo index e3d46fd..2f58486 100644 Binary files a/dll/wormUtilities/.vs/wormUtilities/v15/.suo and b/dll/wormUtilities/.vs/wormUtilities/v15/.suo differ diff --git a/dll/wormUtilities/.vs/wormUtilities/v15/Browse.VC.db b/dll/wormUtilities/.vs/wormUtilities/v15/Browse.VC.db deleted file mode 100644 index 9300841..0000000 Binary files a/dll/wormUtilities/.vs/wormUtilities/v15/Browse.VC.db and /dev/null differ diff --git a/dll/wormUtilities/.vs/wormUtilities/v15/ipch/abf42a6bdbb9438f.ipch b/dll/wormUtilities/.vs/wormUtilities/v15/ipch/abf42a6bdbb9438f.ipch index 0f370a9..a7fec15 100644 Binary files a/dll/wormUtilities/.vs/wormUtilities/v15/ipch/abf42a6bdbb9438f.ipch and b/dll/wormUtilities/.vs/wormUtilities/v15/ipch/abf42a6bdbb9438f.ipch differ diff --git a/dll/wormUtilities/wormUtilities/Header.h b/dll/wormUtilities/wormUtilities/Header.h index ba5090b..779be2d 100644 --- a/dll/wormUtilities/wormUtilities/Header.h +++ b/dll/wormUtilities/wormUtilities/Header.h @@ -16,6 +16,8 @@ extern "C" WORMUTILITIES_API void segment_singleframe( double &maxX, double &maxY, double maxXInStack, double maxYInStack, float threshold, bool resize); +float kthlargest(float array[], int size, int k); + extern "C" WORMUTILITIES_API void segment_check2dcandidates_5planes( float ArrB0[], float ArrB1[], float ArrB2[], float ArrB3[], float ArrB4[], signed __int32 sizeBx, signed __int32 sizeBy, @@ -44,11 +46,25 @@ extern "C" WORMUTILITIES_API void gmmreg_registration( extern "C" WORMUTILITIES_API void dsmm_registration(double *X, double *Y, int M, int N, int D, double beta, double lambda, double neighbor_cutoff, - double alpha, double conv_epsilon, + double alpha, double gamma0, + double conv_epsilon, double eq_tol, double *pwise_dist, double *pwise_distYY, double *Gamma, double *CDE_term, double *w, double *F_t, double *wF_t, double *wF_t_sum, - double *p, double *u, + double *p, double *u, int *Match, double *hatP, double *hatPI_diag, double *hatPIG, double *hatPX, double *hatPIY, double *G, double *W, double *GW, - double *sumPoverN, double *expAlphaSumPoverN); \ No newline at end of file + double *sumPoverN, double *expAlphaSumPoverN); + +extern "C" WORMUTILITIES_API void displayImg(uint16_t* ArrA, int sizex, int sizey, int refresh_time, float* stop); + +extern "C" WORMUTILITIES_API uint16_t* stealPointer_uint16(uint16_t* A); +extern "C" WORMUTILITIES_API float* stealPointer_float(float* A); +extern "C" WORMUTILITIES_API float* stealPointer_float(float* A); +extern "C" WORMUTILITIES_API uint16_t* allocateArray_uint16(int size); +extern "C" WORMUTILITIES_API void deallocateArray_uint16(uint16_t* ptr); +extern "C" WORMUTILITIES_API void writeInArray_uint16(uint16_t* src, uint16_t* dst, int size); + +extern "C" WORMUTILITIES_API double displayImg_py(uint16_t* ArrA, int sizex, int sizey, int refresh_time, float* stop); +extern "C" WORMUTILITIES_API double hyperstack(uint16_t* ArrA, int shape0, int shape1, int shape2, int shape3, float* stop, float* out, int out_n, double refresh_time); +extern "C" WORMUTILITIES_API double python_emb(); \ No newline at end of file diff --git a/dll/wormUtilities/wormUtilities/wormUtilities.cpp b/dll/wormUtilities/wormUtilities/wormUtilities.cpp index 670b6cf..1eff84d 100644 Binary files a/dll/wormUtilities/wormUtilities/wormUtilities.cpp and b/dll/wormUtilities/wormUtilities/wormUtilities.cpp differ diff --git a/dll/wormUtilities/wormUtilities/wormUtilities.vcxproj b/dll/wormUtilities/wormUtilities/wormUtilities.vcxproj index 7885cb9..af71b67 100644 --- a/dll/wormUtilities/wormUtilities/wormUtilities.vcxproj +++ b/dll/wormUtilities/wormUtilities/wormUtilities.vcxproj @@ -81,6 +81,7 @@ false + $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64; @@ -141,7 +142,7 @@ true NDEBUG;WORMUTILITIES_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - $(OPENCV_DIR)\..\..\include;C:\Users\francesco\dev\vxl\build\include\vxl\core;C:\Users\francesco\dev\vxl\build\include\vxl\vcl;C:\Users\francesco\dev\gmmreg-lw\gmmreg_lw;;C:\Users\francesco\dev\wormbrain\dsmm;;C:\Users\francesco\dev\eigen;;C:\Users\francesco\dev\boost; + $(OPENCV_DIR)\..\..\include;C:\Users\francesco\dev\vxl\build\include\vxl\core;C:\Users\francesco\dev\vxl\build\include\vxl\vcl;C:\Users\francesco\dev\gmmreg-lw\gmmreg_lw;C:\Users\francesco\dev\wormbrain\dsmm;C:\Users\francesco\dev\include;C:\Users\francesco\dev\include\eigen\;C:\Users\francesco\dev\include\eigen\Eigen\;C:\Users\francesco\Anaconda3\include\;C:\Users\francesco\Anaconda3\Lib\site-packages\numpy\core\include\numpy Speed @@ -151,14 +152,16 @@ false true StdAfx.h;%(ForcedIncludeFiles) + true + Fast Windows true true true - $(OPENCV_DIR)\lib;C:\Users\francesco\dev\vxl\build\lib - opencv_world341.lib;vnl_algo.lib;vnl.lib;v3p_netlib.lib;%(AdditionalDependencies) + $(OPENCV_DIR)\lib;C:\Users\francesco\dev\vxl\build\lib;C:\Users\francesco\Anaconda3\libs; + opencv_world341.lib;vnl_algo.lib;vnl.lib;v3p_netlib.lib;%(AdditionalDependencies);python36.lib diff --git a/dll/wormUtilities/wormUtilities/x64/Release/dllmain.obj b/dll/wormUtilities/wormUtilities/x64/Release/dllmain.obj index a87b74e..ebb4752 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/dllmain.obj and b/dll/wormUtilities/wormUtilities/x64/Release/dllmain.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/dsmm.obj b/dll/wormUtilities/wormUtilities/x64/Release/dsmm.obj index 16c8fa5..f9e17f1 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/dsmm.obj and b/dll/wormUtilities/wormUtilities/x64/Release/dsmm.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/dsmm_utils.obj b/dll/wormUtilities/wormUtilities/x64/Release/dsmm_utils.obj index f36a281..768bdb8 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/dsmm_utils.obj and b/dll/wormUtilities/wormUtilities/x64/Release/dsmm_utils.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw.obj b/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw.obj index c83fcc4..229944e 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw.obj and b/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw_ext.obj b/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw_ext.obj index e781a80..256d7cb 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw_ext.obj and b/dll/wormUtilities/wormUtilities/x64/Release/gmmreg_lw_ext.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/stdafx.obj b/dll/wormUtilities/wormUtilities/x64/Release/stdafx.obj index e178951..d72cf01 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/stdafx.obj and b/dll/wormUtilities/wormUtilities/x64/Release/stdafx.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/vc141.pdb b/dll/wormUtilities/wormUtilities/x64/Release/vc141.pdb index ac39ad6..5de6c5e 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/vc141.pdb and b/dll/wormUtilities/wormUtilities/x64/Release/vc141.pdb differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.log b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.log index 65ebd3c..891a650 100644 --- a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.log +++ b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.log @@ -1,8 +1,12 @@ - dsmm.cpp + wormUtilities.cpp +c1xx : warning C4199: two-phase name lookup is not supported for C++/CLI, C++/CX, or OpenMP; use /Zc:twoPhase- +c:\users\francesco\anaconda3\lib\site-packages\numpy\core\include\numpy\npy_1_7_deprecated_api.h(12): warning Msg: Using deprecated NumPy API, disable it by #defining NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION +c:\users\francesco\dev\pump-probe\dll\wormutilities\wormutilities\wormutilities.cpp(133): warning C4101: 'minY': unreferenced local variable +c:\users\francesco\dev\pump-probe\dll\wormutilities\wormutilities\wormutilities.cpp(133): warning C4101: 'minX': unreferenced local variable Creating library C:\Users\francesco\dev\pump-probe\dll\wormUtilities\x64\Release\wormUtilities.lib and object C:\Users\francesco\dev\pump-probe\dll\wormUtilities\x64\Release\wormUtilities.exp Generating code - 2 of 2313 functions (<0.1%) were compiled, the rest were copied from previous compilation. + 2 of 2428 functions (<0.1%) were compiled, the rest were copied from previous compilation. 0 functions were new in current compilation - 2 functions had inline decision re-evaluated but remain unchanged + 4 functions had inline decision re-evaluated but remain unchanged Finished generating code wormUtilities.vcxproj -> C:\Users\francesco\dev\pump-probe\dll\wormUtilities\x64\Release\wormUtilities.dll diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.obj b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.obj index 33ad17b..7efb583 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.obj and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.obj differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.pch b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.pch index 6ea6bb0..0199f02 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.pch and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.pch differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.command.1.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.command.1.tlog index 62be7a8..4259778 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.command.1.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.command.1.tlog differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.read.1.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.read.1.tlog index aba115f..1b41e1b 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.read.1.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.read.1.tlog differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.write.1.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.write.1.tlog index bb4ef33..0cd0b3d 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.write.1.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/CL.write.1.tlog differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.command.1.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.command.1.tlog index 16c5d2c..bdccb51 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.command.1.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.command.1.tlog differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.delete.1.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.delete.1.tlog index 00ed763..510f4e8 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.delete.1.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.delete.1.tlog differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.read.1.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.read.1.tlog index 2df46c2..97f100a 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.read.1.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/link.read.1.tlog differ diff --git a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/wormUtilities.write.1u.tlog b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/wormUtilities.write.1u.tlog index c405218..96b78a0 100644 Binary files a/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/wormUtilities.write.1u.tlog and b/dll/wormUtilities/wormUtilities/x64/Release/wormUtilities.tlog/wormUtilities.write.1u.tlog differ diff --git a/dll/wormUtilities/x64/Release/opencv_world341.dll b/dll/wormUtilities/x64/Release/opencv_world341.dll deleted file mode 100644 index 736e39d..0000000 Binary files a/dll/wormUtilities/x64/Release/opencv_world341.dll and /dev/null differ diff --git a/dll/wormUtilities/x64/Release/wormUtilities.dll b/dll/wormUtilities/x64/Release/wormUtilities.dll index 399ca1b..699da8b 100644 Binary files a/dll/wormUtilities/x64/Release/wormUtilities.dll and b/dll/wormUtilities/x64/Release/wormUtilities.dll differ diff --git a/dll/wormUtilities/x64/Release/wormUtilities.exp b/dll/wormUtilities/x64/Release/wormUtilities.exp index bb2a468..79c928f 100644 Binary files a/dll/wormUtilities/x64/Release/wormUtilities.exp and b/dll/wormUtilities/x64/Release/wormUtilities.exp differ diff --git a/dll/wormUtilities/x64/Release/wormUtilities.iobj b/dll/wormUtilities/x64/Release/wormUtilities.iobj index b2250f5..66cb007 100644 Binary files a/dll/wormUtilities/x64/Release/wormUtilities.iobj and b/dll/wormUtilities/x64/Release/wormUtilities.iobj differ diff --git a/dll/wormUtilities/x64/Release/wormUtilities.ipdb b/dll/wormUtilities/x64/Release/wormUtilities.ipdb index 8d92b34..f0ed564 100644 Binary files a/dll/wormUtilities/x64/Release/wormUtilities.ipdb and b/dll/wormUtilities/x64/Release/wormUtilities.ipdb differ diff --git a/dll/wormUtilities/x64/Release/wormUtilities.lib b/dll/wormUtilities/x64/Release/wormUtilities.lib index 2418c30..da90fc4 100644 Binary files a/dll/wormUtilities/x64/Release/wormUtilities.lib and b/dll/wormUtilities/x64/Release/wormUtilities.lib differ diff --git a/dll/wormUtilities/x64/Release/wormUtilities.pdb b/dll/wormUtilities/x64/Release/wormUtilities.pdb index f345a22..08fb4cb 100644 Binary files a/dll/wormUtilities/x64/Release/wormUtilities.pdb and b/dll/wormUtilities/x64/Release/wormUtilities.pdb differ diff --git a/dll/wormUtilities/x64/wormUtilities.dll b/dll/wormUtilities/x64/wormUtilities.dll new file mode 100644 index 0000000..0ded4f2 Binary files /dev/null and b/dll/wormUtilities/x64/wormUtilities.dll differ diff --git a/dsmm-registration.vi b/dsmm-registration.vi new file mode 100644 index 0000000..9e7723e Binary files /dev/null and b/dsmm-registration.vi differ diff --git a/dsmm-registrationLowLevel.vi b/dsmm-registrationLowLevel.vi deleted file mode 100644 index f3b6fb0..0000000 Binary files a/dsmm-registrationLowLevel.vi and /dev/null differ diff --git a/dsmm-test.vi b/dsmm-test.vi index c4619b4..d041e11 100644 Binary files a/dsmm-test.vi and b/dsmm-test.vi differ diff --git a/dsmmGeneratePlot.vi b/dsmmGeneratePlot.vi new file mode 100644 index 0000000..c93be0d Binary files /dev/null and b/dsmmGeneratePlot.vi differ diff --git a/dsmmTrackNeuron.vi b/dsmmTrackNeuron.vi new file mode 100644 index 0000000..cef1cb5 Binary files /dev/null and b/dsmmTrackNeuron.vi differ diff --git a/etlCalibration.vi b/etlCalibration.vi index 05e78f5..e5ac7ba 100644 Binary files a/etlCalibration.vi and b/etlCalibration.vi differ diff --git a/etlClose.vi b/etlClose.vi index 17b9210..7b65266 100644 Binary files a/etlClose.vi and b/etlClose.vi differ diff --git a/etlConversion01.vi b/etlConversion01.vi index c2084aa..74ffc15 100644 Binary files a/etlConversion01.vi and b/etlConversion01.vi differ diff --git a/etlOpen.vi b/etlOpen.vi index e34d906..3d5cce5 100644 Binary files a/etlOpen.vi and b/etlOpen.vi differ diff --git a/etlReadClose.vi b/etlReadClose.vi index 77f55df..ab6fe7d 100644 Binary files a/etlReadClose.vi and b/etlReadClose.vi differ diff --git a/etlReadOpen.vi b/etlReadOpen.vi index a99b467..f58e558 100644 Binary files a/etlReadOpen.vi and b/etlReadOpen.vi differ diff --git a/etlUSBClose.vi b/etlUSBClose.vi index a67558f..e4bbea4 100644 Binary files a/etlUSBClose.vi and b/etlUSBClose.vi differ diff --git a/etlUSBOpen.vi b/etlUSBOpen.vi index 5548309..6c0afdb 100644 Binary files a/etlUSBOpen.vi and b/etlUSBOpen.vi differ diff --git a/etlUSBSetMode.vi b/etlUSBSetMode.vi index 1642bb2..4040174 100644 Binary files a/etlUSBSetMode.vi and b/etlUSBSetMode.vi differ diff --git a/etlUSBWrite.vi b/etlUSBWrite.vi index 1e918ff..f22b819 100644 Binary files a/etlUSBWrite.vi and b/etlUSBWrite.vi differ diff --git a/etlWriteFuncGen.vi b/etlWriteFuncGen.vi index cac89b4..a352b09 100644 Binary files a/etlWriteFuncGen.vi and b/etlWriteFuncGen.vi differ diff --git a/etlWriteFuncGenWithDelayedSignal.vi b/etlWriteFuncGenWithDelayedSignal.vi index 2ebee7d..193838f 100644 Binary files a/etlWriteFuncGenWithDelayedSignal.vi and b/etlWriteFuncGenWithDelayedSignal.vi differ diff --git a/fileAsynchronousClose.vi b/fileAsynchronousClose.vi index 1f591e9..3131f28 100644 Binary files a/fileAsynchronousClose.vi and b/fileAsynchronousClose.vi differ diff --git a/fileAsynchronousCreate.vi b/fileAsynchronousCreate.vi index 866ee9c..f17cf2a 100644 Binary files a/fileAsynchronousCreate.vi and b/fileAsynchronousCreate.vi differ diff --git a/fileDatOpen.vi b/fileDatOpen.vi index 533bce9..80c7d2a 100644 Binary files a/fileDatOpen.vi and b/fileDatOpen.vi differ diff --git a/fileDelete.vi b/fileDelete.vi index 0de723f..b55d2d5 100644 Binary files a/fileDelete.vi and b/fileDelete.vi differ diff --git a/fileObjectivesRegistrationLoad.vi b/fileObjectivesRegistrationLoad.vi index bf28438..8eff73d 100644 Binary files a/fileObjectivesRegistrationLoad.vi and b/fileObjectivesRegistrationLoad.vi differ diff --git a/fileObjectivesRegistrationMostRecent.vi b/fileObjectivesRegistrationMostRecent.vi index fe2e459..ec1bdc1 100644 Binary files a/fileObjectivesRegistrationMostRecent.vi and b/fileObjectivesRegistrationMostRecent.vi differ diff --git a/fileObjectivesRegistrationSave.vi b/fileObjectivesRegistrationSave.vi index efc30b7..87544c7 100644 Binary files a/fileObjectivesRegistrationSave.vi and b/fileObjectivesRegistrationSave.vi differ diff --git a/fileObjectivesRegistrationSaveMulti.vi b/fileObjectivesRegistrationSaveMulti.vi new file mode 100644 index 0000000..462a309 Binary files /dev/null and b/fileObjectivesRegistrationSaveMulti.vi differ diff --git a/fileRedGreenRegistrationLoad.vi b/fileRedGreenRegistrationLoad.vi index 88c65da..acd3d63 100644 Binary files a/fileRedGreenRegistrationLoad.vi and b/fileRedGreenRegistrationLoad.vi differ diff --git a/filterWheelClose.vi b/filterWheelClose.vi index 36c2f1e..ae4c460 100644 Binary files a/filterWheelClose.vi and b/filterWheelClose.vi differ diff --git a/filterWheelGetPosition.vi b/filterWheelGetPosition.vi index e13ad8f..1c3a2d6 100644 Binary files a/filterWheelGetPosition.vi and b/filterWheelGetPosition.vi differ diff --git a/filterWheelMove.vi b/filterWheelMove.vi index 9e7f0c9..ac6d8f2 100644 Binary files a/filterWheelMove.vi and b/filterWheelMove.vi differ diff --git a/filterWheelOpen.vi b/filterWheelOpen.vi index 28ff0ec..3f4fe4e 100644 Binary files a/filterWheelOpen.vi and b/filterWheelOpen.vi differ diff --git a/filterWheelThorlabs.vi b/filterWheelThorlabs.vi new file mode 100644 index 0000000..23173ad Binary files /dev/null and b/filterWheelThorlabs.vi differ diff --git a/filterWheelThorlabsClose.vi b/filterWheelThorlabsClose.vi new file mode 100644 index 0000000..bf248a7 Binary files /dev/null and b/filterWheelThorlabsClose.vi differ diff --git a/filterWheelThorlabsGetPosition.vi b/filterWheelThorlabsGetPosition.vi new file mode 100644 index 0000000..dbb966a Binary files /dev/null and b/filterWheelThorlabsGetPosition.vi differ diff --git a/filterWheelThorlabsMove.vi b/filterWheelThorlabsMove.vi new file mode 100644 index 0000000..a61aa71 Binary files /dev/null and b/filterWheelThorlabsMove.vi differ diff --git a/filterWheelThorlabsOpen.vi b/filterWheelThorlabsOpen.vi new file mode 100644 index 0000000..6eca1ae Binary files /dev/null and b/filterWheelThorlabsOpen.vi differ diff --git a/findAndTargetNeuronsNew.vi b/findAndTargetNeuronsNew.vi index d1b9edf..76d8af4 100644 Binary files a/findAndTargetNeuronsNew.vi and b/findAndTargetNeuronsNew.vi differ diff --git a/flash.vi b/flash.vi index 6d542b7..40a3b5b 100644 Binary files a/flash.vi and b/flash.vi differ diff --git a/flashClose.vi b/flashClose.vi index af493be..39bf2d7 100644 Binary files a/flashClose.vi and b/flashClose.vi differ diff --git a/flashFlash.vi b/flashFlash.vi index 06c3b58..40243cf 100644 Binary files a/flashFlash.vi and b/flashFlash.vi differ diff --git a/flashOpen.vi b/flashOpen.vi index 0e8d1da..526ca1d 100644 Binary files a/flashOpen.vi and b/flashOpen.vi differ diff --git a/focusKnobClose.vi b/focusKnobClose.vi index 622ff22..6b43815 100644 Binary files a/focusKnobClose.vi and b/focusKnobClose.vi differ diff --git a/focusKnobMove.vi b/focusKnobMove.vi index 714a7f2..1c2becf 100644 Binary files a/focusKnobMove.vi and b/focusKnobMove.vi differ diff --git a/focusKnobOpen.vi b/focusKnobOpen.vi index 11d1e9d..f612fa4 100644 Binary files a/focusKnobOpen.vi and b/focusKnobOpen.vi differ diff --git a/galvoGeneratePositionsGrid.vi b/galvoGeneratePositionsGrid.vi index 90094ba..3f91f10 100644 Binary files a/galvoGeneratePositionsGrid.vi and b/galvoGeneratePositionsGrid.vi differ diff --git a/galvoWriteClose.vi b/galvoWriteClose.vi index 4ff9f4c..94f9b5b 100644 Binary files a/galvoWriteClose.vi and b/galvoWriteClose.vi differ diff --git a/galvoWriteOpen.vi b/galvoWriteOpen.vi index 39ff0d7..6117f82 100644 Binary files a/galvoWriteOpen.vi and b/galvoWriteOpen.vi differ diff --git a/galvoWriteWrite.vi b/galvoWriteWrite.vi index 82440c4..a8bb377 100644 Binary files a/galvoWriteWrite.vi and b/galvoWriteWrite.vi differ diff --git a/gaussianFitTestWithData.vi b/gaussianFitTestWithData.vi index 71033a8..5d50dbc 100644 Binary files a/gaussianFitTestWithData.vi and b/gaussianFitTestWithData.vi differ diff --git a/globalDevices.vi b/globalDevices.vi index 57ff01c..ace3425 100644 Binary files a/globalDevices.vi and b/globalDevices.vi differ diff --git a/globalUtilities.vi b/globalUtilities.vi index b0e08de..e9464f9 100644 Binary files a/globalUtilities.vi and b/globalUtilities.vi differ diff --git a/gmmregRegisterRedAndGreen.vi b/gmmregRegisterRedAndGreen.vi index 26dcedf..118ed0b 100644 Binary files a/gmmregRegisterRedAndGreen.vi and b/gmmregRegisterRedAndGreen.vi differ diff --git a/hamamatsuBufferComplete.vi b/hamamatsuBufferComplete.vi index 06e02e5..de25bf9 100644 Binary files a/hamamatsuBufferComplete.vi and b/hamamatsuBufferComplete.vi differ diff --git a/hamamatsuBufferIndexesAndFrames.vi b/hamamatsuBufferIndexesAndFrames.vi index 10dcccc..c0e5107 100644 Binary files a/hamamatsuBufferIndexesAndFrames.vi and b/hamamatsuBufferIndexesAndFrames.vi differ diff --git a/hamamatsuClose.vi b/hamamatsuClose.vi index 96db1ab..42b62f3 100644 Binary files a/hamamatsuClose.vi and b/hamamatsuClose.vi differ diff --git a/hamamatsuExposureTimeChange.vi b/hamamatsuExposureTimeChange.vi index f4bfbe1..8b756dc 100644 Binary files a/hamamatsuExposureTimeChange.vi and b/hamamatsuExposureTimeChange.vi differ diff --git a/hamamatsuFrameCounterClose.vi b/hamamatsuFrameCounterClose.vi index 9667e29..a461d49 100644 Binary files a/hamamatsuFrameCounterClose.vi and b/hamamatsuFrameCounterClose.vi differ diff --git a/hamamatsuFrameCounterOpen.vi b/hamamatsuFrameCounterOpen.vi index 359c91f..9589801 100644 Binary files a/hamamatsuFrameCounterOpen.vi and b/hamamatsuFrameCounterOpen.vi differ diff --git a/hamamatsuOpen.vi b/hamamatsuOpen.vi index 004e394..3933ad3 100644 Binary files a/hamamatsuOpen.vi and b/hamamatsuOpen.vi differ diff --git a/hamamatsuParameters.vi b/hamamatsuParameters.vi index 7280eed..ef80fe0 100644 Binary files a/hamamatsuParameters.vi and b/hamamatsuParameters.vi differ diff --git a/hamamatsuRead.vi b/hamamatsuRead.vi index 3a21936..9d7a67a 100644 Binary files a/hamamatsuRead.vi and b/hamamatsuRead.vi differ diff --git a/hamamatsuReadSegment.vi b/hamamatsuReadSegment.vi new file mode 100644 index 0000000..e3ce24e Binary files /dev/null and b/hamamatsuReadSegment.vi differ diff --git a/hamamatsuReadToBuffer.vi b/hamamatsuReadToBuffer.vi index b59495b..2a5f41a 100644 Binary files a/hamamatsuReadToBuffer.vi and b/hamamatsuReadToBuffer.vi differ diff --git a/hamamatsuReadToRAM.vi b/hamamatsuReadToRAM.vi index 7d2f39b..e3777b5 100644 Binary files a/hamamatsuReadToRAM.vi and b/hamamatsuReadToRAM.vi differ diff --git a/hamamatsuRun.vi b/hamamatsuRun.vi index fba3fe6..149088e 100644 Binary files a/hamamatsuRun.vi and b/hamamatsuRun.vi differ diff --git a/hamamatsuSetExternalTrigger.vi b/hamamatsuSetExternalTrigger.vi index 6c1da6e..4367be6 100644 Binary files a/hamamatsuSetExternalTrigger.vi and b/hamamatsuSetExternalTrigger.vi differ diff --git a/initFilename.vi b/initFilename.vi index a7baa49..0aa06b2 100644 Binary files a/initFilename.vi and b/initFilename.vi differ diff --git a/initGeneralStop.vi b/initGeneralStop.vi index 798c4e8..ffeb17c 100644 Binary files a/initGeneralStop.vi and b/initGeneralStop.vi differ diff --git a/initVariables.vi b/initVariables.vi index 9fcec86..f809a46 100644 Binary files a/initVariables.vi and b/initVariables.vi differ diff --git a/logbook.vi b/logbook.vi index 94f219c..8735b55 100644 Binary files a/logbook.vi and b/logbook.vi differ diff --git a/logbookEntry.vi b/logbookEntry.vi index b6ded39..fe3645c 100644 Binary files a/logbookEntry.vi and b/logbookEntry.vi differ diff --git a/ludlRead.vi b/ludlRead.vi index 415472d..a564328 100644 Binary files a/ludlRead.vi and b/ludlRead.vi differ diff --git a/mainBeadAlignment.vi b/mainBeadAlignment.vi index d5c3a36..074a026 100644 Binary files a/mainBeadAlignment.vi and b/mainBeadAlignment.vi differ diff --git a/mainMultiColorWorm.vi b/mainMultiColorWorm.vi index f9f12fb..960b181 100644 Binary files a/mainMultiColorWorm.vi and b/mainMultiColorWorm.vi differ diff --git a/mainMultiColorWorm_2.vi b/mainMultiColorWorm_2.vi new file mode 100644 index 0000000..08c2e9a Binary files /dev/null and b/mainMultiColorWorm_2.vi differ diff --git a/mainObjectivesRegistration.vi b/mainObjectivesRegistration.vi index 6b6ef68..53ada29 100644 Binary files a/mainObjectivesRegistration.vi and b/mainObjectivesRegistration.vi differ diff --git a/mainObjectivesRegistrationEtl.vi b/mainObjectivesRegistrationEtl.vi index 1503ce7..19a0c04 100644 Binary files a/mainObjectivesRegistrationEtl.vi and b/mainObjectivesRegistrationEtl.vi differ diff --git a/mainObjectivesRegistrationEtl_2.vi b/mainObjectivesRegistrationEtl_2.vi new file mode 100644 index 0000000..e3a8c2f Binary files /dev/null and b/mainObjectivesRegistrationEtl_2.vi differ diff --git a/mainObjectivesRegistrationNew.vi b/mainObjectivesRegistrationNew.vi index d4c9c7b..b561cbf 100644 Binary files a/mainObjectivesRegistrationNew.vi and b/mainObjectivesRegistrationNew.vi differ diff --git a/mainPumpProbe.vi b/mainPumpProbe.vi index 323f135..a349ba4 100644 Binary files a/mainPumpProbe.vi and b/mainPumpProbe.vi differ diff --git a/mainRecord.vi b/mainRecord.vi index 0c4625b..13a9f79 100644 Binary files a/mainRecord.vi and b/mainRecord.vi differ diff --git a/mainUIDisplay.vi b/mainUIDisplay.vi index c5d1721..d9dd7f5 100644 Binary files a/mainUIDisplay.vi and b/mainUIDisplay.vi differ diff --git a/mainUIDisplayPython.vi b/mainUIDisplayPython.vi new file mode 100644 index 0000000..c17c5f8 Binary files /dev/null and b/mainUIDisplayPython.vi differ diff --git a/mainUIWholeBrainImager.vi b/mainUIWholeBrainImager.vi index d8fab60..44898f0 100644 Binary files a/mainUIWholeBrainImager.vi and b/mainUIWholeBrainImager.vi differ diff --git a/mainWholeBrainImager.vi b/mainWholeBrainImager.vi index 8c22499..cc48a47 100644 Binary files a/mainWholeBrainImager.vi and b/mainWholeBrainImager.vi differ diff --git a/multiColorWormMoleculeSettings.vi b/multiColorWormMoleculeSettings.vi index c32e29c..42a3b4d 100644 Binary files a/multiColorWormMoleculeSettings.vi and b/multiColorWormMoleculeSettings.vi differ diff --git a/multiColorWormSaveSettings.vi b/multiColorWormSaveSettings.vi index c1247da..05b7871 100644 Binary files a/multiColorWormSaveSettings.vi and b/multiColorWormSaveSettings.vi differ diff --git a/multiColorWormSetExposureTimeMultiplier.vi b/multiColorWormSetExposureTimeMultiplier.vi index 3d88da6..7eddd24 100644 Binary files a/multiColorWormSetExposureTimeMultiplier.vi and b/multiColorWormSetExposureTimeMultiplier.vi differ diff --git a/opencvDisplayImage.vi b/opencvDisplayImage.vi new file mode 100644 index 0000000..343d382 Binary files /dev/null and b/opencvDisplayImage.vi differ diff --git a/opencvDisplayImageTest.vi b/opencvDisplayImageTest.vi new file mode 100644 index 0000000..3b5b5ba Binary files /dev/null and b/opencvDisplayImageTest.vi differ diff --git a/opencvFindPeakTest.vi b/opencvFindPeakTest.vi index 422dfde..7c078c7 100644 Binary files a/opencvFindPeakTest.vi and b/opencvFindPeakTest.vi differ diff --git a/opencvSegment.vi b/opencvSegment.vi index 6ae30c6..d631ba4 100644 Binary files a/opencvSegment.vi and b/opencvSegment.vi differ diff --git a/opencvSegmentConvertCoordinates-multiFrames.vi b/opencvSegmentConvertCoordinates-multiFrames.vi index 4b960e0..555efb8 100644 Binary files a/opencvSegmentConvertCoordinates-multiFrames.vi and b/opencvSegmentConvertCoordinates-multiFrames.vi differ diff --git a/opencvSegmentConvertCoordinates-singleFrame.vi b/opencvSegmentConvertCoordinates-singleFrame.vi index f05d775..39d3986 100644 Binary files a/opencvSegmentConvertCoordinates-singleFrame.vi and b/opencvSegmentConvertCoordinates-singleFrame.vi differ diff --git a/opencvSegmentConvertCoordinates.vi b/opencvSegmentConvertCoordinates.vi index 7472833..27ca17b 100644 Binary files a/opencvSegmentConvertCoordinates.vi and b/opencvSegmentConvertCoordinates.vi differ diff --git a/opencvSegmentConvertCoordinatesAddZ.vi b/opencvSegmentConvertCoordinatesAddZ.vi index 7d5a20d..d2a0a5b 100644 Binary files a/opencvSegmentConvertCoordinatesAddZ.vi and b/opencvSegmentConvertCoordinatesAddZ.vi differ diff --git a/opencvSegmentLL2.vi b/opencvSegmentLL2.vi new file mode 100644 index 0000000..ec7b6dd Binary files /dev/null and b/opencvSegmentLL2.vi differ diff --git a/opencvSegmentMultiple.vi b/opencvSegmentMultiple.vi index 6be6dfc..9a5a56c 100644 Binary files a/opencvSegmentMultiple.vi and b/opencvSegmentMultiple.vi differ diff --git a/opencvSegmentMultipleTest.vi b/opencvSegmentMultipleTest.vi index 235a8e7..1922e10 100644 Binary files a/opencvSegmentMultipleTest.vi and b/opencvSegmentMultipleTest.vi differ diff --git a/opencvSegmentTest.vi b/opencvSegmentTest.vi index 9e580b8..e4ec2ac 100644 Binary files a/opencvSegmentTest.vi and b/opencvSegmentTest.vi differ diff --git a/opencvSegmentTestLL2.vi b/opencvSegmentTestLL2.vi new file mode 100644 index 0000000..85f8212 Binary files /dev/null and b/opencvSegmentTestLL2.vi differ diff --git a/opencvSegmentVisualize.vi b/opencvSegmentVisualize.vi index 7972765..7ed70e8 100644 Binary files a/opencvSegmentVisualize.vi and b/opencvSegmentVisualize.vi differ diff --git a/opencvSelectCandidateNeurons5Planes.vi b/opencvSelectCandidateNeurons5Planes.vi index 11b3617..4f85564 100644 Binary files a/opencvSelectCandidateNeurons5Planes.vi and b/opencvSelectCandidateNeurons5Planes.vi differ diff --git a/opencvSelectSubset.vi b/opencvSelectSubset.vi new file mode 100644 index 0000000..0de4122 Binary files /dev/null and b/opencvSelectSubset.vi differ diff --git a/optogeneticsExecuteIntensityScan.vi b/optogeneticsExecuteIntensityScan.vi new file mode 100644 index 0000000..6d96f6b Binary files /dev/null and b/optogeneticsExecuteIntensityScan.vi differ diff --git a/optogeneticsExecuteIntervalScan.vi b/optogeneticsExecuteIntervalScan.vi new file mode 100644 index 0000000..a35c2b9 Binary files /dev/null and b/optogeneticsExecuteIntervalScan.vi differ diff --git a/optogeneticsGenRandomTargets.vi b/optogeneticsGenRandomTargets.vi new file mode 100644 index 0000000..f175e8f Binary files /dev/null and b/optogeneticsGenRandomTargets.vi differ diff --git a/optogeneticsGetCoordsFromReferences.vi b/optogeneticsGetCoordsFromReferences.vi new file mode 100644 index 0000000..4e9a2db Binary files /dev/null and b/optogeneticsGetCoordsFromReferences.vi differ diff --git a/optogeneticsSelectFromList.vi b/optogeneticsSelectFromList.vi new file mode 100644 index 0000000..0e07e3d Binary files /dev/null and b/optogeneticsSelectFromList.vi differ diff --git a/optogeneticsSplitList.vi b/optogeneticsSplitList.vi new file mode 100644 index 0000000..3bc90a4 Binary files /dev/null and b/optogeneticsSplitList.vi differ diff --git a/optogeneticsTarget3D.vi b/optogeneticsTarget3D.vi index 2774565..667dc36 100644 Binary files a/optogeneticsTarget3D.vi and b/optogeneticsTarget3D.vi differ diff --git a/optogeneticsTarget3DMultiple.vi b/optogeneticsTarget3DMultiple.vi new file mode 100644 index 0000000..b552604 Binary files /dev/null and b/optogeneticsTarget3DMultiple.vi differ diff --git a/pharosClose.vi b/pharosClose.vi index 48d1812..a6fae14 100644 Binary files a/pharosClose.vi and b/pharosClose.vi differ diff --git a/pharosControl.vi b/pharosControl.vi index 30d7c9b..6f3a20b 100644 Binary files a/pharosControl.vi and b/pharosControl.vi differ diff --git a/pharosOpen.vi b/pharosOpen.vi index 2d0e030..96e958f 100644 Binary files a/pharosOpen.vi and b/pharosOpen.vi differ diff --git a/pharosOpenDynReg.vi b/pharosOpenDynReg.vi index 9784987..51b8241 100644 Binary files a/pharosOpenDynReg.vi and b/pharosOpenDynReg.vi differ diff --git a/pharosOpenDynRegBoolLines.vi b/pharosOpenDynRegBoolLines.vi new file mode 100644 index 0000000..ed36558 Binary files /dev/null and b/pharosOpenDynRegBoolLines.vi differ diff --git a/pharosReadClose.vi b/pharosReadClose.vi new file mode 100644 index 0000000..145344f Binary files /dev/null and b/pharosReadClose.vi differ diff --git a/pharosReadOpen.vi b/pharosReadOpen.vi new file mode 100644 index 0000000..c8b16b5 Binary files /dev/null and b/pharosReadOpen.vi differ diff --git a/pharosSet.vi b/pharosSet.vi index 41773f4..b85e294 100644 Binary files a/pharosSet.vi and b/pharosSet.vi differ diff --git a/pharosStart.vi b/pharosStart.vi index c0914da..d3eb5ef 100644 Binary files a/pharosStart.vi and b/pharosStart.vi differ diff --git a/pharosTriggersDoubleTrainGenerate.vi b/pharosTriggersDoubleTrainGenerate.vi new file mode 100644 index 0000000..0ffc37f Binary files /dev/null and b/pharosTriggersDoubleTrainGenerate.vi differ diff --git a/pharosTriggersDoubleTrainGenerateBoolLines.vi b/pharosTriggersDoubleTrainGenerateBoolLines.vi new file mode 100644 index 0000000..36c7518 Binary files /dev/null and b/pharosTriggersDoubleTrainGenerateBoolLines.vi differ diff --git a/pharosTriggersGenerate.vi b/pharosTriggersGenerate.vi index 37f356f..2878585 100644 Binary files a/pharosTriggersGenerate.vi and b/pharosTriggersGenerate.vi differ diff --git a/pharosTriggersSave.vi b/pharosTriggersSave.vi index fc88b19..970ecde 100644 Binary files a/pharosTriggersSave.vi and b/pharosTriggersSave.vi differ diff --git a/pharosWriteDynReg.vi b/pharosWriteDynReg.vi index 133de22..294f2b7 100644 Binary files a/pharosWriteDynReg.vi and b/pharosWriteDynReg.vi differ diff --git a/piezo2USBWrite.vi b/piezo2USBWrite.vi index c2c673a..e597dc4 100644 Binary files a/piezo2USBWrite.vi and b/piezo2USBWrite.vi differ diff --git a/piezo2WriteClose.vi b/piezo2WriteClose.vi index 5eb912b..9a0cd79 100644 Binary files a/piezo2WriteClose.vi and b/piezo2WriteClose.vi differ diff --git a/piezo2WriteOpen.vi b/piezo2WriteOpen.vi index c287afb..8c60b07 100644 Binary files a/piezo2WriteOpen.vi and b/piezo2WriteOpen.vi differ diff --git a/piezo2WriteWrite.vi b/piezo2WriteWrite.vi index 528ebef..bafad1f 100644 Binary files a/piezo2WriteWrite.vi and b/piezo2WriteWrite.vi differ diff --git a/piezoAutofocus.vi b/piezoAutofocus.vi index 7f8542f..7627323 100644 Binary files a/piezoAutofocus.vi and b/piezoAutofocus.vi differ diff --git a/piezoDoubleWriteClose.vi b/piezoDoubleWriteClose.vi index 51a4c97..d79ad02 100644 Binary files a/piezoDoubleWriteClose.vi and b/piezoDoubleWriteClose.vi differ diff --git a/piezoDoubleWriteOpen.vi b/piezoDoubleWriteOpen.vi index 7b1ef14..8821a25 100644 Binary files a/piezoDoubleWriteOpen.vi and b/piezoDoubleWriteOpen.vi differ diff --git a/piezoEtlGetPosFromCount.vi b/piezoEtlGetPosFromCount.vi index a45b2d6..92ede53 100644 Binary files a/piezoEtlGetPosFromCount.vi and b/piezoEtlGetPosFromCount.vi differ diff --git a/piezoReadClose.vi b/piezoReadClose.vi index 923037f..6bd80e1 100644 Binary files a/piezoReadClose.vi and b/piezoReadClose.vi differ diff --git a/piezoReadOpen.vi b/piezoReadOpen.vi index 5ffe4be..0d1d6cb 100644 Binary files a/piezoReadOpen.vi and b/piezoReadOpen.vi differ diff --git a/piezoSimple.vi b/piezoSimple.vi index 74b7eee..4fd43aa 100644 Binary files a/piezoSimple.vi and b/piezoSimple.vi differ diff --git a/piezoUSBWrite.vi b/piezoUSBWrite.vi index 08ca346..94c52ce 100644 Binary files a/piezoUSBWrite.vi and b/piezoUSBWrite.vi differ diff --git a/piezoUSBWriteWaveform.vi b/piezoUSBWriteWaveform.vi index 4dc1c10..be615c0 100644 Binary files a/piezoUSBWriteWaveform.vi and b/piezoUSBWriteWaveform.vi differ diff --git a/piezoWriteClose.vi b/piezoWriteClose.vi index c057b9c..98f5189 100644 Binary files a/piezoWriteClose.vi and b/piezoWriteClose.vi differ diff --git a/piezoWriteOpen.vi b/piezoWriteOpen.vi index e62a4a1..846705b 100644 Binary files a/piezoWriteOpen.vi and b/piezoWriteOpen.vi differ diff --git a/piezoWriteOpenNew.vi b/piezoWriteOpenNew.vi index a5dbd5e..7026a64 100644 Binary files a/piezoWriteOpenNew.vi and b/piezoWriteOpenNew.vi differ diff --git a/piezoWriteUSBClose.vi b/piezoWriteUSBClose.vi index 1de391c..0dea2e4 100644 Binary files a/piezoWriteUSBClose.vi and b/piezoWriteUSBClose.vi differ diff --git a/piezoWriteUSBOpen.vi b/piezoWriteUSBOpen.vi index ed02e65..48b8d50 100644 Binary files a/piezoWriteUSBOpen.vi and b/piezoWriteUSBOpen.vi differ diff --git a/piezoWriteWrite.vi b/piezoWriteWrite.vi index 66da024..146870e 100644 Binary files a/piezoWriteWrite.vi and b/piezoWriteWrite.vi differ diff --git a/piezoWriteWriteFuncGen.vi b/piezoWriteWriteFuncGen.vi index 3e09eb6..cfe5266 100644 Binary files a/piezoWriteWriteFuncGen.vi and b/piezoWriteWriteFuncGen.vi differ diff --git a/piezoWriteWriteFuncGenNew.vi b/piezoWriteWriteFuncGenNew.vi index 6ff138c..9b9f3e7 100644 Binary files a/piezoWriteWriteFuncGenNew.vi and b/piezoWriteWriteFuncGenNew.vi differ diff --git a/prova.vi b/prova.vi new file mode 100644 index 0000000..6282245 Binary files /dev/null and b/prova.vi differ diff --git a/pump-probe.aliases b/pump-probe.aliases index 5777aaf..af4fbc0 100644 --- a/pump-probe.aliases +++ b/pump-probe.aliases @@ -1,3 +1,3 @@ [My Computer] -My Computer = "128.112.85.108" +My Computer = "128.112.85.208" diff --git a/pump-probe.lvlps b/pump-probe.lvlps index fed8949..19a7415 100644 --- a/pump-probe.lvlps +++ b/pump-probe.lvlps @@ -1,3 +1,3 @@ [ProjectWindow_Data] -ProjectExplorer.ClassicPosition[String] = "110,666,792,1186" +ProjectExplorer.ClassicPosition[String] = "844,1417,1603,1937" diff --git a/pump-probe.lvproj b/pump-probe.lvproj index 088d5e6..22afa21 100644 --- a/pump-probe.lvproj +++ b/pump-probe.lvproj @@ -52,23 +52,30 @@ + + + + + + + + - @@ -78,8 +85,7 @@ - - + @@ -94,12 +100,22 @@ + + + + + + + + + + @@ -108,13 +124,16 @@ 0 + + + @@ -133,6 +152,7 @@ + @@ -165,6 +185,7 @@ + @@ -181,6 +202,10 @@ + + + + @@ -201,6 +226,7 @@ + @@ -212,6 +238,8 @@ + + @@ -260,7 +288,9 @@ - + + + @@ -287,6 +317,7 @@ + @@ -294,20 +325,28 @@ + + + + + + + + @@ -316,6 +355,14 @@ + + + + + + + + @@ -333,6 +380,8 @@ + + @@ -600,6 +649,8 @@ + + @@ -626,10 +677,12 @@ + + diff --git a/pythonAllocateArrayUINT16.vi b/pythonAllocateArrayUINT16.vi new file mode 100644 index 0000000..6fb5c64 Binary files /dev/null and b/pythonAllocateArrayUINT16.vi differ diff --git a/pythonArrayTest.vi b/pythonArrayTest.vi new file mode 100644 index 0000000..8a508d5 Binary files /dev/null and b/pythonArrayTest.vi differ diff --git a/pythonDeallocateArrayUINT16.vi b/pythonDeallocateArrayUINT16.vi new file mode 100644 index 0000000..e5a7dc2 Binary files /dev/null and b/pythonDeallocateArrayUINT16.vi differ diff --git a/pythonDisplayImage.vi b/pythonDisplayImage.vi new file mode 100644 index 0000000..5c70626 Binary files /dev/null and b/pythonDisplayImage.vi differ diff --git a/pythonDisplayImageTest.vi b/pythonDisplayImageTest.vi new file mode 100644 index 0000000..855375b Binary files /dev/null and b/pythonDisplayImageTest.vi differ diff --git a/pythonEmbedTest.vi b/pythonEmbedTest.vi new file mode 100644 index 0000000..56b068c Binary files /dev/null and b/pythonEmbedTest.vi differ diff --git a/pythonHyperstack.vi b/pythonHyperstack.vi new file mode 100644 index 0000000..40f338e Binary files /dev/null and b/pythonHyperstack.vi differ diff --git a/pythonHyperstackTest.vi b/pythonHyperstackTest.vi new file mode 100644 index 0000000..cedad46 Binary files /dev/null and b/pythonHyperstackTest.vi differ diff --git a/pythonHyperstackTest2.vi b/pythonHyperstackTest2.vi new file mode 100644 index 0000000..60943d2 Binary files /dev/null and b/pythonHyperstackTest2.vi differ diff --git a/pythonHyperstack_CAllocated.vi b/pythonHyperstack_CAllocated.vi new file mode 100644 index 0000000..6ce61d9 Binary files /dev/null and b/pythonHyperstack_CAllocated.vi differ diff --git a/pythonWriteToArrayUINT16.vi b/pythonWriteToArrayUINT16.vi new file mode 100644 index 0000000..e54ccbc Binary files /dev/null and b/pythonWriteToArrayUINT16.vi differ diff --git a/shutterGetList.vi b/shutterGetList.vi index b2aed13..fc0cfb2 100644 Binary files a/shutterGetList.vi and b/shutterGetList.vi differ diff --git a/shuttersClose.vi b/shuttersClose.vi index c5fd5cd..4398190 100644 Binary files a/shuttersClose.vi and b/shuttersClose.vi differ diff --git a/shuttersCloseShutter.vi b/shuttersCloseShutter.vi index b99ccbc..77c80c0 100644 Binary files a/shuttersCloseShutter.vi and b/shuttersCloseShutter.vi differ diff --git a/shuttersOpen.vi b/shuttersOpen.vi index 222a527..618d534 100644 Binary files a/shuttersOpen.vi and b/shuttersOpen.vi differ diff --git a/shuttersOpenShutter.vi b/shuttersOpenShutter.vi index 04831ea..241af9f 100644 Binary files a/shuttersOpenShutter.vi and b/shuttersOpenShutter.vi differ diff --git a/sliderClose.vi b/sliderClose.vi index 7d0e02f..17c486e 100644 Binary files a/sliderClose.vi and b/sliderClose.vi differ diff --git a/sliderFwBw.vi b/sliderFwBw.vi index 6871a0a..bb092c9 100644 Binary files a/sliderFwBw.vi and b/sliderFwBw.vi differ diff --git a/sliderGetPosition.vi b/sliderGetPosition.vi index 0fd032f..a816ee5 100644 Binary files a/sliderGetPosition.vi and b/sliderGetPosition.vi differ diff --git a/sliderMove.vi b/sliderMove.vi index b6fd56d..2d62d73 100644 Binary files a/sliderMove.vi and b/sliderMove.vi differ diff --git a/sliderOpen.vi b/sliderOpen.vi index c9787c2..8f9f3c6 100644 Binary files a/sliderOpen.vi and b/sliderOpen.vi differ diff --git a/sliderResetConnection.vi b/sliderResetConnection.vi index 386d428..233ab3e 100644 Binary files a/sliderResetConnection.vi and b/sliderResetConnection.vi differ diff --git a/target.vi b/target.vi new file mode 100644 index 0000000..a2f71fe Binary files /dev/null and b/target.vi differ diff --git a/viewAndTarget.vi b/viewAndTarget.vi index 98c0746..e4be32e 100644 Binary files a/viewAndTarget.vi and b/viewAndTarget.vi differ diff --git a/volumeOpenAndDisplay.vi b/volumeOpenAndDisplay.vi index 5cca43e..56482d1 100644 Binary files a/volumeOpenAndDisplay.vi and b/volumeOpenAndDisplay.vi differ diff --git a/xboxToggle.vi b/xboxToggle.vi index 6005a70..1884e06 100644 Binary files a/xboxToggle.vi and b/xboxToggle.vi differ