Commit Graph
607 Commits
Author SHA1 Message Date
Dhanya Maliakal 536f8937cb merging 2017-03-24 09:10:09 +01:00
Dhanya Maliakal 5c230e2ac5 updaterev 2017-03-23 13:48:12 +01:00
Dhanya Maliakal 9e658e7947 udpaterev 2017-03-23 13:46:02 +01:00
Dhanya Maliakal 911ff49238 changes for merges from 2.3 incl standard packet header 2017-03-20 11:22:07 +01:00
Dhanya Maliakal 1ab80b0517 updaterev 2017-03-20 09:28:02 +01:00
Dhanya Maliakal 4b388f56b2 fixed gui for new header 2017-03-20 09:27:38 +01:00
Dhanya Maliakal dc77b07c92 update rev 2017-03-15 15:02:22 +01:00
Dhanya Maliakal ecaa8e45a4 some changes to the command help 2017-03-15 14:52:19 +01:00
Dhanya Maliakal 0a1aaec708 resolved the recovering from receiver start error , but still does not acknowledge error in gui 2017-03-10 13:24:00 +01:00
Dhanya Maliakal cad8ffc0c6 resolved the recovering from receiver start error , but still does not acknowledge error in gui 2017-03-10 13:07:33 +01:00
Dhanya Maliakal 978b54dff9 somewhere 2017-03-10 10:51:37 +01:00
Dhanya Maliakal 300bf85dae uncommented extra comments 2017-03-09 11:40:26 +01:00
Dhanya Maliakal f3bf331b5f solved bug of decoding data with distorted image 2017-03-03 13:48:47 +01:00
Dhanya Maliakal 7e00d9f395 Merge branch 'developer' into hdf5 2017-03-03 10:06:34 +01:00
Dhanya Maliakal ab4572f544 updaterev 2017-03-03 09:07:36 +01:00
Dhanya Maliakal bdff083402 Merge branch '2.3-rc' into hdf5 2017-03-03 09:05:40 +01:00
Dhanya Maliakal 62de278f24 bug fix: loading trimbit file should not care about settings 2017-02-27 16:05:27 +01:00
bergamaschi f12df80c5b some changes for chiptest board and mythen server now compiles 2017-02-23 12:05:34 +01:00
Dhanya Maliakal 19460a03f5 sending position id and num detectors in x and y dir 2017-02-21 15:13:27 +01:00
Dhanya Maliakal 549e346ad4 Merge branch '2.3-rc' into hdf5 2017-02-10 11:56:37 +01:00
Dhanya Maliakal 111f8beab3 updaterev 2017-02-10 11:51:29 +01:00
Dhanya Maliakal 3d2264fa56 updaterev 2017-02-10 11:50:13 +01:00
Dhanya Maliakal 9b3f4a3a66 commonFiles/error_defs.h 2017-02-03 14:34:05 +01:00
Dhanya Maliakal 87ce1ed736 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:44 +01:00
bergamaschi 987aeda6fb sorted out problem with CPU read out 2016-12-22 17:24:53 +01:00
bergamaschi 3eea80a121 compiles after merging 2016-12-19 13:50:25 +01:00
bergamaschi 68b13a0ecd merged to developer 2016-12-19 12:26:53 +01:00
bergamaschi 12cd3d07a2 some changes for jctb 2016-12-19 12:05:59 +01:00
Dhanya Maliakal b5f7dc29af Merge branch '2.2-rc' into hdf5 2016-12-16 15:00:22 +01:00
Dhanya Maliakal 2d1c91c0e0 bug in sem for new scans 2016-12-16 14:59:55 +01:00
Dhanya Maliakal b403aa20a6 Merge branch '2.2-rc' into hdf5 2016-12-16 14:51:08 +01:00
Dhanya Maliakal 64843c1c76 made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread 2016-12-16 14:46:54 +01:00
Dhanya Maliakal a971d87008 Merge branch '2.2-rc' into hdf5 2016-12-13 13:23:06 +01:00
Dhanya Maliakal 2a508435c7 change the filenaming according to det position and not det id 2016-12-13 11:41:27 +01:00
Dhanya Maliakal e7621a6cd0 moving towards c++ api 2016-12-12 14:24:11 +01:00
Dhanya Maliakal a67f9d50de removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen 2016-12-02 12:47:01 +01:00
Dhanya Maliakal dd9387ef29 using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports 2016-12-02 08:53:08 +01:00
Dhanya Maliakal 790cef37ff updaterev 2016-11-30 11:20:16 +01:00
Dhanya Maliakal 466f1506a5 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:34 +01:00
Dhanya Maliakal 52dbb7f9fc smaller changes to make arguments const 2016-11-25 12:22:00 +01:00
Dhanya Maliakal c70f453de4 changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely 2016-11-22 14:01:07 +01:00
Dhanya Maliakal 394526a9c3 removed zmq threads from client and made it receive packets via for loop 2016-11-22 11:05:42 +01:00
Dhanya Maliakal 0ed9ee0e5d fixing the 32 bit crash and empty plot using zmq 2016-11-21 12:02:45 +01:00
Dhanya Maliakal 9d106f6c93 changed clock for jungfrau, maybe other debugging stuff outside this folder 2016-11-21 09:21:30 +01:00
Dhanya Maliakal ebf102b8d9 updaterev 2016-11-14 11:57:53 +01:00
Dhanya Maliakal c639477f28 adding exptime to receiver for file header 2016-11-14 11:57:29 +01:00
Dhanya Maliakal b980640a4c updaterev 2016-11-11 14:44:56 +01:00
Dhanya Maliakal 7ffba557f6 updatereveiger 2016-11-11 14:44:42 +01:00
Dhanya Maliakal f13a42feeb eigerupdaterev 2016-11-11 14:43:55 +01:00
Dhanya Maliakal 44d6b0ffc0 fixed time interval in receiveR 2016-11-10 14:37:18 +01:00