Diffusion Instrument Control f31649df30fb

Merge pull request #214 from engelsen/Sessions
f31649df30fb
Actions

Authored by SAFedorov on Jun 10 2019, 18:16.

Description

Merge pull request #214 from engelsen/Sessions

Sessions

Details

Committed

GitHub <noreply@github.com>

Jun 10 2019, 18:16

Parents

rINSTCONTROL96f4b793e126: Updated MyMetadata so that the format of loaded numeric values is (mostly)…
rINSTCONTROL352e2699be58: Merge pull request #205 from engelsen/New-MyInstrument-command-operation

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rINSTCONTROLf31649df30fb: Merge pull request #214 from engelsen/Sessions (authored by SAFedorov).Jun 10 2019, 18:16

Merged Changes

Commit	Author	Details	Committed
96f4b793e126	SAFedorov	Updated MyMetadata so that the format of loaded numeric values is (mostly)…	Jun 10 2019
1699e0ab192a	SAFedorov	Changed GuiLogger to use the new linking mechanism for multiple choice menus	Jun 10 2019
0aa57c82afab	SAFedorov	introduced linking to multiple choice menus in MyGuiSync	Jun 10 2019
c612b07b4149	SAFedorov	Added support of multiple kernel objects in MyGuiSync	Jun 10 2019
af376dd3f39c	SAFedorov	added a test logger	Jun 10 2019
787cda2a6a66	SAFedorov	Added a command for actual RBW to MyRsa in order to fix the trace normalization…	Jun 7 2019
818d2adc143f	SAFedorov	Debugged the reading of headers of run files	May 21 2019
5b0ee25b7194	SAFedorov	Update the scanning routine for newport diode lasers	May 21 2019
59cfe174142d	SAFedorov	Introduce QueryRecord in MyNewportUsbComm	May 20 2019
7e4560633d22	SAFedorov	extended axesToClipboard to work with legends and datetime plots, and replaced…	May 13 2019
296a0dc38129	SAFedorov	Added a draft version of axesToClipboard which does not yet work with datetime…	May 13 2019
3c4066fb0a9a	SAFedorov	Fixed 1) Printing frequency in the metadata MyHfWs 2) copyPlot operation with…	May 13 2019
cc64107548d3	SAFedorov	Update MyNewportUsbComm and MyTlb6700 to improve the robustness of queries	May 13 2019
3d0fb0388a96	SAFedorov	Debug writeSettings of MyInstrument	May 12 2019
3e1571373e63	SAFedorov	Add information about figure position to Collector metadata and debug save/load…	May 12 2019
28e6a6b56007	SAFedorov	1) remove the limitation to name padding in MyMetadata (but keep such…	May 12 2019
1ba2b1379444	SAFedorov	Debugging: fixed readSettings method of MyInstrument and the session info…	May 11 2019
c703ad0df7b9	SAFedorov	Add GUI for dummy instruments	May 11 2019
ec990789b0f3	SAFedorov	Renamed test functions -> test tools	May 11 2019
669ceb25de49	SAFedorov	Fix error messages in validation functions of MyScpiInstrument	May 11 2019
73371f346160	SAFedorov	Created dummy instrument and scpi instrument classes	May 11 2019
48802f884580	SAFedorov	Added read/writeSettings methods to MyLogger plut a cosmetic update of…	May 11 2019
154bd6d3c215	SAFedorov	Debugged the singleton operation of MyDaq	May 10 2019
700398ecf270	SAFedorov/GitHub	Merge pull request #206 from engelsen/Development-instruments-and-guis	May 10 2019
332fcba5098d	SAFedorov	Update findFigure.m	May 10 2019
69c643e447dd	SAFedorov	Fixed the operation of recoloring functions with non-matlab app guis	May 10 2019
54b8a1223ca9	SAFedorov	Introduced the storage of apps inside collector	May 10 2019
c16dbde62077	SAFedorov	Add overloaded writeSettings method to MyColdEdgeCryo	May 10 2019
4f1d19aab63e	SAFedorov	Add save/load session buttons to DaqMenu	May 10 2019
65fd85dff872	SAFedorov	finalize runSession	May 10 2019
48ec64b73c13	SAFedorov	introduced set/getInstrumentProp interface in MyCollector	May 9 2019
2ea49bd2e2df	SAFedorov	Made a draft of runSession and added 'flush' method to MyCollector	May 5 2019
17623858c4d3	SAFedorov	Introduced session metadata to MyCollector	May 5 2019
d240bba3cce0	SAFedorov/GitHub	Merge pull request #200 from engelsen/New-MyInstrument-command-operation	May 5 2019
1d8acf19a31e	SAFedorov	Mede mdt2str add empty lines between metadata sections but not at the very end	May 4 2019
aac9db1ea696	SAFedorov	MyMetadata - renamed 'fmt_spec' to 'format'	May 4 2019

Changes (63)

		Path
M		@MyColdEdgeCryo/MyColdEdgeCryo.m
M		@MyCollector/MyCollector.m
M		@MyDaq/MyDaq.m
M		@MyGuiSync/MyGuiSync.m
M		@MyHfWs/MyHfWs.m
M		@MyInstrument/MyInstrument.m
M		@MyLogger/MyLogger.m
M		@MyMetadata/MyMetadata.m
M		@MyNewportUsbComm/MyNewportUsbComm.m
M		@MyRsa/MyRsa.m
M		@MyScpiInstrument/MyScpiInstrument.m
M		@MySingleton/MySingleton.m
M		@MyTlb6700/MyTlb6700.m
M		GUIs/GuiLogger.mlapp
M		GUIs/GuiRsa.mlapp
M		GUIs/GuiTlb.mlapp
M		Local/runDaq.m
D		Local/runDiodeLaserScan.m
M		Local/runLogViewer.m
A		Local/runNewportTlbScan.m
D		Measurement and analysis routines/DiodeLaserScan.mlapp
A		Measurement and analysis routines/NewportTlbScan.mlapp
D		Test functions
D		Test functions/DataAcquisitionMenu test
D		Test functions/DataAcquisitionMenu test/testdaqmenu.m
V	(dir)	{Test functions/GorodetskyFit test/ → Test tools/GorodetskyFit test}
V		{Test functions → Test tools}/GorodetskyFit test/testgorodetsky.m
V		{Test functions → Test tools}/GorodetskyFit test/testmat.mat
V	(dir)	{Test functions/MyBeta test/ → Test tools/MyBeta test}
V		{Test functions → Test tools}/MyBeta test/beta_cal_4.018MHz.txt
V		{Test functions → Test tools}/MyBeta test/testBeta.m
V	(dir)	{Test functions/MyG test/ → Test tools/MyG test}
V		{Test functions → Test tools}/MyG test/testg0.m
A	(dir)	Test tools/
A	(dir)	Test tools/Dummy objects/
A	(dir)	Test tools/Dummy objects/@MyDummyInstrument/
A		Test tools/Dummy objects/@MyDummyInstrument/MyDummyInstrument.m
A	(dir)	Test tools/Dummy objects/@MyDummyScpiInstrument/
A		Test tools/Dummy objects/@MyDummyScpiInstrument/MyDummyScpiInstrument.m
A		Test tools/Dummy objects/GuiDummyInstrument.mlapp
V	(dir)	{Test tools/GorodetskyFit test/ ← Test functions/GorodetskyFit test}
V		{Test tools ← Test functions}/GorodetskyFit test/testgorodetsky.m
V		{Test tools ← Test functions}/GorodetskyFit test/testmat.mat
V	(dir)	{Test tools/MyBeta test/ ← Test functions/MyBeta test}
V		{Test tools ← Test functions}/MyBeta test/beta_cal_4.018MHz.txt
V		{Test tools ← Test functions}/MyBeta test/testBeta.m
V	(dir)	{Test tools/MyG test/ ← Test functions/MyG test}
V		{Test tools ← Test functions}/MyG test/testg0.m
A		Test tools/runRandLogger.m
M		Utility functions/DataAcquisitionMenu.mlapp
M		Utility functions/InstrumentManager.mlapp
M		Utility functions/Local settings utilities/applyLocalColorScheme.m
M		Utility functions/Local settings utilities/getIcPrograms.m
M		Utility functions/Local settings utilities/readCommentHeader.m
A		Utility functions/axesToClipboard.m
M		Utility functions/centerFigure.m
M		Utility functions/findFigure.m
M		Utility functions/runInstrument.m
M		Utility functions/runInstrumentWithGui.m
M		Utility functions/runLogger.m
A		Utility functions/runSession.m
M		Utility functions/runSingletonApp.m
M		Utility functions/str2doubleHedged.m