3428 Commits

Author SHA1 Message Date
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
aba3319427 moving towards c++ api 2016-12-12 14:24:39 +01:00
Dhanya Maliakal
d3200dc76f moving towards c++ api 2016-12-12 14:24:24 +01:00
Dhanya Maliakal
e7621a6cd0 moving towards c++ api 2016-12-12 14:24:11 +01:00
d6793a0802 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_calibration into developer 2016-12-05 16:01:00 +01:00
37ba8f9a71 added moench03 T CPU data structure 2016-12-05 16:00:34 +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
37ea7d425f updaterev 2016-11-30 11:17:38 +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
b131f268e0 added the check for detector and receiver online in refreshing tabs 2016-11-22 14:11:11 +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
96d8478b46 gui ensuring receiver offline caught, also at progress 2016-11-22 13:59:27 +01:00
Dhanya Maliakal
09d146ee55 changed a printout 2016-11-22 11:39:47 +01:00
Dhanya Maliakal
9031b3998b removed warnings and zmq only when not mythen 2016-11-22 11:06:05 +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
4292bf1ce8 updaterev 2016-11-11 14:15:08 +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
9ee9fdea96 fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards 2016-11-10 16:13:42 +01:00
Dhanya Maliakal
7d860cc7cd fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards 2016-11-10 16:13:22 +01:00
Dhanya Maliakal
cec2e5c6b4 reverting to previous 2016-11-10 16:08:38 +01:00
Dhanya Maliakal
5189640cd7 debugging for eriks pc 2016-11-10 16:02:31 +01:00
Dhanya Maliakal
8298486f27 debugging for eriks pc 2016-11-10 15:57:04 +01:00