2038 Commits

Author SHA1 Message Date
Dhanya Maliakal
5d5abae3f4 Merge remote branch 'slsReceiverSoftware/2.2' into 2.2 2017-12-04 16:47:28 +01:00
Dhanya Maliakal
e2ad46386e Merge remote branch 'slsDetectorSoftware/2.2' into 2.2 2017-12-04 16:47:26 +01:00
Dhanya Maliakal
111856ed7b hv should work now 2017-01-06 15:16:05 +01:00
Dhanya Maliakal
0fdbac981e should work for serial comm hv for 9m 2017-01-05 12:58:49 +01:00
Dhanya Maliakal
bd1601c2eb fixwed the printing of errors but not error message 2016-12-19 11:37:14 +01:00
Dhanya Maliakal
2d1c91c0e0 bug in sem for new scans 2016-12-16 14:59:55 +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
ed3129029d Merge branch '9m_rest' into 2.2-rc 2016-12-15 14:32:34 +01:00
Dhanya Maliakal
983f517e07 added users to the package 2016-12-15 14:04:37 +01:00
Dhanya Maliakal
2a508435c7 change the filenaming according to det position and not det id 2016-12-13 11:41:27 +01:00
3c0ce23bc2 fixed hardcoded port number, cleanup 2016-12-02 15:21:22 +00: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
28b0897dd7 fixed bug of crash when changing dr sometimes, latestdata was incorrectly inititalized 2016-12-02 08:55:07 +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
657d3e5759 first functional commit, still some workarounds. Can start, acquire, stop, restart 2016-12-01 15:59:12 +00:00
f61d819599 wip for Eiger9M 2016-12-01 07:43:46 +00:00
Dhanya Maliakal
d9016c95de updated the server bins 2016-11-30 11:23:46 +01:00
Dhanya Maliakal
ce086fe79d updaterev 2016-11-30 11:20:42 +01:00
Dhanya Maliakal
790cef37ff updaterev 2016-11-30 11:20:16 +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
09645cbba8 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:46 +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
0c8ca874e4 image reconstruction should work now 2016-11-28 14:52:46 +01:00
Dhanya Maliakal
5445552b17 removed bug where it shuts down socket and tries to read it as it is -1 2016-11-25 14:34:49 +01:00
Dhanya Maliakal
af8c750b5a made the eiger like the jungfrau ignoring packets 2016-11-25 12:22:21 +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
09d146ee55 changed a printout 2016-11-22 11:39:47 +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
55408118b1 removed some warnings and printsouts 2016-11-22 11:05:12 +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
21e4201bb8 updaterev 2016-11-14 11:57:57 +01:00
Dhanya Maliakal
ebf102b8d9 updaterev 2016-11-14 11:57:53 +01:00
Dhanya Maliakal
e6c7dfc440 adding exptime to receiver for file header 2016-11-14 11:57:34 +01:00
Dhanya Maliakal
c639477f28 adding exptime to receiver for file header 2016-11-14 11:57:29 +01:00
Dhanya Maliakal
45fc87240f write number of frames and period in file header 2016-11-11 16:08:18 +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
b1a3a224ff implemented high voltage for normal modules 2016-11-11 14:43:18 +01:00
Dhanya Maliakal
c364b28922 updaterev 2016-11-11 14:14:59 +01:00
Dhanya Maliakal
b1f658c439 file header with semi colon 2016-11-11 10:20:00 +01:00
Dhanya Maliakal
acb900961a fixed time interval in receiveR 2016-11-10 14:37:26 +01:00
Dhanya Maliakal
44d6b0ffc0 fixed time interval in receiveR 2016-11-10 14:37:18 +01:00
70326f8b10 Merged developer branch with anna's modifications for chiptestboard 2016-11-10 13:27:18 +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
Dhanya Maliakal
753ed306d9 changes to include eiger in gui 2016-11-10 08:41:46 +01:00
Dhanya Maliakal
a4d4b05c1d s 2016-11-09 15:35:22 +01:00