Diffusion Instrument Control (master) History

MyTrace.m
masterf43dbaf89e4b87397dc6e9e…

Sep 4 2019

Update the integration method of MyTrace
f43dbaf89e4b
·SAFedorov on Sep 4 2019, 16:39.

Sep 3 2019

Removed zscore-scaled variables from MyTrace
fb9a68706d12
·SAFedorov on Sep 3 2019, 15:28.

Aug 29 2019

Introduced isaxes() function
2141659be510
·SAFedorov on Aug 29 2019, 14:22.

Jul 10 2019

In MyTrace Renamed MeasHeaders to UserMetadata and validatePlot to validateData
0d3896608f73
·SAFedorov on Jul 10 2019, 18:27.

Jul 2 2019

Rename hlines -> PlotLines in MyTrace to keep up with the naming convention
d0634b58f87b
·SAFedorov on Jul 2 2019, 17:35.

Jul 1 2019

1) Added possiblity to instantiate a dummy MyFit object with no parameters 2)…
b4d0753d79fc
·SAFedorov on Jul 1 2019, 15:49.

Jun 28 2019

Added delete method to MyTrace, updated the plotting method to fix an extra…
95d83acd1cdf
·SAFedorov on Jun 28 2019, 16:52.
Update the plotting method of MyTrace and remove two redundant utility…
fb184268404f
·SAFedorov on Jun 28 2019, 16:08.

Jun 10 2019

Cleaned up artefacts of previous merging
35769cedc497
·SAFedorov on Jun 10 2019, 20:08.
Merge branch 'NewDaq' into MyFit-data-scaling
f6174e28e52c
·SAFedorov on Jun 10 2019, 19:39.

Apr 25 2019

Rename clear method of MyTrace to clearData
72e9f92b220c
·SAFedorov on Apr 25 2019, 14:37.

Apr 24 2019

Debugging - works
4e771deb46f9
·SAFedorov on Apr 24 2019, 21:07.

Apr 17 2019

Renaming clearData -> clear in MyTrace
39fb8142d3c3
·SAFedorov on Apr 17 2019, 21:44.

Apr 14 2019

Debugged trace and metadata loading in MyDaq
db197660a8c3
·SAFedorov on Apr 14 2019, 12:59.
1) Added the handling of global instrument name by MyCollector 2) Debugging of…
6771528b9b4a
·SAFedorov on Apr 14 2019, 12:30.

Apr 13 2019

added rmtitle to MyMetadata and changed MyTrace to operate with titleref/rmtitle
c74e584524cf
·SAFedorov on Apr 13 2019, 19:37.

Apr 10 2019

Switched to non-dynamic property operation of MyMetadata
4b163cf0caa8
·SAFedorov on Apr 10 2019, 20:53.
Implemented a copy method for MyTrace
e33fee021a15
·SAFedorov on Apr 10 2019, 13:42.

Apr 9 2019

Revert "Revert "introduced dynamic properties in MyMetadata and removed…
0a4337503b52
·SAFedorov on Apr 9 2019, 23:30.
Revert "introduced dynamic properties in MyMetadata and removed getParam method"
93578013ec14
·SAFedorov on Apr 9 2019, 23:21.
introduced dynamic properties in MyMetadata and removed getParam method
6a1175a353ba
·SAFedorov on Apr 9 2019, 22:55.
Finilized the metadata handling in MyTrace and MyAvgTrace
b964cb63aa57
·SAFedorov on Apr 9 2019, 21:38.
Update the metadata loading function of MyAvgTrace
e56e879eb69b
·SAFedorov on Apr 9 2019, 17:36.
Updated saving/loading of MyTrace
0ef9464a198b
·SAFedorov on Apr 9 2019, 17:24.
Add saveMetadata and loadMetadata methods to MyTrace
27f09f4da1c5
·SAFedorov on Apr 9 2019, 13:48.
MyMetadata: 1) introduced the spanning of print function over array, 2) changed…
e9ae8d828f48
·SAFedorov on Apr 9 2019, 11:38.

Apr 7 2019

minor debugging of MyTrace
7e984253d07b
·SAFedorov on Apr 7 2019, 19:40.

Apr 5 2019

Scaling implemented for three fits
c0a7846ef4cc
·engelsen on Apr 5 2019, 18:43.

Feb 5 2019

Merge pull request #173 from engelsen/MyLogger-edits
410edb700afd
·SAFedorov / GitHub on Feb 5 2019, 12:00.

Jan 25 2019

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.

Jan 17 2019

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.

Jan 14 2019

1) Uid property is removed from MyTrace and genUid is moved to…
b96aec5bb4a1
·SAFedorov on Jan 14 2019, 16:30.
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.

Dec 25 2018

Troubleshooting of loggers (MyLakeshore, MyTpg, their guis). Also now setting…
6fe5e3943553
·SAFedorov on Dec 25 2018, 18:43.
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.

Dec 4 2018

Nils: Bugs fixed in the Beta calibration routine of Daq
a4a7f284022c
·SAFedorov on Dec 4 2018, 12:42.

Sep 9 2018

MyMetadata edits
629ab7607a6b
·SAFedorov on Sep 9 2018, 16:12.
Finilized to the first order MyLog
e52ef6f25aeb
·SAFedorov on Sep 9 2018, 15:36.

Sep 8 2018

MyLog saving functionality progress
5812c2d7ae95
·SAFedorov on Sep 8 2018, 22:11.

Aug 24 2018

Important: changed formatting of the data, saved by trace, for the sake of…
ebd247551684
·SAFedorov on Aug 24 2018, 19:39.
MyDaq variable declaration edits and finalization of trace loading debugging
8bffec8e7d82
·SAFedorov on Aug 24 2018, 18:28.
Debugging of MyMetadata trace saving and loading.
c2cc025bac09
·SAFedorov on Aug 24 2018, 17:21.

Jul 12 2018

createFile revised
6ede5606b03d
·SAFedorov on Jul 12 2018, 22:02.

May 30 2018

Merge branch 'master' into Data-saving-edits
cecd1f1d2320
·engelsen / GitHub on May 30 2018, 15:10.
1. Added functionality to PeakFinder
baa1baa5f07f
·engelsen on May 30 2018, 15:08.

May 7 2018

Minimum functionality restored
95ee06d3f789
·engelsen on May 7 2018, 16:46.
Access protection
989c7d4bcfe4
·engelsen on May 7 2018, 15:05.
Added Metadata property to MyTrace
46889984aa86
·engelsen on May 7 2018, 14:28.

May 2 2018

1. Extensively commented and rearranged MyFit.m 2. Fixed bugs relating to the…
ca9506c961ac
·engelsen on May 2 2018, 17:36.

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.

Apr 17 2018

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

Apr 5 2018

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.
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.

Jan 25 2018

New instrument manager
b719fc4c129f
·SAFedorov on Jan 25 2018, 19:42.

Nov 30 2017

1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a…
9bcd798f1748
·engelsen on Nov 30 2017, 15:30.

Nov 28 2017

Update MyTrace.m
a764b6b613e0
·engelsen / GitHub on Nov 28 2017, 15:24.
1. Bug fixes on Gui of MyFit.m 2. Bug fixes on calibration of fits 3. Fix merge…
872bd480fb59
·engelsen on Nov 28 2017, 15:22.
Merge branch 'master' into MyFit-calibration
f63592f7e2bb
·engelsen on Nov 28 2017, 14:21.
1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m
5ac025096528
·engelsen on Nov 28 2017, 14:07.
1. Allow plot function of MyTrace to change interpreter of labels
687fbc40b261
·engelsen on Nov 28 2017, 13:47.
1. Changed MyTrace plot function to take all formatting inputs of the plot and…
f666d41a7f2f
·engelsen on Nov 28 2017, 13:42.
1. Further modification of GUI and calibration functionality of MyFit
7f398e359c2e
·engelsen on Nov 28 2017, 13:13.

Nov 27 2017

1. Fixed the Trace.save method 2. Added createSessionPath function
d1a580a8b700
·engelsen on Nov 27 2017, 17:34.

Nov 24 2017

Merge pull request #98 from engelsen/MyFit-MyInstrument-fixes
7b331f6443cd
·engelsen / GitHub on Nov 24 2017, 11:16.
1. Moved clearData function to MyTrace.m 2. Fixes to GUI structure of MyFit.m 3.
d8a5f5683c32
·engelsen on Nov 24 2017, 11:15.

Nov 23 2017

1. Changed figure switchign functionality of MyDaq and MyInstrument.m 2.
acaa69dec939
·engelsen on Nov 23 2017, 12:08.

Nov 22 2017

1. Error dialog for myTrace save function 2. Removed conv factor from addCommand
d42979eb267e
·engelsen on Nov 22 2017, 12:49.

Nov 21 2017

1. Added prompt for overwriting a file with the save function of MyTrace 2.
c91a73e8b082
·engelsen on Nov 21 2017, 13:25.

Nov 20 2017

1. Now allows variable save precision 2. Moved Parser to the start of MyTrace.m
5a2f2981ea6e
·engelsen on Nov 20 2017, 11:29.
1. Added some zero padding functionality to the save function for vectors of…
bd0d55b6dffd
·engelsen on Nov 20 2017, 10:31.

Nov 10 2017

1. Bug fixes for copying traces from instruments 2. Moved initialization of…
9e610fd6e3b8
·engelsen on Nov 10 2017, 14:25.

Nov 7 2017

1. Improved integration function to take optional index input 2. Created MyBeta…
07346682d58f
·engelsen on Nov 7 2017, 15:41.

Nov 6 2017

1. Initialize Data and Ref trace of MyDaq.m 2. Created callback for load trace…
cf350848b797
·engelsen on Nov 6 2017, 17:20.

Nov 3 2017

1. Fixed some bugs relating to access settings of MyTrace.m 2. Changed many GUI…
9c36e063c247
·engelsen on Nov 3 2017, 18:43.

Nov 2 2017

1. Set access properties of methods and properties in MyTrace.m 2. Added copy…
1aebc8d82f2a
·engelsen on Nov 2 2017, 16:47.
1. Created MyG.m object for g0 calibration 2. Modified MyFit.m to contain save…
a2cab7eef77c
·engelsen on Nov 2 2017, 15:58.

Oct 26 2017

1. Cursor callbacks and updates for edit boxes 2. Trimmed fat from GuiDaq.m
297e09be5f97
·engelsen on Oct 26 2017, 16:49.

Oct 25 2017

1. Bug fixes with instruments in MyDaq.m 2. Fixed bug with DataToRef and…
53a8ad479968
·engelsen on Oct 25 2017, 19:03.

Oct 22 2017

1. Some optimizations to the MyFit.m GUI for faster rendering 2. Fixed bug with…
54d8275d3240
·engelsen on Oct 22 2017, 22:42.

Oct 20 2017

1. Added setVisible function to MyTrace.m 2. Added more callbacks as class…
0a9440dc3272
·engelsen on Oct 20 2017, 18:05.
1. Modified MyTrace.m such that it only plots using one linehandle in any given…
7b239f37216f
·engelsen on Oct 20 2017, 17:05.
1. Fixed bugs in MyTrace save functionality - vectors were not being saved as…
18529e127e0d
·engelsen on Oct 20 2017, 13:58.

Oct 16 2017

1. Created first version of the MyFit.m GUI in createGui.m 2. Made callbacks…
a82cb9596027
·engelsen on Oct 16 2017, 22:43.

Oct 13 2017

1. Made the checkArithmetic function give an error if the x-axes are not equal…
5eced8b0eb9b
·engelsen on Oct 13 2017, 15:00.
1. Made plus and minus functions for MyTrace classes
df4e4158b43a
·engelsen on Oct 13 2017, 14:58.
Modifications to figures for Na and Scope
b22719b52329
·engelsen on Oct 13 2017, 09:29.

Oct 12 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
261f0da1c863
·engelsen on Oct 12 2017, 18:21.
1. Added continuous read function as callback to checkbox in MyScope.m…
118b25728fbb
·engelsen on Oct 12 2017, 18:21.

rINSTCONTROL/@MyTrace/MyTrace.mmasterf43dbaf89e4b87397dc6e9e…

Sep 4 2019

Sep 3 2019

Aug 29 2019

Jul 10 2019

Jul 2 2019

Jul 1 2019

Jun 28 2019

Jun 10 2019

Apr 25 2019

Apr 24 2019

Apr 17 2019

Apr 14 2019

Apr 13 2019

Apr 10 2019

Apr 9 2019

Apr 7 2019

Apr 5 2019

Feb 5 2019

Jan 25 2019

Jan 17 2019

Jan 15 2019

Jan 14 2019

Jan 11 2019

Dec 25 2018

Dec 4 2018

Sep 9 2018

Sep 8 2018

Aug 24 2018

Jul 12 2018

May 30 2018

May 7 2018

May 2 2018

Apr 25 2018

Apr 17 2018

Apr 5 2018

Feb 15 2018

Feb 12 2018

Feb 11 2018

Jan 25 2018

Nov 30 2017

Nov 28 2017

Nov 27 2017

Nov 24 2017

Nov 23 2017

Nov 22 2017

Nov 21 2017

Nov 20 2017

Nov 10 2017

Nov 7 2017

Nov 6 2017

Nov 3 2017

Nov 2 2017

Oct 26 2017

Oct 25 2017

Oct 22 2017

Oct 20 2017

Oct 16 2017

Oct 13 2017

Oct 12 2017

rINSTCONTROL/@MyTrace/MyTrace.m
masterf43dbaf89e4b87397dc6e9e…