54 Commits

Author SHA1 Message Date
Dhanya Maliakal
5dd2f273fc eigerserver changes, need to include martins changes 2017-06-27 10:22:55 +02:00
Dhanya Maliakal
f66950d312 fixed the 9m master server having to be rebooted for hv to work 2017-06-22 14:32:24 +02: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
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
b1a3a224ff implemented high voltage for normal modules 2016-11-11 14:43:18 +01:00
Dhanya Maliakal
e312098e56 check for why gui doesnt show all data 2016-10-25 14:52:25 +02:00
Dhanya Maliakal
81d96a047d slsDetector/slsDetectorCommand.cpp 2016-10-20 07:31:53 +02:00
Dhanya Maliakal
03cdda99ae fixed bug in temp front fpga 2016-10-07 15:54:46 +02:00
Dhanya Maliakal
28f96f4b51 included a febl and febr temp read 2016-10-07 15:44:13 +02:00
Dhanya Maliakal
a4bb3fe4dd merged with 2.1.1-rc inclding deactivate detectr and receiver 2016-10-04 14:06:47 +02:00
Dhanya Maliakal
0979d04693 works for deactivated server and receiver 2016-10-04 07:35:52 +02:00
Gemma Tinti
8a80cb489d change server with new boundary for counts above teh max 2016-09-27 20:47:59 +02:00
Dhanya Maliakal
5f4a4b0d90 maybe fixed 16 bit rate corr eiger 2016-09-23 17:15:16 +02:00
Dhanya Maliakal
d904f7b32e adding 16 bit rate correction in eiger 2016-09-23 14:28:20 +02:00
Dhanya Maliakal
1f9dc775f6 ensure receiver is updated when detector timer values are updated (force_update) 2016-08-12 17:44:28 +02:00
Gemma Tinti
dd2a0c50e0 rate corr atble changes 2016-08-03 18:07:21 +02:00
Dhanya Maliakal
9c9d946d70 fixed bug subexptime >=2.2 was set to weird value, was a int to int64_t error in server 2016-07-18 13:37:13 +02:00
Dhanya Maliakal
4eba07ca90 added error message tau/subexptime to error list 2016-02-17 18:01:58 +01:00
Dhanya Maliakal
8d2f54838a fixed corrections for rate correction, needed to reset daq completely 2016-02-17 15:17:40 +01:00
Dhanya Maliakal
3c4b0c24c8 rate correction for eiger implemented 2016-02-10 11:24:49 +01:00
Dhanya Maliakal
9067da5e88 rate correction for eiger implemented 2016-02-10 11:22:59 +01:00
Dhanya Maliakal
f0c4a4a7e4 almost done 2016-02-08 15:20:19 +01:00
Dhanya Maliakal
cf3e736d7e fixed bug that still reads hostname and expects a 0XX format, also prints revision number in decimal and not hex 2016-02-08 11:25:10 +01:00
Dhanya Maliakal
07f1bd5c82 mid way, had to change to fix bug 2016-02-08 10:40:54 +01:00
Dhanya Maliakal
8ae1e812e6 pulse chip fixed 2015-11-20 16:41:27 +01:00
Dhanya Maliakal
c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc 2015-11-20 16:28:48 +01:00
Dhanya Maliakal
a1bd54b16b pulsing in client and server 2015-11-19 17:43:46 +01:00
Dhanya Maliakal
e0464ef782 pulsing client side, and bug fix server side for reset partially 2015-11-19 16:15:59 +01:00
Dhanya Maliakal
8b0895add0 reset counter bit in eiger detector partially or completely 2015-11-17 16:39:36 +01:00
Dhanya Maliakal
584b9e6036 added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger 2015-09-04 15:54:12 +02:00
7f168e3a70 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-09-03 15:40:11 +02:00
681ed0f34f added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software 2015-09-03 15:39:54 +02:00
Dhanya Maliakal
cae286941a added subframe exposure time settable 2015-09-03 15:16:48 +02:00
Dhanya Maliakal
5f0741d882 trimbits flipped and works correctly for top and bottom 2015-07-01 15:00:17 +02:00
Dhanya Maliakal
302d9ca0ed added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well 2015-05-20 12:01:49 +02:00
7f7e7ca727 Fixed serial assignment. If top=1, serial=0 and vice versa. 2015-04-21 11:57:31 +02:00
Dhanya Maliakal
031ccdf070 change to server for no serial to work 2015-03-30 15:36:55 +02:00
Dhanya Maliakal
7cca11637a include gemmas 1 module testing as well as multi module testing for serial 2015-03-03 14:23:05 +01:00
ed50f83fe6 Added extra debug messages (-DMARTIN) 2015-03-02 12:12:23 +01:00
Dhanya Maliakal
875ee02038 got ridf of warnings for eiger server 2015-02-25 10:34:18 +01:00
Dhanya Maliakal
2c2d2171d2 get the last frame in eiger with acquiringdone 2015-02-24 16:10:31 +01:00
Dhanya Maliakal
d658799b20 eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing 2015-02-23 15:18:02 +01:00
Dhanya Maliakal
b2c7944014 type change in eiger server 2015-02-13 11:57:44 +01:00
Maliakal Dhanya
255f9e3fee eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better 2014-12-11 14:16:43 +01:00
Maliakal Dhanya
4649de2742 some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave 2014-11-28 14:26:19 +01:00
Maliakal Dhanya
194b41bfc5 changes to get index in eiger server 2014-11-17 14:46:28 +01:00
Maliakal Dhanya
b24f374155 setting number of frames had a bug in eiger server, refactored code a bit 2014-10-20 17:33:22 +02:00
Maliakal Dhanya
5a5372350f stop server incl in makefile, master chosen based on top or bottom module at the moment 2014-10-16 13:49:56 +02:00
Maliakal Dhanya
bbf26927dd full module server works now, slave and master yet to be done 2014-10-14 15:38:45 +02:00