Merge remote-tracking branch 'origin/master'
Description
Description
Details
Details
- Committed
deen Sep 7 2018, 10:52 - Pushed
deen Sep 7 2018, 10:52 - Parents
- rNPTOOLS671b9a4959da: Can load Chimera files as well now
rNPTOOLS2fb6a1c505c2: Added option to skip fitting if the batchevents has already been done with the… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 2fb6a1c505c2 | Jochem | Added option to skip fitting if the batchevents has already been done with the… | Sep 6 2018 | |||
| 84359bf20bde | Jochem | Changed filename of EventDetection. Added possibility to directly run… | Sep 6 2018 | |||
| 44d1d2696158 | Jochem | Merge remote-tracking branch 'origin/master' | Sep 5 2018 | |||
| 4dc9fe63cc83 | Jochem | Added equation for calculating size of nanocapillary and shrunken… | Sep 5 2018 | |||
| 632f91e3cc93 | thakur | updated 2D plotting script with help of Jochem | Aug 29 2018 | |||
| ee0c6e9047ce | Jochem | Fix for Mukesh | Aug 29 2018 | |||
| f1841c21414e | thakur | Merge remote-tracking branch 'origin/master' | Aug 29 2018 | |||
| 81f6de7bbb0f | thakur | just checking dont bother | Aug 29 2018 | |||
| 6c8c5ceac278 | Jochem | Added comments for Mukesh | Aug 29 2018 | |||
| ccf851a2f6d0 | Jochem | Minor changes | Aug 29 2018 | |||
| 7e569bbb88d0 | Jochem | Plot events function inside the class. Formatted axis and plotted baseline and… | Aug 29 2018 | |||
| b189ef23db0c | Jochem | Bugfix on Linux | Aug 29 2018 | |||
| c5b86890e965 | Jochem | linked baseline to trace and option to load events | Aug 29 2018 | |||
| 4201830c1e25 | Jochem | Proper axis formatting. | Aug 29 2018 | |||
| 9fe532e46cdb | Jochem | Linked PlotI_Tau axes. Fixed minor bug in background traces | Aug 29 2018 | |||
| 1485f00e2850 | Jochem | fixed bug in detection of traces, and implemented minimal time (100) | Aug 28 2018 | |||
| 068e0fffdbda | Jochem | Resolved conflicts | Aug 28 2018 | |||
| 50b29ee1df0d | Jochem | flipped current drop and minor changes in plotting | Aug 28 2018 |