Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument-control into PeakFinder
Description
Description
Details
Details
- Committed
engelsen Apr 30 2018, 18:44 - Parents
- rINSTCONTROL16b427aaa83c: 1. Added anon_fit_fun dependent property to MyFit.m, allows easy access to fit…
rINSTCONTROLcbfffc796cc4: 1. Added gradient initial parameter generation - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 16b427aaa83c | engelsen | 1. Added anon_fit_fun dependent property to MyFit.m, allows easy access to fit… | Apr 30 2018 | |||
| 826b9e4e9da6 | engelsen | Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument… | Apr 27 2018 | |||
| a59965e938a0 | engelsen | 1. Smal lbug fixes | Apr 27 2018 | |||
| bd572b0ec5a0 | engelsen | Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument… | Apr 26 2018 | |||
| 9d9ed4ad7520 | engelsen | Minor updates to MyFit | Apr 26 2018 | |||
| b2c753f59926 | engelsen | 1. Added readHeader function | Apr 25 2018 | |||
| 9113d7754ae0 | engelsen | Collector interfaced with DAQ | Apr 25 2018 | |||
| dcb3b3d5624f | engelsen | Header writing additions | Apr 17 2018 | |||
| fa83b27a0b3a | engelsen | Header collection | Apr 16 2018 | |||
| 62c305520d90 | engelsen | Added tooltips for fits | Apr 5 2018 | |||
| e821a4f6e55f | SAFedorov | New header functions | Apr 5 2018 | |||
| 1a1fcbfb5f00 | SAFedorov | 1. Progress made towards instrument headers, but still significant changes… | Feb 15 2018 | |||
| 1e644cf5c42b | SAFedorov | 1. Incremental edits | Feb 12 2018 |