Diffusion Instrument Control (master) History

History
master72695891e131eeffc1eea5f…

May 4 2018

1. Removed deprecated functions
72695891e131
·engelsen on May 4 2018, 10:53.
1. Removed findMyInstrument from runfiles.
1d30e1c30add
·engelsen on May 4 2018, 10:49.
1. Added writing of timestamp to flies 2. Removed runDaqMenu.m and put its…
e3fd75452a1d
·engelsen on May 4 2018, 10:44.

May 3 2018

Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument…
692b9ea09fd1
·engelsen on May 3 2018, 17:53.
1. Changed MyDaq to use findMyInstrument for InstrMenuCallback
5d3355a3fb6a
·engelsen on May 3 2018, 17:52.
Bug fix MyDaq
fe52528237cb
·engelsen on May 3 2018, 17:48.
1. Made name check for Mycollector more robust 2. Looking for readHeader…
57ed5bb3eb3e
·engelsen on May 3 2018, 17:25.
Fixes to naming
c0a4c24112a7
·engelsen on May 3 2018, 16:16.
Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument…
4ccb5d0c0393
·engelsen on May 3 2018, 12:36.
Formatting changes
a055f5344a1b
·engelsen on May 3 2018, 12:35.

May 2 2018

1. Added comments to MyDaq.m 2. Structured MyDaq.m better 3. Improved load…
72abadae36a4
·engelsen on May 2 2018, 19:03.
1. Extensively commented and rearranged MyFit.m 2. Fixed bugs relating to the…
ca9506c961ac
·engelsen on May 2 2018, 17:36.
1. Added support for Gorodetsky2000 fit to MyFit with associated test functions…
4162fe3a5806
·engelsen on May 2 2018, 14:35.

Apr 30 2018

Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument…
61b517c9dee0
·engelsen on Apr 30 2018, 18:44.
1. Added gradient initial parameter generation
cbfffc796cc4
·engelsen on Apr 30 2018, 18:41.
1. Added fits with gradient offset to MyFit.m 2. Deleted redundant code from…
61276c8b2152
·engelsen on Apr 30 2018, 18:41.
1. Added PeakFinder, PeakFinderGui and PeakInspector app
c35e2e9e000c
·engelsen on Apr 30 2018, 13:35.
1. Added anon_fit_fun dependent property to MyFit.m, allows easy access to fit…
16b427aaa83c
·engelsen on Apr 30 2018, 13:32.

Apr 27 2018

Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument…
826b9e4e9da6
·engelsen on Apr 27 2018, 12:46.
1. Smal lbug fixes
a59965e938a0
·engelsen on Apr 27 2018, 12:46.

Apr 26 2018

Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument…
bd572b0ec5a0
·engelsen on Apr 26 2018, 14:54.
Minor updates to MyFit
9d9ed4ad7520
·engelsen on Apr 26 2018, 14:54.

Apr 25 2018

1. Added readHeader function
b2c753f59926
·engelsen on Apr 25 2018, 15:44.
Collector interfaced with DAQ
9113d7754ae0
·engelsen on Apr 25 2018, 12:34.
1
eab28b003ec3
·engelsen on Apr 25 2018, 12:29.

Apr 17 2018

Header writing additions
dcb3b3d5624f
·engelsen on Apr 17 2018, 18:40.

Apr 16 2018

Header collection
fa83b27a0b3a
·engelsen on Apr 16 2018, 15:22.

Apr 5 2018

Added tooltips for fits
62c305520d90
·engelsen on Apr 5 2018, 16:32.
New header functions
e821a4f6e55f
·SAFedorov on Apr 5 2018, 12:33.

Feb 15 2018

1. Progress made towards instrument headers, but still significant changes…
1a1fcbfb5f00
·SAFedorov on Feb 15 2018, 19:01.

Feb 12 2018

1. Incremental edits
1e644cf5c42b
·SAFedorov on Feb 12 2018, 11:33.
Merge pull request #113 from engelsen/Data-saving-edits
200f68a3b8c2
·engelsen / GitHub on Feb 12 2018, 10:46.
Merge pull request #112 from engelsen/Scope-Gui-generalization
8dbd1ceee60c
·engelsen / GitHub on Feb 12 2018, 10:46.
Fixed a bug in GuiRsa
ea035f699612
·SAFedorov on Feb 12 2018, 08:41.
Incremental edits
cad494905fed
·SAFedorov on Feb 12 2018, 08:34.

Feb 11 2018

Class browser is added to DAQ menu
cf188f9784c6
·SAFedorov on Feb 11 2018, 20:48.
LocalInstrumentControlSettings introduced to generalize InstrumentList
37cdd8b7ffae
·SAFedorov on Feb 11 2018, 01:15.

Feb 9 2018

Disabling of the increment buttons is added for safety in GuiScope
4e67192aa230
·SAFedorov on Feb 9 2018, 23:47.
acq_mode is added to MyDpo and MyDso
962b28e115ea
·SAFedorov on Feb 9 2018, 23:36.
MyDso is working
b5d683ffac08
·SAFedorov on Feb 9 2018, 23:16.

Feb 7 2018

MyDso introduced
2a3859fccd04
·SAFedorov on Feb 7 2018, 22:51.

Feb 6 2018

TDS2022 can now be used with GuiScope
120e0318c1df
·SAFedorov on Feb 6 2018, 22:18.
MyTds created
8ec935b1c2b5
·SAFedorov on Feb 6 2018, 21:00.
N_CHANNELS constant introduced
a6f6cc770adc
·SAFedorov on Feb 6 2018, 16:57.

Jan 31 2018

Fixed wrong limits for the Start freq field in GuiRsa
8e4d174b4f68
·SAFedorov on Jan 31 2018, 22:17.
1. Bug fixes in MyDaq and MyFit, specifically relating to saving
cfd27131b79f
·SAFedorov on Jan 31 2018, 13:56.
1. Added required packages
4a8e2a14fe67
·engelsen on Jan 31 2018, 12:10.
Merge pull request #111 from engelsen/Instrument-management-edits
5507a0a779fb
·engelsen / GitHub on Jan 31 2018, 11:25.
1. Bug fixes in MyDaq.m
92373f440709
·SAFedorov on Jan 31 2018, 11:24.
1. Some try/catch blocks replaced by if statements 2. Used findfigure in…
081f36b96ef0
·engelsen on Jan 31 2018, 10:43.

Jan 30 2018

Merge branch 'master' into Instrument-management-edits
3b66fc4211ea
·SAFedorov / GitHub on Jan 30 2018, 21:41.
Data Acquisition Menu added
1d04c5566b92
·SAFedorov on Jan 30 2018, 21:31.
MyDaq is operational with the run files system
a7fa2e6a1ab4
·SAFedorov on Jan 30 2018, 13:06.

Jan 29 2018

run file management update
fa9366f41c8a
·SAFedorov on Jan 29 2018, 11:36.

Jan 28 2018

'instr_list' interface value introduced
10e2ab5a2f4b
·SAFedorov on Jan 28 2018, 15:07.
Cumulative update
2303db750f93
·SAFedorov on Jan 28 2018, 11:49.

Jan 26 2018

genericInitGui is introduced
9632d3d67692
·SAFedorov on Jan 26 2018, 11:39.

Jan 25 2018

Automatic 'Run' file generation
6a7b90561a63
·SAFedorov on Jan 25 2018, 22:40.
New instrument manager
b719fc4c129f
·SAFedorov on Jan 25 2018, 19:42.
Merge pull request #110 from engelsen/MyFitsaveParams
6359016c2e90
·engelsen / GitHub on Jan 25 2018, 16:25.
1. Fixed bugs in the MyFit save function 2. Linked all the save parameters to…
b32dc319c030
·engelsen on Jan 25 2018, 16:23.
Merge branch 'master' of https://github.com/engelsen/Instrument-control into…
c7b3d48f09cd
·engelsen on Jan 25 2018, 16:01.
1. Gui fixes for MyFit.m
5d564ed7b9db
·engelsen on Jan 25 2018, 16:00.
Merge pull request #109 from engelsen/Scope-edits
6d4607bde773
·SAFedorov / GitHub on Jan 25 2018, 09:19.

Jan 24 2018

Daq is somehow working with app Gui's
fd5cb37830b3
·SAFedorov on Jan 24 2018, 21:06.
New RSA control panel and init_val_list
caf0e5470a7d
·SAFedorov on Jan 24 2018, 17:23.

Jan 23 2018

runGui introduced
0e71528dfa5e
·SAFedorov on Jan 23 2018, 09:52.

Jan 22 2018

Minor edits to GuiDpo, GuiNa. Started on GuiRsa.mlapp
7a9a65cdef81
·SAFedorov on Jan 22 2018, 21:44.
MyScope to MyDpo renaming
f7e8be445b9a
·SAFedorov on Jan 22 2018, 13:03.

Jan 19 2018

Edits for consistency with DPO3034
0fb4590d884a
·SAFedorov on Jan 19 2018, 23:35.
Removed artefact Gui code from MyInstrument
a8807eb401d9
·SAFedorov on Jan 19 2018, 19:46.
readProperty made single command and GuiScope finalized
546876cda03b
·SAFedorov on Jan 19 2018, 19:43.
Merge branch 'Scope-edits' of https://github.com/engelsen/Instrument-control…
41edccbeef71
·SAFedorov on Jan 19 2018, 15:48.
MyInstrument isprop bug fixed
a2d1571b8ed6
·SAFedorov on Jan 19 2018, 15:48.
MyInstrument isprop bug fixed
e4731277c905
·SAFedorov on Jan 19 2018, 15:47.
Binary trace reading indroduced and Gui updated
9faeb16f4282
·SAFedorov on Jan 19 2018, 10:53.

Jan 18 2018

GuiScope small debugging
8d62bddd16b5
·SAFedorov on Jan 18 2018, 22:07.
GuiScope usability improvements
9b61040ef22f
·SAFedorov on Jan 18 2018, 21:46.
MyInstrument and MyScope fixes
a1377f2306f7
·SAFedorov on Jan 18 2018, 19:42.
Removed y_data, MyNa address handling changed
a6832a9d23de
·SAFedorov on Jan 18 2018, 18:38.
GuiScope bug incremental improvement
9ffb795b0c46
·SAFedorov on Jan 18 2018, 17:55.
Various bug fixes in MyScope and GuiScope
a6432f5f6f68
·engelsen on Jan 18 2018, 16:44.
Instrument connection fixes
e6dbb62e0b2d
·SAFedorov on Jan 18 2018, 13:55.

Jan 17 2018

FindInstrDialog
fbf6aa8ef9f7
·SAFedorov on Jan 17 2018, 17:32.
findInstrDlg deleted
468369473f19
·SAFedorov on Jan 17 2018, 17:29.
Revert "findInstrumentDlg deleted"
a9b3659461a2
·SAFedorov on Jan 17 2018, 17:28.
findInstrumentDlg deleted
fb2ea37b1c22
·SAFedorov / GitHub on Jan 17 2018, 17:18.
Scope GUI 1-st iteration
4aec45d83130
·SAFedorov on Jan 17 2018, 16:49.

Jan 14 2018

MyInstrument edits
54e98ff0e849
·SAFedorov on Jan 14 2018, 22:17.
InstrListManager consistency edits
52b0d7d8f6b4
·SAFedorov on Jan 14 2018, 11:57.
FindInstrDlg renamed
5613b46ee7c9
·SAFedorov on Jan 14 2018, 11:07.
Instrument List Manager is introduced
b3b3bd73c6ba
·SAFedorov on Jan 14 2018, 02:16.

Jan 13 2018

MyScope preliminary edits and RunScope added
c4ebc31daf60
·SAFedorov on Jan 13 2018, 17:47.

Dec 5 2017

1. Created session_name variable for MyFit and adjusted naming of save files…
8f913af74b90
·engelsen on Dec 5 2017, 15:13.
1. Created saveParams function for MyFit.m 2. Fixed bugs in lorentzian initial…
0125746b2f2e
·engelsen on Dec 5 2017, 11:25.

Dec 2 2017

Merge pull request #108 from engelsen/Instrument-find-dialog
0c42eddfd516
·engelsen / GitHub on Dec 2 2017, 20:27.
Gui dialog for instrument search is added
a6415f1f2fa9
·SAFedorov on Dec 2 2017, 20:04.
readProperty default formatting changed
ec3e39839577
·SAFedorov on Dec 2 2017, 11:37.
readProperty default formatting changed
049955c99d8f
·SAFedorov on Dec 2 2017, 11:30.

Dec 1 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
7adbaf3762ae
·engelsen on Dec 1 2017, 14:37.

Historymaster72695891e131eeffc1eea5f…

May 4 2018

May 3 2018

May 2 2018

Apr 30 2018

Apr 27 2018

Apr 26 2018

Apr 25 2018

Apr 17 2018

Apr 16 2018

Apr 5 2018

Feb 15 2018

Feb 12 2018

Feb 11 2018

Feb 9 2018

Feb 7 2018

Feb 6 2018

Jan 31 2018

Jan 30 2018

Jan 29 2018

Jan 28 2018

Jan 26 2018

Jan 25 2018

Jan 24 2018

Jan 23 2018

Jan 22 2018

Jan 19 2018

Jan 18 2018

Jan 17 2018

Jan 14 2018

Jan 13 2018

Dec 5 2017

Dec 2 2017

Dec 1 2017

History
master72695891e131eeffc1eea5f…