202 Commits

Author SHA1 Message Date
8dd8d29adc Remove automake support
Since the cmake tool chain is now stable, the automake tool chain is removed from musrfit.
This makes documentation and code less cluttered.

Conflicts:
	configure.ac
	src/Makefile.am
	src/classes/Makefile.am
	src/external/MuSR_software/Makefile.am
2019-03-08 13:53:36 +01:00
784a951540 since my automake structure is now ready for rpmbuild, the version number is increased. 2017-10-26 15:59:19 +02:00
1729055385 merged from root6. Compiles but has issues with DKS linking yet. 2017-05-15 21:30:42 +02:00
454e6771e2 refer to the repos for the changes rather than updating ChangeLog. 2017-02-08 09:48:51 +01:00
38c4293d58 resolved merge conflicts with master 2016-12-23 14:16:22 +01:00
421fe729f8 resolved merge conflict. 2016-12-19 12:13:35 +01:00
dce31426a7 increased the version number form 0.17.0 to 0.18.0 2016-12-18 10:43:53 +01:00
333eaea7f1 Merge branch 'master' into root6 2016-08-25 13:38:57 +02:00
6aea6473ab merge dks to master 2016-08-25 08:40:40 +02:00
6585032df0 in musrview it is now possible to enable/disable a crosshair cursor by pressing 'c'. 2016-08-24 15:37:14 +02:00
e95bee2c41 Merge branch 'master' into root6 2016-08-10 12:49:24 +02:00
08848e68a8 drop NeXus support for Version < 4.4 2016-08-10 10:28:31 +02:00
f93ef114e0 merge master 2016-08-09 14:05:40 +02:00
8f20d2fd4c musredit: run lists are now properly loaded if containing nS-nE elements. 2016-08-02 13:52:41 +02:00
4cdc4dbf1d musredit: run lists are now properly loaded if containing nS-nE elements. 2016-08-02 13:15:55 +02:00
ac30fd956b merged branch 'master' into 'dks' 2016-04-28 13:42:24 +02:00
bb1f6b113b updated licence info and added paramList to the GUI. 2016-04-28 13:05:39 +02:00
cb14afbe07 msr2data gets a new option paramList which allows to select the number of parameters to be exported. 2016-04-28 11:11:06 +02:00
bc881f0c75 moved CPU/GPU information collection from PFitter to musrfit. 2016-04-27 08:11:30 +02:00
nemu
95ac103605 Merge branch 'master' into root6 2016-04-26 12:58:50 +02:00
af7b729a5a start-/endTimeBin are now class members. This reduces the number of recalculations. 2016-04-26 12:39:27 +02:00
ee064fc504 Added the theory function muMinusExpTF for mu minus fits 2016-04-22 10:56:52 +02:00
27eb664686 added missing DKS selector in GetPhaseOptRealFourier 2016-04-14 16:33:19 +02:00
d9782c55c8 added a theory translator for DKS 2016-03-08 16:23:18 +01:00
f3542337fc Merge branch 'master' into root6 2016-02-23 17:37:52 +01:00
fe48da74a1 It is now possible to export the averaged data/Fourier 2016-02-23 13:22:41 +01:00
fe4c0ddede Merge branch 'master' into root6 2016-02-17 13:10:13 +01:00
352ac5db21 install default XML startup files under /home/nemu/.musrfit rather than /bin. Since this is a substantial indentation, the version number has been incremented. 2016-02-17 12:59:03 +01:00
bd05f57523 start moving startup XML-files to /home/nemu/.musrfit 2016-02-17 10:47:18 +01:00
4ab8e6ebf2 Merge branch 'master' into root6 2016-02-16 17:46:32 +01:00
f6cbb4d806 replace data-file-format tag from ROOT-NPP/PPC to MUSR-ROOT whenever possible. 2016-02-16 13:29:45 +01:00
1d98148d9d musredit_qt5 partially new icons (see ChangeLog) 2016-02-16 08:52:40 +01:00
e8b0b002d8 Merge branch 'master' into root6 2016-01-23 09:49:33 +01:00
d0da0dd063 update of the docu which now describes the RRF option. 2016-01-22 16:16:29 +01:00
a35884b86c merge the devel-rrf branch into the master branch 2016-01-22 15:39:32 +01:00
2da9f5312d fixed merge conflict 2015-11-22 15:37:32 +01:00
14e4b28946 removed unnecessary check form musredit_qt5 msr2data interface. 2015-11-15 11:41:56 +01:00
9c700a3773 Fixes the crash of Fourier if the maximal range given in the Fourier block is larger than the available. 2015-11-11 10:30:16 +01:00
c6f5c1205e fixed a bug with double vectors in TMusrRunHeader 2015-10-29 16:03:36 +01:00
f44a9e94cf updated ChangeLog 2015-10-28 14:06:32 +01:00
4fd610442d improved the CLEANFILES for ROOT6. 2015-10-28 13:56:16 +01:00
1f7c4898dc Merge branch 'master' into root6 2015-09-24 20:56:04 +02:00
f58cbf1874 added a yet experimental feature of a phase 'optimized' real Fourier transform. 2015-09-24 15:33:47 +02:00
1f95678764 generating global fit msr-files including a GLOBAL block is working now as expected. 2015-09-22 16:33:02 +02:00
0a59e6b4d9 Merge branch 'master' into root6 2015-09-20 19:49:12 +02:00
e55ac4ecee after cross-check with BMW cleaned up, removed one copy/paste error (break;) and re-enabled the other twos which are indeed needed. 2015-09-18 16:21:15 +02:00
cb73f8bfa0 in PMsr2Data::PrepareGlobalInputFile() there seem to be 'unmotivated' break; commands in some loops. They prevent a proper map handling. For now they are commented out, which results in a proper functioning. 2015-09-17 14:51:51 +02:00
6c0a266e6a any2many export of MusrRoot crashed when first histo group was != 0. This happend when exporting to PSI-BIN or WKM. This is fixed now. 2015-09-14 09:44:49 +02:00
nemu
df63cdd462 Merge branch 'master' into root6 2015-09-08 14:08:37 +02:00
5a00d49bbd fixed error in view_packing for single histo (wrong norm of the theory). 2015-09-08 13:08:41 +02:00