Homec4science

Merge branch 'master' of https://github.com/engelsen/Instrument-control

Authored by He3 <lpqm.he3@outlook.com> on Feb 5 2019, 14:56.

Description

Event Timeline

He3 <lpqm.he3@outlook.com> committed rINSTCONTROL015062ec10d9: Merge branch 'master' of https://github.com/engelsen/Instrument-control (authored by He3 <lpqm.he3@outlook.com>).Feb 5 2019, 14:56

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
410edb700afdSAFedorov/GitHub
Merge pull request #173 from engelsen/MyLogger-edits 
Feb 5 2019
03a4873e2235SAFedorov
getInstrumentControlDir is introduced to replace getMyInstrParentDir in… 
Feb 5 2019
43180a46f866engelsen
MyFit improvements 
Feb 5 2019
968de360d295engelsen
Added check for limits 
Feb 5 2019
94ec086b1e47engelsen
Merge branch 'MyLogger-edits' of https://github.com/engelsen/Instrument-control… 
Feb 5 2019
838626b9c81bengelsen
MyFit limits added 
Feb 5 2019
776e6dec0002SAFedorov
Update gui button is introduced to GuiLogger as a temporary solution for the… 
Feb 5 2019
09b31918887eSAFedorov
Small improvements of the logger. 1) Dummy mode is added to gui 2) runLogView… 
Feb 5 2019
805dc7d0d007SAFedorov/GitHub
Merge pull request #171 from engelsen/New-instruments 
Feb 5 2019
3782809f3abaHe3
MyZiRingdown - clear the demodulator buffer when starting ringdown to remove… 
Feb 5 2019
8ccd5bb98ce3SAFedorov
1) Beautified the file name handling with auto_save=true (MyNewData, MyDaq and… 
Feb 4 2019
3281d2e92459SAFedorov
Cleaned up the assignment of empty line handles during the initialization of Daq 
Feb 3 2019
4d788a89938fSAFedorov/GitHub
Merge pull request #166 from engelsen/Zi-edits 
Feb 3 2019
a0b6d8dfdf6dSAFedorov
Changed the mode of trace recording by MyZiRingdown to exclude the region where… 
Feb 3 2019
c8f754ca3004SAFedorov
Quality of life update for GuiZiRingdown 
Feb 3 2019
5cfc6da0ae81SAFedorov
Fixed the bug with disabling the driving oscillator on startup in MyZiRingdown 
Feb 3 2019
550474d3f1b9SAFedorov
Made MyZiRingdown a subclass of MyZiLi and changed the read header function to… 
Feb 3 2019
9193defd7b21SAFedorov
1) Debugging of MyZiScopeFt and its gui 2) Update MyAvgTrace to reset averaging… 
Feb 3 2019
90d2dcf34501SAFedorov
Mostly completed writing MyZiScopeFt and its gui 
Feb 1 2019
d864f059231eHe3
Merge branch 'New-instruments' of https://github.com/engelsen/Instrument… 
Feb 1 2019
eedae9eb8a92He3
Update MyFit.m 
Feb 1 2019
108b9944e733SAFedorov
MyDaq - fixed a bug with line assignment when loading tace and removed dummy… 
Feb 1 2019
ba70f7449fd4SAFedorov
Debugging of MyLogger 1) datetime format is now ensured explicitly within MyLog… 
Jan 30 2019
ba2b83e5af1bSAFedorov
1) Added addObjProp method to MyMetadata 2) created MyZiScopeFt and a fron… 
Jan 28 2019
336cf17b285dSAFedorov
drafts of MyZiLi (zurich instruments base class) and MyZiSa (scope-based… 
Jan 25 2019
a939272de57bSAFedorov
Fixed a memory leak in MyZiRingdown 
Jan 25 2019
47ca0ecc4598SAFedorov
1)MyZiRingdown now transfers the averaged 2) debugging of the previous three… 
Jan 25 2019
d6a8b298175cSAFedorov
1) Changed metadata handling by MyTrace and MyAvgTrace in order to add… 
Jan 25 2019
e416a1c51bc8SAFedorov
1) Changed the way in which Daq passes traces between Data/Ref/Bg 2) Changed… 
Jan 25 2019
c5ee3ea1417aSAFedorov
runInstrument can now start instruments with optional arguments from… 
Jan 25 2019
806bb192fde3SAFedorov
Integrated tabledlg in InstrumentManager 
Jan 24 2019
5a273d6a0d91SAFedorov
Created tabledlg - table user interface for structure fields 
Jan 24 2019
bb26325e70f3SAFedorov
Minor debugging of GuiZiRingdown 
Jan 20 2019
909c8671cf65SAFedorov
In MyZiRingdown: 1) It now switches recording off if enable_acq is switched… 
Jan 20 2019
a40d97ae3fb4SAFedorov
More debugging of MyZiRingdown - 1) fixed the calculation of demodulator… 
Jan 19 2019
7d66b42abcd4SAFedorov
Various debuggings. 1) MyAvgTrace - now addAverage is restricted to work with… 
Jan 19 2019
692060918fa0SAFedorov
1) Fixed a few bugs introduced by the recent commits 2) MyDataSource now does… 
Jan 19 2019
824f8447048cSAFedorov
MyAvgTrace is refined - AveragingDone event is deleted and a flag returned by… 
Jan 19 2019
70ba86469166SAFedorov
1) Introduced MyDataSource class 2) Transferring of traces is now done by value… 
Jan 18 2019
02dc4ff91297SAFedorov
MyNewDataEvent changed the variable name no_new_header to new_header 
Jan 18 2019
759ccd3d2ad6SAFedorov
runInstrument is modified to skip empty 'interface' and 'address' variables. 
Jan 18 2019
b36764d01027SAFedorov
MyZiRingdown and its gui are in principle finalized, but not yet tested. 1)… 
Jan 18 2019
d54c4b0ca991SAFedorov
1) Finalized (theoretically) the MyZiRingdown averaging and continuous saving… 
Jan 17 2019
32d3dce73b96SAFedorov
1) Introduced MyAvgTrace, 2) In MyZiRingdown improved the oscillator frequency… 
Jan 17 2019
76ee4bcd9e9eSAFedorov
1) Added functionality to automatically save traces, transferred to Daq. For… 
Jan 15 2019
200e243c1efeSAFedorov
1) dirfind function is updated - now it also searches over Matlab apps. 2)… 
Jan 15 2019
b590adf2b3e7SAFedorov
MyZiRingdown - added auxiliary output 
Jan 15 2019
8f36c77b09bbSAFedorov
New features in MyZiRingdown: 1) Adaptive oscillator frequency, 2) Trace… 
Jan 14 2019
b96aec5bb4a1SAFedorov
1) Uid property is removed from MyTrace and genUid is moved to… 
Jan 14 2019
57ac68e3b5c8SAFedorov
updateLinkedElement is introducd (singled out from updateLinkedGuiElements) 
Jan 14 2019