Diffusion Instrument Control 2b98d4ec7b98

Merge pull request #226 from engelsen/NewDaq
2b98d4ec7b98
Actions

Authored by SAFedorov on Sep 30 2019, 15:12.

Description

Merge pull request #226 from engelsen/NewDaq

New daq

Details

Committed

GitHub <noreply@github.com>

Sep 30 2019, 15:12

Parents

rINSTCONTROLa83c32da33d8: Commits to make the merging
rINSTCONTROL4e6bfa022f94: Revert "Added the display of information messages in runSession"

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rINSTCONTROL2b98d4ec7b98: Merge pull request #226 from engelsen/NewDaq (authored by SAFedorov).Sep 30 2019, 15:12

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
a83c32da33d8	SAFedorov	Commits to make the merging	Sep 30 2019
21a3a21aa453	SAFedorov	Manually introduce the updates of Developement-instruments-and-guis branch for…	Sep 30 2019
7a9e814f3085	SAFedorov/GitHub	Merge pull request #225 from engelsen/Update-of-generic-gui-handling	Sep 30 2019
5578726c323a	SAFedorov	Removed 'enable_gui' argument from the constructors of instrument classes	Sep 30 2019
151808b8e14f	SAFedorov	A update of GuiZiRingdown that prevents memory leaks in MATLAB R2019b	Sep 30 2019
858a7d7ba8ce	SAFedorov	Improved the performance of plotting in Zurich Instruments guis	Sep 30 2019
e8b6c04e24fc	SAFedorov	Compatibility update of GuiLakeshore	Sep 27 2019
50d01d302281	SAFedorov	Compatibility updates of instrument classes plus improvements of error messages	Sep 27 2019
2ceb81e7a85c	SAFedorov	Debuggings and small updates	Sep 27 2019
06744151635d	SAFedorov	Updated instrument manager - general usablity improvements	Sep 26 2019
facc623732b1	SAFedorov	Made program and instrument descriptor classes to be handle classes	Sep 26 2019
1e4f4ca31ff3	SAFedorov	Various debugging of instrument classes and compatibility updates for Matlab…	Sep 25 2019
c07e7da4b5fa	SAFedorov	Update the display of analysis routines in DataAcquisitionMenu	Sep 25 2019
a1657a46897f	SAFedorov	delete saveParams and loadFit methods from MyFit	Sep 25 2019
b370a438055a	SAFedorov	Subclassed Myg0Cal from MyGuiCont and changed the default value of beta to 0…	Sep 25 2019
35dfc258695a	SAFedorov	deleted "unused" utility functions and an old testfit() function	Sep 24 2019
d6981ee2fffa	SAFedorov	Update the downsampling method of MyTrace - now it returns a copy of the trace…	Sep 24 2019
86613780ea80	SAFedorov	Subclassed MyExponentialFit from MyFitParamScaling	Sep 24 2019
ddfc1e3685f5	SAFedorov	Moved remaining initial parameter estimation functions within the fit classes…	Sep 24 2019
eb4c5c42ade7	SAFedorov	Updated fits. Removed MyFitRefCursors class due to the inability to resolve the…	Sep 24 2019
e9aa74746392	SAFedorov	Update createGui.m	Sep 24 2019
9fa0d928a030	SAFedorov	Update MyCursor.m	Sep 24 2019
a1479d60554f	SAFedorov	Added the centering of range cursors in MyFit	Sep 24 2019
270406b77e6e	SAFedorov	1) Create MyFitParamScaling and MyFitRefCursors 2) reduce the default visa…	Sep 24 2019
c7149ad73216	SAFedorov	Nominally fixed the auto saving of traces in MyZiRingdown	Sep 24 2019
af2fd608b1b8	SAFedorov	Removed persistent variables from MyZiRingdown, and ZI GUIs	Sep 24 2019
8bfc0834192c	SAFedorov	Update Setup.mlapp	Sep 24 2019
8fac2b60f862	SAFedorov	Renamed MyNewportUsbComm to MyNewpUsbComm for the consistency of naming	Sep 24 2019
5e69a8060fe7	SAFedorov	Convert the Pfeiffer gauge control class	Sep 24 2019
b068f259ae9c	SAFedorov	Convert the classes for Newport diode laser controllers	Sep 24 2019
62520c1accd5	SAFedorov	Updated MyPm (now MyThorlabsPm) and fixed scope classes	Sep 24 2019
b91748a78486	SAFedorov	Added an automated assignment of the default GUI name in MyGuiCont based on the…	Sep 24 2019
ab21505d59f1	SAFedorov	Converted MyNa for the new Gui storage convention and renamed it to MyAgilentNa	Sep 24 2019
07791ba6502b	SAFedorov	Delete the cursorbar package	Sep 24 2019
0d164282ce27	SAFedorov	Delete the old DAQ (aka General Plot)	Sep 24 2019
df3e2c39d9a6	SAFedorov	Updated Zurich Instruments Lock-in classes and fixed a minor typo in some of…	Sep 24 2019
6061b8362c6e	SAFedorov	Updated and renamed the instrument classes for Textronix devices	Sep 23 2019
4a6d8c7fd09e	SAFedorov	Update runLogViewer.m	Sep 23 2019
455a695a37a6	SAFedorov	Update loggers to use the new GUI storage convention	Sep 23 2019
4b1e96ce0b50	SAFedorov	Moved MyLogger and its gui to a common folder	Sep 23 2019
087c39e0cf22	SAFedorov	Added the information about running apps to Collector metadata and debugged the…	Sep 23 2019
ea98d25e7255	SAFedorov	Removed the field for GUI specification from InstrumentManager	Sep 23 2019
d660059109bc	SAFedorov	Introduce set method for Gui in MyGuiCont	Sep 23 2019
10f7a97797e9	SAFedorov	Updated the color scheme handling in MyDaq and DaqMenu	Sep 23 2019
427f0834c3d0	SAFedorov	Fixed idn method of MyHfWs which did not assign identification string	Sep 23 2019
d1f7bad038d7	SAFedorov	Improved findFigure() so that it does not throw errors when applied to empty…	Sep 20 2019
7163efd1e5aa	SAFedorov	Updated the dummy instrument classes for the new mode of GUI handling	Sep 20 2019
e5d84d8bcb1e	SAFedorov	Discontinued the storage of instrument GUIs in the Collector, now guis are…	Sep 20 2019
43b11840308a	SAFedorov	Create MyGuiCont.m	Sep 20 2019
779ab309c409	SAFedorov	Update MyCommCont - 1) remove the constructor method 2) Introduced the deletion…	Sep 20 2019

Changes (235)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A	(dir)	@MyAnalysisRoutine/
A		@MyAnalysisRoutine/MyAnalysisRoutine.m
M		@MyAppColors/MyAppColors.m
M		@MyAvgTrace/MyAvgTrace.m
D		@MyBeta
D		@MyBeta/MyBeta.m
M		@MyCollector/MyCollector.m
M		@MyCommCont/MyCommCont.m
A	(dir)	@MyCursor/
A		@MyCursor/MyCursor.m
D		@MyDaq/MyDaq.m
A		@MyDaq/MyDaq.mlapp
D		@MyDaq/deleteListeners.m
D		@MyDaq/initGui.m
D		@MyDpo
V		{@MyDpo/MyDpo.m → Instrument classes/@MyTekDpo/MyTekDpo.m}
M		@MyFit/MyFit.m
M		@MyFit/createGui.m
D		@MyFit/createTab.m
D		@MyFit/createUnitBox.m
D		@MyFit/createUnitDisp.m
A		@MyFit/createUserControls.m
D		@MyG
D		@MyG/MyG.m
A	(dir)	@MyGuiCont/
A		@MyGuiCont/MyGuiCont.m
M		@MyInstrument/MyInstrument.m
M		@MyLog/MyLog.m
M		@MyMetadata/MyMetadata.m
A	(dir)	@MyNewAnalysisTraceEvent/
A		@MyNewAnalysisTraceEvent/MyNewAnalysisTraceEvent.m
M		@MyNewDataEvent/MyNewDataEvent.m
A	(dir)	@MyNewpUsbComm/
A		@MyNewpUsbComm/MyNewpUsbComm.m
M		@MyPeakFinder/MyPeakFinder.m
M		@MyPeakFinderGui/MyPeakFinderGui.m
M		@MyPeakFinderGui/createGui.m
M		@MyTrace/MyTrace.m
D		@MyZiLockIn
V		{ → Instrument classes}/@MyZiLockIn/MyZiLockIn.m
D		@MyZiRingdown
V		{ → Instrument classes}/@MyZiRingdown/MyZiRingdown.m
D		@MyZiScopeFt
V		{ → Instrument classes}/@MyZiScopeFt/MyZiScopeFt.m
A	(dir)	Fit classes/
A	(dir)	Fit classes/@MyDoubleLorentzianFit/
A		Fit classes/@MyDoubleLorentzianFit/MyDoubleLorentzianFit.m
A	(dir)	Fit classes/@MyExponentialFit/
A		Fit classes/@MyExponentialFit/MyExponentialFit.m
A	(dir)	Fit classes/@MyFitParamScaling/
A		Fit classes/@MyFitParamScaling/MyFitParamScaling.m
A	(dir)	Fit classes/@MyGaussianFit/
A		Fit classes/@MyGaussianFit/MyGaussianFit.m
A	(dir)	Fit classes/@MyGorodetsky2000Fit/
A		Fit classes/@MyGorodetsky2000Fit/MyGorodetsky2000Fit.m
A	(dir)	Fit classes/@MyLinearFit/
A		Fit classes/@MyLinearFit/MyLinearFit.m
A	(dir)	Fit classes/@MyLorentzianFit/
A		Fit classes/@MyLorentzianFit/MyLorentzianFit.m
A	(dir)	Fit classes/@MyLorentzianGradFit/
A		Fit classes/@MyLorentzianGradFit/MyLorentzianGradFit.m
A	(dir)	Fit classes/@MyMechExponentialFit/
A		Fit classes/@MyMechExponentialFit/MyMechExponentialFit.m
A	(dir)	Fit classes/@MyMechLorentzianFit/
A		Fit classes/@MyMechLorentzianFit/MyMechLorentzianFit.m
A	(dir)	Fit classes/@MyOpticalLorentzianFit/
A		Fit classes/@MyOpticalLorentzianFit/MyOpticalLorentzianFit.m
A	(dir)	Fit classes/@MyQuadraticFit/
A		Fit classes/@MyQuadraticFit/MyQuadraticFit.m
A		GUIs/GuiAgilentNa.mlapp
D		GUIs/GuiBeta.fig
D		GUIs/GuiBeta.m
D		GUIs/GuiDaq.fig
D		GUIs/GuiDaq.m
D		GUIs/GuiGCal.fig
D		GUIs/GuiGCal.m
D		GUIs/GuiLakeshore.mlapp
A		GUIs/GuiLakeshore336.mlapp
D		GUIs/GuiLogger.mlapp
D		GUIs/GuiNa.mlapp
A		GUIs/GuiNewpTlb.mlapp
A		GUIs/GuiPfeifferTpg.mlapp
D		GUIs/GuiPm.mlapp
D		GUIs/GuiRsa.mlapp
A		GUIs/GuiTekRsa.mlapp
A		GUIs/GuiThorlabsPm.mlapp
D		GUIs/GuiTpg.mlapp
M		GUIs/GuiZiRingdown.mlapp
M		GUIs/GuiZiScopeFt.mlapp
M		Instrument classes/@MyAgilentDso/MyAgilentDso.m
A	(dir)	Instrument classes/@MyAgilentNa/
V		Instrument classes/{@MyAgilentNa/MyAgilentNa.m ← @MyNa/MyNa.m}
M		Instrument classes/@MyColdEdgeCryo/MyColdEdgeCryo.m
M		Instrument classes/@MyHfWs/MyHfWs.m
M		Instrument classes/@MyLakeshore336/MyLakeshore336.m
D		Instrument classes/@MyNa
V		Instrument classes/{@MyNa/MyNa.m → @MyAgilentNa/MyAgilentNa.m}
A	(dir)	Instrument classes/@MyNewpTlb6300/
V		Instrument classes/{@MyNewpTlb6300/MyNewpTlb6300.m ← @MyTlb6300/MyTlb6300.m}
A	(dir)	Instrument classes/@MyNewpTlb6700/
V		Instrument classes/{@MyNewpTlb6700/MyNewpTlb6700.m ← @MyTlb6700/MyTlb6700.m}
A	(dir)	Instrument classes/@MyPfeifferTpg/
V		Instrument classes/{@MyPfeifferTpg/MyPfeifferTpg.m ← @MyTpg/MyTpg.m}
D		Instrument classes/@MyPm
V		Instrument classes/{@MyPm/MyPm.m → @MyThorlabsPm/MyThorlabsPm.m}
D		Instrument classes/@MyRsa
V		Instrument classes/{@MyRsa/MyRsa.m → @MyTekRsa/MyTekRsa.m}
D		Instrument classes/@MyTbs
V		Instrument classes/{@MyTbs/MyTbs.m → @MyTekTbs/MyTekTbs.m}
D		Instrument classes/@MyTds
V		Instrument classes/{@MyTds/MyTds.m → @MyTekTds/MyTekTds.m}
A	(dir)	Instrument classes/@MyTekDpo/
V		{Instrument classes/@MyTekDpo/MyTekDpo.m ← @MyDpo/MyDpo.m}
M		Instrument classes/@MyTekMdo/MyTekMdo.m
A	(dir)	Instrument classes/@MyTekRsa/
V		Instrument classes/{@MyTekRsa/MyTekRsa.m ← @MyRsa/MyRsa.m}
M		Instrument classes/@MyTekScope/MyTekScope.m
A	(dir)	Instrument classes/@MyTekTbs/
V		Instrument classes/{@MyTekTbs/MyTekTbs.m ← @MyTbs/MyTbs.m}
A	(dir)	Instrument classes/@MyTekTds/
V		Instrument classes/{@MyTekTds/MyTekTds.m ← @MyTds/MyTds.m}
A	(dir)	Instrument classes/@MyThorlabsPm/
V		Instrument classes/{@MyThorlabsPm/MyThorlabsPm.m ← @MyPm/MyPm.m}
D		Instrument classes/@MyTlb6300
V		Instrument classes/{@MyTlb6300/MyTlb6300.m → @MyNewpTlb6300/MyNewpTlb6300.m}
D		Instrument classes/@MyTlb6700
V		Instrument classes/{@MyTlb6700/MyTlb6700.m → @MyNewpTlb6700/MyNewpTlb6700.m}
D		Instrument classes/@MyTpg
V		Instrument classes/{@MyTpg/MyTpg.m → @MyPfeifferTpg/MyPfeifferTpg.m}
A	(dir)	Instrument classes/@MyZiLockIn/
V		{Instrument classes ← }/@MyZiLockIn/MyZiLockIn.m
A	(dir)	Instrument classes/@MyZiRingdown/
V		{Instrument classes ← }/@MyZiRingdown/MyZiRingdown.m
A	(dir)	Instrument classes/@MyZiScopeFt/
V		{Instrument classes ← }/@MyZiScopeFt/MyZiScopeFt.m
D		Local/runDaq.m
M		Local/runLogViewer.m
A	(dir)	Logger/
A	(dir)	Logger/@MyLogger/
A		Logger/@MyLogger/MyLogger.m
A		Logger/GuiLogger.mlapp
A	(dir)	Measurement and analysis routines/AmplModCal/
A		Measurement and analysis routines/AmplModCal/GuiAmplModCal.mlapp
A		Measurement and analysis routines/AmplModCal/MyAmplModCal.m
A		Measurement and analysis routines/AmplModCal/alpha_def.png
A	(dir)	Measurement and analysis routines/AmplNoiseCal/
A		Measurement and analysis routines/AmplNoiseCal/GuiAmplNoiseCal.mlapp
A		Measurement and analysis routines/AmplNoiseCal/MyAmplNoiseCal.m
A	(dir)	Measurement and analysis routines/FreqNoiseCal/
A		Measurement and analysis routines/FreqNoiseCal/GuiFreqNoiseCal.mlapp
A		Measurement and analysis routines/FreqNoiseCal/MyFreqNoiseCal.m
M		Measurement and analysis routines/MyPeakInspector.mlapp
A		Measurement and analysis routines/MyTraceAdder.mlapp
D		Measurement and analysis routines/NewportTlbScan.mlapp
A	(dir)	Measurement and analysis routines/PhaseModCal/
A		Measurement and analysis routines/PhaseModCal/GuiPhaseModCal.mlapp
A		Measurement and analysis routines/PhaseModCal/MyPhaseModCal.m
A		Measurement and analysis routines/PhaseModCal/beta_def.png
A	(dir)	Measurement and analysis routines/g0Cal/
A		Measurement and analysis routines/g0Cal/Guig0Cal.mlapp
A		Measurement and analysis routines/g0Cal/Myg0Cal.m
A		Measurement and analysis routines/g0Cal/g0_cal.png
D		Required packages/Cursorbar
D		Required packages/Cursorbar/+graphics
D		Required packages/Cursorbar/+graphics/+internal
D		Required packages/Cursorbar/+graphics/+internal/CursorbarContainer.m
D		Required packages/Cursorbar/+graphics/@Cursorbar
D		Required packages/Cursorbar/+graphics/@Cursorbar/Cursorbar.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/closestvertex.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/createNewDataCursor.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/defaultUIContextMenu.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/defaultUpdateFcn.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/drawCrossbar.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/duplicate.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/getCursorInfo.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/getIntersections.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/getMarkerLocations.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/getPixelsPerData.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/getTargetXYData.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/isTargetAxes.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/isTargetChart.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/move.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/moveDataCursor.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/update.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/updateDataCursor.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/updateDisplay.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/updateMarkers.m
D		Required packages/Cursorbar/+graphics/@Cursorbar/updatePosition.m
D		Required packages/Cursorbar/+graphics/Graphics.m
D		Required packages/Cursorbar/+graphics/GraphicsPlaceholder.m
D		Required packages/Cursorbar/crossbar.m
D		Required packages/Cursorbar/cursorbar.m
D		Required packages/Cursorbar/hobjects.m
A		Resources/trace_disp_icon.png
A		Resources/trace_not_disp_icon.png
M		Test tools/Dummy objects/@MyDummyInstrument/MyDummyInstrument.m
M		Test tools/Dummy objects/@MyDummyScpiInstrument/MyDummyScpiInstrument.m
M		Test tools/Dummy objects/GuiDummyInstrument.mlapp
M		Test tools/GorodetskyFit test/testgorodetsky.m
M		Utility functions/DataAcquisitionMenu.mlapp
D		Utility functions/Initial parameter estimation
D		Utility functions/Initial parameter estimation/initParamDblLorentzian.m
D		Utility functions/Initial parameter estimation/initParamExponential.m
D		Utility functions/Initial parameter estimation/initParamGaussian.m
D		Utility functions/Initial parameter estimation/initParamGorodetsky2000.m
D		Utility functions/Initial parameter estimation/initParamGorodetsky2000Plus.m
D		Utility functions/Initial parameter estimation/initParamLorentzian.m
M		Utility functions/InstrumentManager.mlapp
M		Utility functions/Local settings utilities/@MyInstrumentDescriptor/MyInstrumentDescriptor.m
M		Utility functions/Local settings utilities/@MyProgramDescriptor/MyProgramDescriptor.m
M		Utility functions/Local settings utilities/getIcPrograms.m
M		Utility functions/Local settings utilities/getLocalSettings.m
M		Utility functions/Setup.mlapp
D		Utility functions/Unused
D		Utility functions/Unused/findTcpipInstruments.m
D		Utility functions/Unused/getLocalIP.m
A		Utility functions/closeApp.m
D		Utility functions/createFitParser.m
M		Utility functions/createSessionPath.m
M		Utility functions/findFigure.m
D		Utility functions/initParamDblLorentzianGrad.m
D		Utility functions/initParamLorentzianGrad.m
A		Utility functions/isaxes.m
D		Utility functions/isline.m
D		Utility functions/ismarker.m
M		Utility functions/runInstrument.m
D		Utility functions/runInstrumentWithGui.m
M		Utility functions/runLogger.m
M		Utility functions/runSession.m
M		Utility functions/runSingletonApp.m
D		Utility functions/setCursorColor.m
M		Utility functions/setIfChanged.m
A		Utility functions/splitFilename.m
A		Utility functions/splitSessionPath.m
D		Utility functions/testfit.m