Diffusion Instrument Control (master) History

History
masterc0c12d3f9433c05c3095d0e…

Feb 8 2019

yesnodlg is introduced to replace questdlg in createFile
c0c12d3f9433
·SAFedorov on Feb 8 2019, 17:50.
Added callback for mechanical Q
272c09a9425a
·engelsen on Feb 8 2019, 16:07.

Feb 6 2019

Merge pull request #178 from engelsen/MyFit-fixing-scale-params
e05bac24d8d7
·engelsen / GitHub on Feb 6 2019, 15:46.
Removed scale_init vars
996106b5a1b0
·engelsen on Feb 6 2019, 15:45.
Fixed a typo-bug in MyDaq/loadDataCallback
4dd9079c619e
·He3 on Feb 6 2019, 15:36.

Feb 5 2019

QOL change of sliders
6f4abf3a154a
·engelsen on Feb 5 2019, 16:01.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
015062ec10d9
·He3 on Feb 5 2019, 14:56.
Merge pull request #173 from engelsen/MyLogger-edits
410edb700afd
·SAFedorov / GitHub on Feb 5 2019, 12:00.
getInstrumentControlDir is introduced to replace getMyInstrParentDir in…
03a4873e2235
·SAFedorov on Feb 5 2019, 11:46.
MyFit improvements
43180a46f866
·engelsen on Feb 5 2019, 11:40.
Added check for limits
968de360d295
·engelsen on Feb 5 2019, 11:26.
Merge branch 'MyLogger-edits' of https://github.com/engelsen/Instrument-control…
94ec086b1e47
·engelsen on Feb 5 2019, 11:15.
MyFit limits added
838626b9c81b
·engelsen on Feb 5 2019, 11:15.
Update gui button is introduced to GuiLogger as a temporary solution for the…
776e6dec0002
·SAFedorov on Feb 5 2019, 11:12.
Small improvements of the logger. 1) Dummy mode is added to gui 2) runLogView…
09b31918887e
·SAFedorov on Feb 5 2019, 10:32.
Merge pull request #171 from engelsen/New-instruments
805dc7d0d007
·SAFedorov / GitHub on Feb 5 2019, 08:50.
MyZiRingdown - clear the demodulator buffer when starting ringdown to remove…
3782809f3aba
·He3 on Feb 5 2019, 08:47.

Feb 4 2019

1) Beautified the file name handling with auto_save=true (MyNewData, MyDaq and…
8ccd5bb98ce3
·SAFedorov on Feb 4 2019, 09:41.

Feb 3 2019

Cleaned up the assignment of empty line handles during the initialization of Daq
3281d2e92459
·SAFedorov on Feb 3 2019, 18:36.
Merge pull request #166 from engelsen/Zi-edits
4d788a89938f
·SAFedorov / GitHub on Feb 3 2019, 18:21.
Changed the mode of trace recording by MyZiRingdown to exclude the region where…
a0b6d8dfdf6d
·SAFedorov on Feb 3 2019, 18:15.
Quality of life update for GuiZiRingdown
c8f754ca3004
·SAFedorov on Feb 3 2019, 18:01.
Fixed the bug with disabling the driving oscillator on startup in MyZiRingdown
5cfc6da0ae81
·SAFedorov on Feb 3 2019, 17:54.
Made MyZiRingdown a subclass of MyZiLi and changed the read header function to…
550474d3f1b9
·SAFedorov on Feb 3 2019, 17:50.
1) Debugging of MyZiScopeFt and its gui 2) Update MyAvgTrace to reset averaging…
9193defd7b21
·SAFedorov on Feb 3 2019, 17:35.

Feb 1 2019

Mostly completed writing MyZiScopeFt and its gui
90d2dcf34501
·SAFedorov on Feb 1 2019, 22:33.
Merge branch 'New-instruments' of https://github.com/engelsen/Instrument…
d864f059231e
·He3 on Feb 1 2019, 12:39.
Update MyFit.m
eedae9eb8a92
·He3 on Feb 1 2019, 12:39.
MyDaq - fixed a bug with line assignment when loading tace and removed dummy…
108b9944e733
·SAFedorov on Feb 1 2019, 12:34.

Jan 30 2019

Debugging of MyLogger 1) datetime format is now ensured explicitly within MyLog…
ba70f7449fd4
·SAFedorov on Jan 30 2019, 11:50.

Jan 28 2019

1) Added addObjProp method to MyMetadata 2) created MyZiScopeFt and a fron…
ba2b83e5af1b
·SAFedorov on Jan 28 2019, 18:17.

Jan 25 2019

drafts of MyZiLi (zurich instruments base class) and MyZiSa (scope-based…
336cf17b285d
·SAFedorov on Jan 25 2019, 17:28.
Fixed a memory leak in MyZiRingdown
a939272de57b
·SAFedorov on Jan 25 2019, 15:37.
1)MyZiRingdown now transfers the averaged 2) debugging of the previous three…
47ca0ecc4598
·SAFedorov on Jan 25 2019, 15:02.
1) Changed metadata handling by MyTrace and MyAvgTrace in order to add…
d6a8b298175c
·SAFedorov on Jan 25 2019, 13:05.
1) Changed the way in which Daq passes traces between Data/Ref/Bg 2) Changed…
e416a1c51bc8
·SAFedorov on Jan 25 2019, 11:19.
runInstrument can now start instruments with optional arguments from…
c5ee3ea1417a
·SAFedorov on Jan 25 2019, 09:02.

Jan 24 2019

Integrated tabledlg in InstrumentManager
806bb192fde3
·SAFedorov on Jan 24 2019, 23:01.
Created tabledlg - table user interface for structure fields
5a273d6a0d91
·SAFedorov on Jan 24 2019, 17:49.

Jan 20 2019

Minor debugging of GuiZiRingdown
bb26325e70f3
·SAFedorov on Jan 20 2019, 22:36.
In MyZiRingdown: 1) It now switches recording off if enable_acq is switched…
909c8671cf65
·SAFedorov on Jan 20 2019, 22:25.

Jan 19 2019

More debugging of MyZiRingdown - 1) fixed the calculation of demodulator…
a40d97ae3fb4
·SAFedorov on Jan 19 2019, 23:07.
Various debuggings. 1) MyAvgTrace - now addAverage is restricted to work with…
7d66b42abcd4
·SAFedorov on Jan 19 2019, 21:58.
1) Fixed a few bugs introduced by the recent commits 2) MyDataSource now does…
692060918fa0
·SAFedorov on Jan 19 2019, 17:27.
MyAvgTrace is refined - AveragingDone event is deleted and a flag returned by…
824f8447048c
·SAFedorov on Jan 19 2019, 11:37.

Jan 18 2019

1) Introduced MyDataSource class 2) Transferring of traces is now done by value…
70ba86469166
·SAFedorov on Jan 18 2019, 20:56.
MyNewDataEvent changed the variable name no_new_header to new_header
02dc4ff91297
·SAFedorov on Jan 18 2019, 19:29.
runInstrument is modified to skip empty 'interface' and 'address' variables.
759ccd3d2ad6
·SAFedorov on Jan 18 2019, 19:20.
MyZiRingdown and its gui are in principle finalized, but not yet tested. 1)…
b36764d01027
·SAFedorov on Jan 18 2019, 15:48.

Jan 17 2019

1) Finalized (theoretically) the MyZiRingdown averaging and continuous saving…
d54c4b0ca991
·SAFedorov on Jan 17 2019, 19:22.
1) Introduced MyAvgTrace, 2) In MyZiRingdown improved the oscillator frequency…
32d3dce73b96
·SAFedorov on Jan 17 2019, 12:28.

Jan 15 2019

1) Added functionality to automatically save traces, transferred to Daq. For…
76ee4bcd9e9e
·SAFedorov on Jan 15 2019, 19:15.
1) dirfind function is updated - now it also searches over Matlab apps. 2)…
200e243c1efe
·SAFedorov on Jan 15 2019, 15:54.
MyZiRingdown - added auxiliary output
b590adf2b3e7
·SAFedorov on Jan 15 2019, 09:10.

Jan 14 2019

New features in MyZiRingdown: 1) Adaptive oscillator frequency, 2) Trace…
8f36c77b09bb
·SAFedorov on Jan 14 2019, 20:52.
1) Uid property is removed from MyTrace and genUid is moved to…
b96aec5bb4a1
·SAFedorov on Jan 14 2019, 16:30.
updateLinkedElement is introducd (singled out from updateLinkedGuiElements)
57ac68e3b5c8
·SAFedorov on Jan 14 2019, 12:05.
1) debugging and developement of MyZiRingdown; 2) replace downsample_t with…
7f9ed3923186
·SAFedorov on Jan 14 2019, 12:03.

Jan 11 2019

1) Introduced downsampling method in MyTrace and used it for reducing the trace…
88b726ac7da1
·SAFedorov on Jan 11 2019, 21:51.
1) xyFourier and xyInvFourier functions are introduced, 2) New properties and…
28dca1631709
·SAFedorov on Jan 11 2019, 18:27.
Implemented linking of logical values to uilamps
d6738708f329
·SAFedorov on Jan 11 2019, 11:07.
1) Created GuiZiRIngdown 2) introduced MyAppColors 3) various edits of…
b6fd9e5fccf2
·SAFedorov on Jan 11 2019, 09:40.

Jan 10 2019

Changed MyZiRingdown to use a timer for polling and only one demodulator…
a3a80fbf16f0
·SAFedorov on Jan 10 2019, 22:25.
Created MyZiRingdown
cf59271faec2
·SAFedorov on Jan 10 2019, 19:17.

Jan 9 2019

1) Fixed the bugs after renaiming plotTrace->plot and loadTrace->load, 2) made…
7e9c56f5832e
·SAFedorov on Jan 9 2019, 18:18.
Debugged MyTpg transfer trace functionality
c8ec1a124ceb
·SAFedorov on Jan 9 2019, 18:01.
The list of values in MyScpiInstrument can now be specified only with full…
2b4a002c8196
·SAFedorov on Jan 9 2019, 11:14.

Jan 8 2019

Made a first draft of MyCeCryo for controlling the ColdEdge cryo; it looks like…
6b89a563f576
·SAFedorov on Jan 8 2019, 17:53.
MyCollector is made singleton; dirfind function is introduced; unused classes…
c5d3f5d51f5c
·SAFedorov on Jan 8 2019, 13:37.
MyTlb6700 finaly seems to work with multiple instances; A number of overloading…
148114c5e83c
·SAFedorov on Jan 8 2019, 11:20.
MyTlb6700 is changed to use a singletone MyNewportUsbComm to access the driver…
026cc271874a
·SAFedorov on Jan 8 2019, 09:25.
Some edits of MyNewportUsbComm
f16024903936
·SAFedorov on Jan 8 2019, 07:58.

Jan 5 2019

Introduced MySingletone and MyNewportUsbComm
c8c7c3d98efe
·SAFedorov on Jan 5 2019, 22:09.

Dec 28 2018

Comment typos fixed
0bf4692c40a2
·SAFedorov on Dec 28 2018, 15:29.
In the wavelengthmeter controll class added explicit conversion to vacuum…
97c477e044e1
·SAFedorov on Dec 28 2018, 15:08.
1) Finilazed the functionality to run instruments in the background from…
afeb07864e76
·SAFedorov on Dec 28 2018, 14:33.

Dec 27 2018

1) Introduced runInstrument (mostly by splitting runInstrumentWithGui into two…
2148ade9a567
·SAFedorov on Dec 27 2018, 20:59.
MyHfWs is nominally finalized
3c042116c721
·SAFedorov on Dec 27 2018, 19:55.
The wavelengthmeter control class is generally working
9e7b80d179c5
·SAFedorov on Dec 27 2018, 19:01.

Dec 26 2018

Draft of MyHfWs for HighFiness wavelenghtmeter control
aa2b2b0c87fe
·SAFedorov on Dec 26 2018, 23:46.
Merge pull request #156 from engelsen/Gui-element-links-edits
d195320a9928
·SAFedorov / GitHub on Dec 26 2018, 23:10.
1)Introduced sharing via a global variable of the Usb communication class used…
001838c76baa
·SAFedorov on Dec 26 2018, 19:17.
1) Input/OutputProcessingFcn and InputPrescaler are now stored in UserData…
4550a53d5481
·SAFedorov on Dec 26 2018, 16:01.
Cosmetic edits of MyLog and GuiLogger - labels printed to the right of the line…
c449ed9037c6
·SAFedorov on Dec 26 2018, 15:32.
Debugged the new operation of linkGuiElement with instrument Guis…
fefecaeb9b20
·SAFedorov on Dec 26 2018, 15:03.
1. Even more checks for automatic callback assignment; 2. All guis are…
ca6c1f1de69a
·SAFedorov on Dec 26 2018, 01:41.
GuiLogger is converted to the new linking system; more clever callback…
2d43ea3c4fad
·SAFedorov on Dec 26 2018, 00:14.

Dec 25 2018

substruct2str is added plus the gui linking mechanism is mostly changed to use…
dbae152d84e1
·SAFedorov on Dec 25 2018, 23:34.
Changed linkGuiElement to work with subreferences
482c10a088da
·SAFedorov on Dec 25 2018, 21:05.
Troubleshooting of loggers (MyLakeshore, MyTpg, their guis). Also now setting…
6fe5e3943553
·SAFedorov on Dec 25 2018, 18:43.
Acquisition trace variable is added to the header provided by MyRsa
8ba41c624517
·SAFedorov on Dec 25 2018, 17:32.
MyDpo trace reading - fixed calibration of y values
dbf5c29ffbb6
·SAFedorov on Dec 25 2018, 17:11.
Merge pull request #155 from engelsen/Metadata-timing-issue
67a795602044
·SAFedorov / GitHub on Dec 25 2018, 16:00.
Daq figure and .m file are update. OpenDirectory callback is added, a few…
f5ec922b9f71
·SAFedorov on Dec 25 2018, 15:58.
MyDaq edits and bug fixes
7576eedae190
·SAFedorov on Dec 25 2018, 15:12.
Started messing up with the format of save method of MyTrace
191fba29de92
·SAFedorov on Dec 25 2018, 14:41.
Remove 'Trace' suffix from My trace method and make the plot method to not…
9bfe69755fe3
·SAFedorov on Dec 25 2018, 12:49.
MyTrace edits - SetGet inheritance introduced; Parser, createParse and…
3866a91bfda7
·SAFedorov on Dec 25 2018, 12:16.
Small bug fixes
1a817fd2c561
·SAFedorov on Dec 25 2018, 11:53.
Exclude addTimeField from the save method of MyMetadata plus misc edits
936330e21c0a
·SAFedorov on Dec 25 2018, 00:18.

Historymasterc0c12d3f9433c05c3095d0e…

Feb 8 2019

Feb 6 2019

Feb 5 2019

Feb 4 2019

Feb 3 2019

Feb 1 2019

Jan 30 2019

Jan 28 2019

Jan 25 2019

Jan 24 2019

Jan 20 2019

Jan 19 2019

Jan 18 2019

Jan 17 2019

Jan 15 2019

Jan 14 2019

Jan 11 2019

Jan 10 2019

Jan 9 2019

Jan 8 2019

Jan 5 2019

Dec 28 2018

Dec 27 2018

Dec 26 2018

Dec 25 2018

History
masterc0c12d3f9433c05c3095d0e…