Commit Graph

260 Commits

Author SHA1 Message Date
Gemma Tinti faefcc4799 Merge branch '2.3' into developer 2017-03-29 11:25:28 +02:00
Gemma Tinti 1afb9e3e48 manual 2017-03-29 11:23:44 +02:00
Gemma Tinti 09d3372cc0 manual 2017-03-29 10:11:16 +02:00
Gemma Tinti 671587c029 manual 2017-03-29 10:09:52 +02:00
Dhanya Maliakal 72d89fefc3 modified release 2017-03-24 16:58:00 +01:00
Dhanya Maliakal aba3a67b80 Merge branch '2.3' into developer 2017-03-24 14:20:38 +01:00
Dhanya Maliakal eb203c93b2 removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled 2017-03-24 13:41:30 +01:00
Dhanya Maliakal e8b14f8c8a done 2017-03-24 08:26:10 +01:00
Dhanya Maliakal aca09bcd4e done 2017-03-24 08:25:50 +01:00
Dhanya Maliakal fdb4fa28db retrying 2017-03-24 08:22:50 +01:00
Dhanya Maliakal 93362963e2 removed changes for test 2017-03-24 08:12:38 +01:00
Dhanya Maliakal 33a7375c72 changes to test 2017-03-24 08:12:10 +01:00
Dhanya Maliakal 97bad0fcb9 changes 2017-03-24 08:06:09 +01:00
Dhanya Maliakal 059711af37 retrying a test 2017-03-24 07:59:36 +01:00
Dhanya Maliakal f0c5106764 trying a test 2017-03-24 07:59:14 +01:00
Dhanya Maliakal 4182615aa9 trying a test 2017-03-24 07:58:27 +01:00
Dhanya Maliakal ff2c42e921 Merge branch '2.3' into developer 2017-03-23 15:38:48 +01:00
Dhanya Maliakal 44be9829d4 removed anna from support as she prefered it 2017-03-23 15:38:24 +01:00
Dhanya Maliakal 7dfb1b7192 added a release text 2017-03-23 15:17:03 +01:00
Dhanya Maliakal 6d4c0d0d46 modified users for new callback argument without filepointer 2017-03-23 14:07:56 +01:00
Dhanya Maliakal bf57be309f updated server 2017-03-23 13:44:44 +01:00
Gemma Tinti ea66f2d12f manual 2017-03-20 14:51:18 +01:00
Gemma Tinti de16c2a7f1 manual 2017-03-20 12:42:28 +01:00
Dhanya Maliakal 6731c39ce2 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer 2017-03-20 10:48:54 +01:00
Dhanya Maliakal 81eade8ede Merge branch '2.3' into developer 2017-03-20 10:48:38 +01:00
Dhanya Maliakal fb91ba25f3 uncomment gui. insignificant 2017-03-20 09:26:13 +01:00
Gemma Tinti 4d5506a0a8 manual 2017-03-15 15:52:19 +01:00
Dhanya Maliakal 47a769e677 modified users receiver to have all objects defined in one 2017-03-15 15:00:01 +01:00
Dhanya Maliakal 4a8f2b5a69 Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 2.3-rc 2017-03-14 08:22:29 +01:00
Dhanya Maliakal 22e0332833 changes to callback 2017-03-14 08:21:27 +01:00
Gemma Tinti 1cbbf9409f manual 2017-03-09 09:23:57 +01:00
Gemma Tinti 0ff79b7d5a manual 2017-03-09 09:21:50 +01:00
Dhanya Maliakal 679e747b5c Merge branch '2.3-rc' into developer 2017-03-07 07:30:40 +01:00
Gemma Tinti b16757e8d1 adapt eiger noise 2017-03-06 12:18:32 +01:00
Gemma Tinti daaf13d99c manual with new calibration scheme 2017-03-03 16:45:25 +01:00
Gemma Tinti 6c3165b31a manual with new calibration scheme 2017-03-03 16:42:03 +01:00
Dhanya Maliakal bd7f3567f8 Merge branch 'developer' into hdf5 2017-03-03 09:33:53 +01:00
Dhanya Maliakal cf8b53adff gui works 2017-02-28 13:14:06 +01:00
Gemma Tinti 72c2fbee9c manual eiger 2017-02-21 09:20:16 +01:00
Dhanya Maliakal 1decd2dd89 Merge branch '2.3-rc' into hdf5 2017-02-03 14:30:09 +01:00
Dhanya Maliakal 0896704de7 moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable 2017-02-03 12:29:33 +01:00
Dhanya Maliakal aa99d289c3 added library path in makefile.include so that you dont have to do ld_library_path 2016-12-19 18:04:59 +01:00
Dhanya Maliakal 8b8d8449f2 Merge branch 'developer' into hdf5 2016-12-15 14:05:29 +01:00
Dhanya Maliakal 983f517e07 added users to the package 2016-12-15 14:04:37 +01:00
Dhanya Maliakal 62ba3838ef included c++ lib 2016-12-14 18:19:40 +01:00
Dhanya Maliakal aba3319427 moving towards c++ api 2016-12-12 14:24:39 +01:00
Dhanya Maliakal d9016c95de updated the server bins 2016-11-30 11:23:46 +01:00
Dhanya Maliakal 1fe810d9d1 uncommented imagereconstruction in normal checkout script and also added but commented tests repository 2016-11-30 11:16:59 +01:00
Dhanya Maliakal 6f43e9fcde the space in the makefile screwed up the compilation 2016-11-10 10:26:27 +01:00
Dhanya Maliakal 37c0b5bdc1 done 2016-11-10 10:26:02 +01:00