musrfit

LMU/musrfit

Fork 0

Commit Graph

Select branches

Hide Pull Requests

dks6

root6

v0.13

v0.14

v0.16

v0.17

v0.18

v1.0

v1.1

v1.2

v1.3

v1.4

v1.5

v1.6

v1.6.1

v1.6.2

v1.6.3

v1.6.4

v1.6.5

v1.7

v1.7.1

v1.7.2

v1.7.3

v1.7.4

v1.7.5

v1.7.6

v1.8.0

v1.8.1

v1.8.2

v1.9.0

v1.9.1

v1.9.2

v1.9.3

v1.9.4

v1.9.5

v1.9.6

v1.9.7

v1.9.8

v1.9.9

96d15f027a Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit Zaher Salman 2017-09-20 14:26:09 +02:00
aa4dec86ef Merged muonspin/musrfit/root6 into master Zaher Salman 2017-09-06 16:26:41 +02:00
c5b1573da0 removed some default directories since it potentially leads to problems. Andreas Suter 2017-09-06 15:15:56 +02:00
27a744c8f5 removed some default directories since it potentially leads to problems. Andreas Suter 2017-09-06 15:13:22 +02:00
3782f6e247 Merged muonspin/musrfit/root6 into master Zaher Salman 2017-09-06 09:16:16 +02:00
e6b61ea3fc improved Qt5 checks (Qt5WebKit (old) versus Qt5WebEngine (new)) Andreas Suter 2017-09-06 09:11:25 +02:00
720d62dc51 improved Qt5 checks (Qt5WebKit (old) versus Qt5WebEngine (new)) Andreas Suter 2017-09-06 09:10:29 +02:00
ae7822a21e Merged muonspin/musrfit/root6 into master Zaher Salman 2017-09-05 15:28:26 +02:00
79b59b6dfb updated the version number Andreas Suter 2017-09-05 07:51:27 +02:00
bf593a9ee8 Merged muonspin/musrfit/root6 into master Zaher Salman 2017-09-04 11:41:04 +02:00
bb5f502398 deal with run-time-path for macOS. nemu 2017-08-30 16:12:29 +02:00
b027db1bc9 improved run-path handling in case DKS is not enabled. Andreas Suter 2017-08-30 15:50:14 +02:00
2cb68a3495 deal with run-time-path for macOS. Andreas Suter 2017-08-30 15:45:12 +02:00
462119dd35 adopted dark scheme for 'elementary-xfce-darker' Andreas Suter 2017-08-29 07:58:55 +02:00
33da0caf2c Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 Andreas Suter 2017-08-28 10:47:59 +02:00
455129be6b updated the musrfit_dox.cfg file. Andreas Suter 2017-08-28 10:47:39 +02:00
8f86af959c version 1.0.0 -> 1.1.0 v1.1 Andreas Suter 2017-08-24 08:31:32 +02:00
05fb2375e0 updated docu including DKS support and up-to-date macOS fink/macport setting up description. Andreas Suter 2017-08-24 08:25:39 +02:00
f1b36a83cf re-enabled some variable settings needed for linux OpenCL. Andreas Suter 2017-08-21 15:15:38 +02:00
de6275b5cf added DKS to the process variable. This makes sure that the DKS lib is always found. Andreas Suter 2017-08-21 14:32:41 +02:00
08d67afb78 prevent double free. Andreas Suter 2017-08-21 14:31:16 +02:00
25c7894fe0 fine tuning for OpenCL fallback. Andreas Suter 2017-08-21 14:28:12 +02:00
49db148c37 added proper destructor. Andreas Suter 2017-08-18 07:58:25 +02:00
b62d315d1f fixed a wrong variable initializer. Andreas Suter 2017-08-17 13:55:13 +02:00
c49edda58e proper minimal ROOT version number check. Andreas Suter 2017-08-17 13:36:03 +02:00
40337b00ad a first version which handles AMD cards as well. Andreas Suter 2017-08-17 13:30:27 +02:00
2d4697c750 fixes a bug in the GPU memory allocation. Andreas Suter 2017-08-17 13:29:25 +02:00
1ae0b284b4 proper minimal ROOT version number check. Andreas Suter 2017-08-16 20:59:29 +02:00
66324638ea Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit Zaher Salman 2017-08-15 15:40:42 +02:00
d397bf0064 fixed an issue with the month (0/1-problem). Andreas Suter 2017-06-09 07:52:24 +02:00
dfa33303d1 Merged muonspin/musrfit/root6 into master Zaher Salman 2017-06-08 11:01:27 +02:00
80a7398350 found another date issue which is fixed now. Andreas Suter 2017-06-06 12:15:17 +02:00
60b804c3a1 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 Andreas Suter 2017-06-06 10:51:07 +02:00
c6cee9f6d8 fixed wrong month in the data conversion. Andreas Suter 2017-06-06 10:49:43 +02:00
a1c4c4cc02 Minor error corrections in messages Zaher Salman 2017-06-01 13:04:19 +02:00
a9df2d3a5a Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit Zaher Salman 2017-06-01 12:46:15 +02:00
26d78cf482 proper handling for DKS/GPU Fourier transform. Andreas Suter 2017-05-31 16:21:53 +02:00
4a1b985506 added the missing DKS Fourier support flag. Andreas Suter 2017-05-31 08:51:19 +02:00
bce9326f06 fix logy problem. Andreas Suter 2017-05-29 18:02:31 +02:00
2b7a391bbb back-integrate DKS Fourier after DKS upgrade and modularization. Not yet tested other than compilation. Andreas Suter 2017-05-29 17:54:57 +02:00
c2e362d406 added boost_system lib. Andreas Suter 2017-05-29 17:52:49 +02:00
852f9eafe6 README.md edited online with Bitbucket Zaher Salman 2017-05-23 12:55:14 +00:00
7a87bb1141 README.md edited online with Bitbucket Zaher Salman 2017-05-23 12:54:31 +00:00
2e30a58af4 Merged muonspin/musrfit/root6 into master Zaher Salman 2017-05-23 14:42:44 +02:00
07a1dc1d59 fix logy scaling problem. Andreas Suter 2017-05-19 20:17:07 +02:00
450a5c9d1b release of V.1.0.0 v1.0 Andreas Suter 2017-05-18 13:32:23 +02:00
1729055385 merged from root6. Compiles but has issues with DKS linking yet. Andreas Suter 2017-05-15 21:30:42 +02:00
9232d96246 fixed wrong sign of the top/bottom phase for LEM. Andreas Suter 2017-05-15 16:46:37 +02:00
25685b8989 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 Andreas Suter 2017-05-14 20:43:06 +02:00
9bdcdcc661 docu update Andreas Suter 2017-05-14 20:42:46 +02:00
2bc6e2a8cf small bug fix for macOS font size of musredit. Andreas Suter 2017-05-13 15:02:40 +02:00
3840b86efc moved musredit_startup.xml.in to the qt internal resources. This is more flexible than the previous version. Andreas Suter 2017-05-13 09:48:58 +02:00
c17924a742 moved all the xml-files into the resources. This make it much easier to handle if musrWiz is not locally installed. Andreas Suter 2017-05-12 21:39:05 +02:00
ceaf7d0c6a added missing export tags for RRF. Andreas Suter 2017-05-08 09:48:14 +02:00
fb3dc05505 adopted to the case where ROOT is installed from the repo. There are still issues: the shared libs cannot loaded from within the function. The path handling needs to be sorted out. Andreas Suter 2017-05-07 11:13:55 +02:00
b4aaa2bc15 add some additional output when minos is called. Andreas Suter 2017-05-04 15:25:42 +02:00
fdf604fff2 Changed installation directory from ROOTSYS to /usr/local Thomas Prokscha 2017-04-26 17:49:15 +02:00
ed0bdcdd8f Merge branch 'master' of https://git.psi.ch/nemu/musrfit into root6 Andreas Suter 2017-04-26 17:45:44 +02:00
a1c5d1d4d9 set proper action. Andreas Suter 2017-04-24 22:42:01 +02:00
de3d4ca932 adopted for the case where both QtWebKit and QtWebEngine is installed. Andreas Suter 2017-04-11 18:52:02 +02:00
f6741a470a slightly adopted for macOS Andreas Suter 2017-04-11 11:36:55 +02:00
815190d316 fixed copy/paste error Andreas Suter 2017-04-11 11:35:43 +02:00
bfbdb5af4b allow both QtWebKit and QtWebEngine since a lot of distros are not ready yet for QtWebEngine. Andreas Suter 2017-04-11 10:38:08 +02:00
b1fce70959 replace WebKit by WebEngine. Add a musrfit help icon. For now, not everywhere the help icon will be shown in the proper theme. Andreas Suter 2017-04-10 20:16:43 +02:00
e019efb272 slightly improved installation scheme. Andreas Suter 2017-04-10 15:57:43 +02:00
c3cd58802a added NPP/PPC for LEM TF Andreas Suter 2017-04-04 17:27:03 +02:00
9cad7580b7 moved musrWiz.log to /home/suter_a/.musrfit/musredit Andreas Suter 2017-04-03 18:17:38 +02:00
f906c81448 removed unnecessary QMAKE_INSTALL_PROGRAM. Andreas Suter 2017-04-01 17:30:25 +02:00
9374f18d54 make save as msr-file path more transparent for the user. Andreas Suter 2017-04-01 16:12:48 +02:00
b76d88cb2a a first ugly solution to get musrWiz and musrStep started under macos. Definitely will need some improvements. Andreas Suter 2017-03-31 21:13:04 +02:00
bfe501f6f2 some improvement towards a full functional implementation of musrWiz and musrStep under macos. Andreas Suter 2017-03-31 18:18:14 +02:00
377c2acc02 add musrWiz to musredit_qt5 directly in musrfit. Andreas Suter 2017-03-25 12:34:14 +01:00
f8503db8b8 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 Andreas Suter 2017-03-25 10:20:40 +01:00
2f993cffaf start to incorporate sub-projects, the first being musrStep. suter_a 2017-03-25 10:14:46 +01:00
0c3cc452d2 Cleanup Zaher Salman 2017-03-23 21:53:45 +01:00
7f16918007 Ported MuSRFit GUI to qt4. May need more debugging. Zaher Salman 2017-03-23 17:24:19 +01:00
da4525a5a5 Ported MuSRFit GUI to qt4. May need more debugging. Zaher Salman 2017-03-23 17:10:40 +01:00
4a9b767f7f Complete porting og MuSRFit GUI to qt4 Zaher Salman 2017-03-23 17:00:28 +01:00
2460f845b1 More progress in porting MuSRFit to qt4. Zaher Salman 2017-03-22 23:07:42 +01:00
aaeef7b685 Porting MuSRFit to qt4, work in progress... Zaher Salman 2017-03-20 17:04:23 +01:00
40c54fe195 improved handling of the dark theme. Needed since Ubuntu is not coherently dealing with it. Andreas Suter 2017-03-09 11:34:31 +01:00
9866554574 added C++11 compiler flags. Andreas Suter 2017-03-09 11:33:20 +01:00
5d43c1d514 fixed wrong icon name. Andreas Suter 2017-03-02 12:49:08 +01:00
ca61789bf3 added dark theme including the necessary icons to musredit. suter_a 2017-02-28 21:41:34 +01:00
9ba57235ad added first full musrWiz functionality. Andreas Suter 2017-02-28 09:57:17 +01:00
bb41ce188f more work towards a full musrWiz implementation. Andreas Suter 2017-02-27 16:59:52 +01:00
9d8c1c7606 stub for musrWiz added. Andreas Suter 2017-02-27 09:40:53 +01:00
fa67af63b7 slightly 'nicer' musrStep icon. Andreas Suter 2017-02-26 12:29:56 +01:00
c44ad0d6bf full implementation of musrStep functionality. Andreas Suter 2017-02-25 15:53:02 +01:00
1709b5e4d9 removed obsolate 'template' directory from the documentation installation path. Andreas Suter 2017-02-22 10:05:09 +01:00
fca13283e1 changed generation of git-revision.h which allows to keep it up-to-date. Aditionally git-branch info has been added. Andreas Suter 2017-02-22 09:42:07 +01:00
cc1679144c added musrStep dummy menu. First step towards a full integration of musrStep into musredit. Andreas Suter 2017-02-22 08:03:12 +01:00
d52b0b70a4 start with the intergration of musrWiz into musredit Andreas Suter 2017-02-21 20:40:27 +01:00
261691c040 fixed a typo Andreas Suter 2017-02-21 14:55:04 +01:00
13106a51c7 added root6 features to dks6 Andreas Suter 2017-02-21 14:47:33 +01:00
6cae76f1c1 fixed a little annoying bug in the LF none-analytic integral estimate. Andreas Suter 2017-02-21 11:28:53 +01:00
07aa67a1a2 fixed a little annoying bug in the LF none-analytic integral estimate. Andreas Suter 2017-02-21 11:28:53 +01:00
c63f9e0ce1 Merged muonspin/musrfit/root6 into master Zaher Salman 2017-02-15 11:01:44 +01:00
6e32f5f9c9 removed automatic default installation of startup.xml's since they needed to be edited anyway manually to be adopted to the problem under consideration. Andreas Suter 2017-02-15 10:28:38 +01:00
a17abc952b changed default behavior. Now musredit will create a musredit_startup.xml default file at run-time if none is found. Andreas Suter 2017-02-15 09:32:58 +01:00