Commit Graph

  • ebe01104e7 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc Dhanya Maliakal 2017-08-07 10:31:17 +02:00
  • 6b8b6b4b3d no need of quotes for gitall.sh Dhanya Maliakal 2017-08-07 10:31:11 +02:00
  • 31026576f4 delete cache before (re-)running cmake Xiaoqiang Wang 2017-08-07 09:54:03 +02:00
  • 2c58bc6a5c included numbe of compiler threads Dhanya Maliakal 2017-08-04 19:12:44 +02:00
  • 3ed2bcf3fa added cmk.sh to build cmake files and compile Dhanya Maliakal 2017-08-04 18:54:22 +02:00
  • 8f1e8b1196 cmake withotu hdf5 Dhanya Maliakal 2017-08-04 15:40:44 +02:00
  • c0d6958e37 no changE Dhanya Maliakal 2017-08-04 15:40:21 +02:00
  • d2d2959237 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-04 14:21:31 +02:00
  • c31ee2d76f allowing -1 in gui for spinbox Dhanya Maliakal 2017-08-04 14:20:51 +02:00
  • dc318d3f47 updaterev Dhanya Maliakal 2017-08-04 14:20:33 +02:00
  • 429bf7f13d updaterev Dhanya Maliakal 2017-08-04 14:20:21 +02:00
  • 96ce9ed7c1 if timer gives -1 in multi, it should not multiply answer with 1e-9 to get in seconds in slsdetectorocmmand Dhanya Maliakal 2017-08-04 14:09:56 +02:00
  • 41288302f4 fixed resolution for exptime, period and delay in server Dhanya Maliakal 2017-08-04 14:01:17 +02:00
  • 039092f292 bug fix: changes for the multipurpose reg in configuremac Dhanya Maliakal 2017-08-04 11:21:32 +02:00
  • fbee70818a 25 um server using a config.txt file Dhanya Maliakal 2017-08-03 14:16:18 +02:00
  • 5027f66d77 changed usleep Dhanya Maliakal 2017-07-28 12:20:54 +02:00
  • f5773de068 changes for single images with index 0 not realized as caught and therefore no virtual file created, fixed Dhanya Maliakal 2017-07-28 12:16:07 +02:00
  • 88b6fabb0d bug did not give error when switching to hdf5 Dhanya Maliakal 2017-07-28 11:54:22 +02:00
  • 37dd32f1b0 version Dhanya Maliakal 2017-07-28 11:30:21 +02:00
  • 5713cd6092 addin usleep to reduce cpu Dhanya Maliakal 2017-07-28 11:28:03 +02:00
  • 3174bd1c85 addin usleep to reduce cpu Dhanya Maliakal 2017-07-28 11:27:35 +02:00
  • eb4da5ff0c removed print of elapsed time Dhanya Maliakal 2017-07-28 10:19:33 +02:00
  • 98d5758ba1 Merge branch 'developer' into 3.0-rc Dhanya Maliakal 2017-07-27 14:40:50 +02:00
  • c49c07b34a Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer Dhanya Maliakal 2017-07-27 14:40:25 +02:00
  • 058fcd8aba Merge branch 'cmakefix' into developer Dhanya Maliakal 2017-07-27 14:40:17 +02:00
  • 699cce713b Merge branch 'cmakefix' into 3.0-rc Dhanya Maliakal 2017-07-27 14:40:01 +02:00
  • a88aa53d82 comment to compile statically Dhanya Maliakal 2017-07-27 14:39:00 +02:00
  • 7fa13a5d5d compatible with cmake 2.8.8 Xiaoqiang Wang 2017-07-27 14:28:14 +02:00
  • 56b420d68b manual Gemma Tinti 2017-07-27 14:20:46 +02:00
  • efd49ae92a removing individual hdf5 path from cmakelists Dhanya Maliakal 2017-07-27 13:55:23 +02:00
  • 71204172df simplify hdf5 linking Xiaoqiang Wang 2017-07-27 12:51:10 +02:00
  • 6cb387e3a8 tab->space reformat Xiaoqiang Wang 2017-07-27 12:45:27 +02:00
  • 05b32ce26c find hdf5 cxx component Xiaoqiang Wang 2017-07-27 12:44:21 +02:00
  • b920e52218 default no for hdf5 and rest Dhanya Maliakal 2017-07-27 12:31:12 +02:00
  • f07816a0d1 hdf5 works now, but needs fixes Dhanya Maliakal 2017-07-27 12:08:51 +02:00
  • c7d4582efa versioning Dhanya Maliakal 2017-07-27 12:08:28 +02:00
  • 77dc4d3d77 solved some warnings Dhanya Maliakal 2017-07-27 12:08:12 +02:00
  • 1d073b6897 sort of works, but needs simpler fix Dhanya Maliakal 2017-07-27 12:07:44 +02:00
  • 56aaaf2e07 changes for the cmake Dhanya Maliakal 2017-07-27 10:18:07 +02:00
  • e360077e09 changes for the cmake Dhanya Maliakal 2017-07-27 10:17:55 +02:00
  • 0fcf768772 basename for hdf5 fixes Dhanya Maliakal 2017-07-27 09:31:14 +02:00
  • a5f3de61a9 should be able to compile in pcmoench as l_msdetect Dhanya Maliakal 2017-07-26 15:09:29 +02:00
  • 915fd41bf6 should be able to compile in pcmoench as l_msdetect Dhanya Maliakal 2017-07-26 15:09:24 +02:00
  • 497f5289e6 new eiger server in serverbins Dhanya Maliakal 2017-07-26 11:37:23 +02:00
  • 8a8e76e839 added usleep to remove the 100%cpu, removed a insignificant printout Dhanya Maliakal 2017-07-26 11:36:31 +02:00
  • 086beea501 nothing really Dhanya Maliakal 2017-07-26 11:35:56 +02:00
  • 1a522c6696 removed ui include files as they are generated anyway for every make Dhanya Maliakal 2017-07-26 11:14:17 +02:00
  • 91f8987b6c removed ui include files as they are generated anyway for every make Dhanya Maliakal 2017-07-26 11:12:56 +02:00
  • 5771a3c722 includes in gui Dhanya Maliakal 2017-07-25 13:56:27 +02:00
  • 9d8faae375 fixed front end board temp Dhanya Maliakal 2017-07-25 13:55:27 +02:00
  • 2ddf4117d0 from package to compile receiver library as well Dhanya Maliakal 2017-07-25 12:25:24 +02:00
  • 68cbb63355 adding the form include files back into git Dhanya Maliakal 2017-07-25 12:15:58 +02:00
  • 7df21e1790 updated server bins Dhanya Maliakal 2017-07-13 14:45:10 +02:00
  • c25239a398 updaterev Dhanya Maliakal 2017-07-13 14:44:52 +02:00
  • 04165a9da8 rest implementation, index issues Dhanya Maliakal 2017-07-13 14:44:34 +02:00
  • 0bacb903ea rest implementation, index issues Dhanya Maliakal 2017-07-13 14:44:03 +02:00
  • a1fd34ebb6 for users ensured proper destructors, and ctrl c should kill it Dhanya Maliakal 2017-07-13 12:18:45 +02:00
  • 126ad92ed8 can set zmqport from receiver Dhanya Maliakal 2017-07-13 12:18:19 +02:00
  • e3667f6827 can set zmqport from receiver Dhanya Maliakal 2017-07-13 12:18:07 +02:00
  • 39560969f4 can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it Dhanya Maliakal 2017-07-13 12:17:49 +02:00
  • f1a77c4146 resolved issue with source not being looked at for compiling Dhanya Maliakal 2017-07-11 13:27:27 +02:00
  • 68b1959a85 excluding detector server directories in makefile Dhanya Maliakal 2017-07-11 11:16:37 +02:00
  • 931a5840e8 changes to gotthard server to include write adc, and also changes to fix the dma=dma+1 Dhanya Maliakal 2017-07-11 10:54:21 +02:00
  • f430152f61 moved common git evaluation variables to the common folder Dhanya Maliakal 2017-07-10 11:22:56 +02:00
  • e0b886e2cc moved the versioning files back to include Dhanya Maliakal 2017-07-10 11:22:32 +02:00
  • ef9fd77850 some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that Dhanya Maliakal 2017-07-10 11:20:50 +02:00
  • 672c42a20e some more changes to make file for automatic versioning Dhanya Maliakal 2017-07-10 11:20:26 +02:00
  • dbce25fdea some more changes to make file for automatic versioning Dhanya Maliakal 2017-07-10 11:20:15 +02:00
  • a583f3d6e2 some more changes to make file for automatic versioning Dhanya Maliakal 2017-07-10 11:18:41 +02:00
  • cf0ef68cda fixed adc and num dacs for jungfrau in gui Dhanya Maliakal 2017-07-06 18:34:00 +02:00
  • be6925c504 fixed temperature for jungfrau in server, also for negative values Dhanya Maliakal 2017-07-06 16:07:01 +02:00
  • 14bba171e7 conflict gitversion Dhanya Maliakal 2017-07-03 17:45:06 +02:00
  • 1e50bc4cc0 conflict git Dhanya Maliakal 2017-07-03 17:44:52 +02:00
  • 374b07a126 merge developer Dhanya Maliakal 2017-07-03 17:42:06 +02:00
  • 460a44a9b1 made updatereceiver to actually update client in parameters that it can Dhanya Maliakal 2017-07-03 17:37:31 +02:00
  • f944d7cae4 made updatereceiver to actually update client in parameters that it can Dhanya Maliakal 2017-07-03 17:37:24 +02:00
  • b4309a9f60 changed jungfrau temperature conversion but binary to follow Dhanya Maliakal 2017-07-03 14:45:44 +02:00
  • 539ab79e99 changed jungfrau temperature conversion Dhanya Maliakal 2017-07-03 14:45:29 +02:00
  • 99dad79572 Somewhere Dhanya Maliakal 2017-07-03 13:46:06 +02:00
  • 26f9b1ccbd Somewhere Dhanya Maliakal 2017-07-03 13:45:45 +02:00
  • da4ffb235c ensuring set detector type is the first call Dhanya Maliakal 2017-07-03 13:32:10 +02:00
  • b03e35a8d6 sorted receiver client interface, more consistent Dhanya Maliakal 2017-07-03 13:31:17 +02:00
  • f8c04a6a51 sorted the receiver client interface, more manageable Dhanya Maliakal 2017-06-30 18:17:33 +02:00
  • 7033d43e61 changed makefile to find libraries Dhanya Maliakal 2017-06-30 12:21:48 +02:00
  • bd9f19f6c7 changed the makefile a bit to find libraries Dhanya Maliakal 2017-06-30 12:20:42 +02:00
  • a4c07ba9a0 added black background for reciever to see gray font better Dhanya Maliakal 2017-06-30 12:19:27 +02:00
  • 4b9a8c1dad makefiles and versioning update complete Dhanya Maliakal 2017-06-29 17:10:28 +02:00
  • b05e9c194a makefiles and versioning update complete Dhanya Maliakal 2017-06-29 17:10:10 +02:00
  • c01931e5a6 makefiles and versioning update complete Dhanya Maliakal 2017-06-29 17:09:46 +02:00
  • 7afbd8f0f0 makefiles and versioning update complete Dhanya Maliakal 2017-06-29 17:09:34 +02:00
  • b6eb4cbb61 testing changes Dhanya Maliakal 2017-06-29 10:18:51 +02:00
  • 21e1fcf693 trying with gui makefile changes Dhanya Maliakal 2017-06-29 09:27:26 +02:00
  • cfff7969e3 changes for Makefile dependencies Dhanya Maliakal 2017-06-28 18:52:43 +02:00
  • 6bfbb075c8 ensuring fiel permissions Dhanya Maliakal 2017-06-28 18:18:30 +02:00
  • 1a74ceca3e ensuring file permissions Dhanya Maliakal 2017-06-28 18:16:55 +02:00
  • 7990dd6f77 fixed makefile and included correct versioning while compiling Dhanya Maliakal 2017-06-28 18:13:47 +02:00
  • f4857355b6 fixed new header for eiger Dhanya Maliakal 2017-06-28 16:53:01 +02:00
  • 81d68bebc6 Merge branch 'developer' into eigerheaderchange Dhanya Maliakal 2017-06-28 11:30:46 +02:00
  • 8992d51787 correct binary jungfrau Dhanya Maliakal 2017-06-28 11:26:35 +02:00
  • e79827384a included update git versionign in each server, removing the main one Dhanya Maliakal 2017-06-28 11:24:30 +02:00