89 Commits

Author SHA1 Message Date
Erik Frojdh
212218396a removal of using namespace std from theadFiles 2018-05-24 14:47:45 +02:00
Erik Frojdh
b78b8425fd ifstream and ofstream to std:: 2018-05-24 14:27:01 +02:00
Erik Frojdh
12832a3a96 adding more std:: in slsDetectorActions.h 2018-05-24 14:24:10 +02:00
Erik Frojdh
621b7cfb2a adding std:: where needed 2018-05-24 14:11:30 +02:00
Erik Frojdh
d71008bd10 removing using namespace std from headers in slsDetector 2018-05-24 12:18:25 +02:00
a154d0a088 slsDetectorUsers: added setthreshold without trimbits for eiger 2018-05-23 16:39:52 +02:00
cb635d800a eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode 2018-05-22 18:43:13 +02:00
b4d9a6a09d slsReceiver, slsDetector(eiger server), client: added sub period to receiver, fixed eiger subperiod updates to client, added subperiod and subexptime to users, fixed hdf5 warnings 2018-05-17 12:34:18 +02:00
e024774323 added storage cells 2018-04-13 15:05:43 +02:00
61897cbd41 in between 2018-04-04 14:27:53 +02:00
Dhanya Maliakal
1dd300f713 only call register call back which already enables streaming in client and receiver, added to postprocessing 2017-11-28 09:36:54 +01:00
Dhanya Maliakal
386ef7766c zmq streaming should work with external gui now 2017-11-27 16:01:12 +01:00
Dhanya Maliakal
16e4fbf8dd receiver read freq should save value in shm even if no receiver present 2017-11-23 18:21:54 +01:00
Dhanya Maliakal
4097c37b31 in between 2017-11-16 16:01:31 +01:00
Dhanya Maliakal
4903164f95 added high voltage to users class 2017-11-14 10:58:54 +01:00
Dhanya Maliakal
7134d0d0ed temp_adc not in eiger for usersclass (esrf). get adc in millicelsius 2017-09-21 14:51:32 +02:00
Dhanya Maliakal
271664f577 changes to users class to call dac and adc by string name 2017-09-21 12:54:03 +02:00
Dhanya Maliakal
f2be03be05 example for adc index in users 2017-09-21 11:51:38 +02:00
Dhanya Maliakal
15b86a50d5 added advanced user stuff for esrf 2017-09-19 10:05:55 +02:00
Dhanya Maliakal
a95e2efdb0 parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing 2017-09-18 16:47:22 +02:00
Dhanya Maliakal
f084efd263 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:18 +02:00
Dhanya Maliakal
c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
Dhanya Maliakal
7e00d9f395 Merge branch 'developer' into hdf5 2017-03-03 10:06:34 +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
3eea80a121 compiles after merging 2016-12-19 13:50:25 +01:00
12cd3d07a2 some changes for jctb 2016-12-19 12:05:59 +01:00
Dhanya Maliakal
e7621a6cd0 moving towards c++ api 2016-12-12 14:24:11 +01:00
cb879c61ca changes for new chipterboard -now works with reduced dynamic range and analog/digital readout 2016-11-09 11:36:59 +01:00
Dhanya Maliakal
1263e80d21 done 2016-09-16 12:49:27 +02:00
Dhanya Maliakal
a821442b1a almosst 2016-09-15 12:16:01 +02:00
Dhanya Maliakal
652d29f2d9 almost done 2016-09-09 17:51:36 +02:00
Dhanya Maliakal
1db5ef4fd4 added 2 gain settings to eigeR 2016-08-03 10:35:11 +02:00
Dhanya Maliakal
c0db1a89a8 deactivate for eiger 2016-08-02 10:32:37 +02:00
Dhanya Maliakal
35b02c9cf0 added burst_trigger mode for eiger to replace trigger_readout mode 2016-07-04 15:47:32 +02:00
Dhanya Maliakal
6cc22a350d Merge branch 'release' into jungfrauv1.0 2016-02-03 15:05:50 +01:00
Dhanya Maliakal
f477b7a5ac not much changes 2016-01-19 16:25:48 +01:00
Dhanya Maliakal
5c239ad45f data call back form receiver includes both x and y dimensions 2015-12-16 15:01:00 +01:00
Dhanya Maliakal
61f0506c2c settings for jungfrau 2015-12-01 16:43:23 +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
l_msdetect
fa80d6a205 change settings for eiger 2015-11-13 11:43:19 +01:00
Dhanya Maliakal
a770389c90 including subframe index from receiver to client and also sending this to gui 2015-09-23 11:50:02 +02:00
Dhanya Maliakal
cae286941a added subframe exposure time settable 2015-09-03 15:16:48 +02:00
Dhanya Maliakal
a8fc34c92b included propix for client 2015-07-21 16:26:50 +02:00
Dhanya Maliakal
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
Dhanya Maliakal
85ccf64175 print receiver configurations for all detectors added 2015-03-02 13:56:23 +01:00
9ac08e5e76 supports frames with many samples for jctb - obtained by faking number of chips in case of many samples 2015-01-30 12:58:53 +01:00
308b3aa9b1 Client and jungfrau server funcs added for pattern generator 2014-10-14 17:03:13 +02:00
Maliakal Dhanya
8788a060dd creating a separate receiver 2014-05-21 09:44:35 +02:00
l_maliakal_d
c45c417a0a got rid of trigger frame and trigger window to merge with other timing modes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@809 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 14:06:48 +00:00