391 Commits

Author SHA1 Message Date
Dhanya Maliakal
f944d7cae4 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:24 +02:00
Dhanya Maliakal
99dad79572 Somewhere 2017-07-03 13:46:06 +02:00
Dhanya Maliakal
da4ffb235c ensuring set detector type is the first call 2017-07-03 13:32:10 +02:00
Dhanya Maliakal
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +02:00
Dhanya Maliakal
c2624daa9a uncommented a print 2017-06-28 10:27:40 +02:00
Dhanya Maliakal
c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
Dhanya Maliakal
fe73e09aa4 removing unnecessary printouts, ensuring lost packets are 0xff 2017-06-21 17:05:47 +02:00
Dhanya Maliakal
e2e25f6e62 changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place 2017-06-19 14:29:45 +02:00
cbbdd8eeab Merged to developer 2017-06-13 15:30:33 +02:00
8caab4e562 Modicfications for chiptestboard and moench03 module 2017-06-13 15:28:45 +02:00
Dhanya Maliakal
132a9bbfe9 solved many bugs, but cannot get data in eiger 2017-06-09 16:02:58 +02:00
Dhanya Maliakal
c755a8974c done, but need to compile 2017-06-09 11:42:25 +02:00
Dhanya Maliakal
0722ef3125 changes including warnings and zmq 2017-05-04 17:52:47 +02:00
Dhanya Maliakal
445da80df8 resolved warnings, also from esrf: todo: include changes in zmq 2017-05-01 13:11:10 +02:00
Dhanya Maliakal
e9f6dcf479 strtok is not thread safe..used to set receiver udp ip etc to detector, fixed 2017-05-01 10:24:16 +02: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
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
Dhanya Maliakal
19460a03f5 sending position id and num detectors in x and y dir 2017-02-21 15:13:27 +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
987aeda6fb sorted out problem with CPU read out 2016-12-22 17:24:53 +01:00
3eea80a121 compiles after merging 2016-12-19 13:50:25 +01:00
68b13a0ecd merged to developer 2016-12-19 12:26:53 +01:00
12cd3d07a2 some changes for jctb 2016-12-19 12:05:59 +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
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
c639477f28 adding exptime to receiver for file header 2016-11-14 11:57:29 +01:00
Dhanya Maliakal
44d6b0ffc0 fixed time interval in receiveR 2016-11-10 14:37:18 +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
e4dcd1cb6b setting and getting printouts, changed the rx mess to 1000 2016-11-07 15:34:47 +01:00
Dhanya Maliakal
8caa9d8779 fixed jungfrau problem, changed set receiver to updatedetector before 2016-11-04 17:14:47 +01:00
Dhanya Maliakal
4b99ff7fbe reset fpga implemented, changed receiver configuration warning prints, powerchip implemented 2016-11-03 12:31:34 +01:00
Dhanya Maliakal
55c35b6669 merged 2016-11-02 14:36:21 +01:00
Dhanya Maliakal
1f3a418d93 make t crash 2016-11-01 15:02:14 +01:00
Dhanya Maliakal
7fc82723b5 some changes 2016-11-01 14:04:31 +01:00
Dhanya Maliakal
7374a37115 back with checking online, got rid of getframescaught altogether 2016-11-01 10:03:38 +01:00