Commit Graph
969 Commits
Author SHA1 Message Date
maliakal_d 576de404d4 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-11 12:25:27 +02:00
maliakal_d 5a356534e6 refactor receiver client interface, moved defs into one sls_detector_defs.h 2018-10-11 12:25:18 +02:00
Erik Frojdh f735c86b93 removing more pointers 2018-10-11 12:14:46 +02:00
Erik Frojdh 2216574d34 check empty instead of strcmp 2018-10-11 11:51:54 +02:00
maliakal_d f69e9d0df4 refactored client interface (client ot receiveR) 2018-10-10 18:09:14 +02:00
maliakal_d e1d570e8ce client specifies index of receiver returned error, skeleton of including clientinterface in receiver 2018-10-10 13:15:16 +02:00
maliakal_d b981fe78ef connected command to execute command in receiver pc 2018-10-10 12:23:55 +02:00
maliakal_d 5e7e7d3c33 moved client interface to common folder as receiver wills tart using it as well 2018-10-10 12:00:47 +02:00
maliakal_d 78bfc9d0a5 insignificant, renamed recieverInterface to have a capital letter in class name 2018-10-10 11:43:35 +02:00
maliakal_d f2da42a305 overwrite enabled by default 2018-10-10 10:28:38 +02:00
maliakal_d 7d5b24fe33 solved errors with client compile, rxr yet to do 2018-10-09 13:43:50 +02:00
maliakal_d 4bcc24a59f some more changes, yet to do receiver 2018-10-09 12:31:12 +02:00
maliakal_d 923a7e8936 eiger and jungfrau server compiles, gotthard and receiver left to do 2018-10-08 14:38:35 +02:00
maliakal_d 1c78400369 client compiles, more changes required 2018-10-08 09:34:08 +02:00
maliakal_d b5c35ddeac slsdetector and users updated to reflect new signatures, not yet compiled 2018-10-05 15:28:25 +02:00
maliakal_d ab8b07f2ee client multi is updated with argument c++11 threading, need to update sls detector with arguments and removing imod 2018-10-04 17:24:37 +02:00
maliakal_d cf37725e04 updated command.cpp to have all the indices including default ones 2018-10-03 15:28:08 +02:00
maliakal_d c6d2902539 updating indices in slsdetectorcommand 2018-10-03 14:31:43 +02:00
maliakal_d 40ae74bb99 client multi.cpp getid and checkversioncompatibility are examples of how it might look like 2018-10-03 12:31:00 +02:00
maliakal_d fdcd633769 client: multi added indices for detpos in function signature for required 2018-10-03 11:41:50 +02:00
maliakal_d 70ea4b48c3 client: removed slsDetectorutils and postprocessing. yet to compile, yet to add detpos index for every multi sls detector command and call from command interface, removed multiple threading, yet to interface with eriks single template for multiple threading 2018-10-03 11:15:39 +02:00
maliakal_d dafbc970e3 client stage2 ongoing, utils removed but not compile ready; left to do imod for every multi, connect client to multi 2018-10-02 18:13:00 +02:00
maliakal_d 757bc89d05 moved common files outside slsDetectorSoftware 2018-10-02 16:07:53 +02:00
maliakal_d 97934e323c removed actions 2018-10-02 15:51:58 +02:00
maliakal_d c248b12455 refactored ONLY THE CLIENT first stage, compiles 2018-10-02 15:15:35 +02:00
maliakal_d e631414526 updated version 2018-09-27 18:23:08 +02:00
maliakal_d f9b95b63eb gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all 2018-09-27 18:20:03 +02:00
maliakal_d 970d448e73 receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5 2018-09-26 10:53:45 +02:00
maliakal_d c784f0f539 client: moved shortenable to roi in reciever, roi not yet written in master file 2018-09-19 17:35:26 +02:00
maliakal_d 961489edb1 bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware 2018-09-18 18:02:01 +02:00
maliakal_d 781152a772 slsDetectorSoftware bug fix: gappixels for x initialized wrong 2018-09-17 18:13:26 +02:00
maliakal_d 14c899e7cf removed some manual warnings 2018-08-24 12:34:06 +02:00
maliakal_d 588037fd18 updated release version 2018-08-23 16:23:24 +02:00
maliakal_d e0b8fb3609 updated manuals, jungfrau server (reqd firmware vversion) 2018-08-23 15:52:12 +02:00
maliakal_d 63c130a380 client:updated users class and release.txt 2018-08-22 18:08:35 +02:00
maliakal_d 7945d15beb client: updating release.txt, updating command line help, catching slsDetectorUsers exception from multislsdetector constructor 2018-08-21 18:49:29 +02:00
maliakal_d 4e446f1f39 eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server 2018-08-17 13:45:09 +02:00
maliakal_d 830f92dedc client and receiver: silent mode put into shared memory, works properly now 2018-08-15 19:51:04 +02:00
maliakal_d 87e8333dfd slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener 2018-08-15 19:02:16 +02:00
maliakal_d f0ac49190a slsReceiver:trying to get deactivate to work 2018-08-14 15:06:06 +02:00
maliakal_d 0018fa46f8 slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit 2018-08-10 19:14:05 +02:00
maliakal_d da4253fe13 Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0 2018-08-10 17:07:29 +02:00
maliakal_d a0512a01d5 Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do 2018-08-09 18:12:56 +02:00
maliakal_d 1102153d2b Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically) 2018-08-09 15:43:56 +02:00
maliakal_d ab7e63c20f Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences 2018-08-08 15:43:29 +02:00
maliakal_d 147194e8af slsDetector: connect stop socket in checkonline so that it does not stick to its initialized default file descriptor zero (which gets closed upon socket deletion) 2018-08-03 14:54:32 +02:00
maliakal_d 41fb6c26a2 slsDetectorSoftware: from 3.1.4: being able to get timer values individually from the users class since gotthard 25um master and slave will have different delay values 2018-07-30 17:47:37 +02:00
maliakal_d 6213b5e07a gotthard server and slsDetectorSoftware: more accuracy when converting from double to int64_t by adding 0.5, improved clock precision of gotthard from 32.1 to 32.007729 2018-07-26 13:46:41 +02:00
maliakal_d 711e0d771e slsDetectorSoftware: users setSettings(-1) gives undefined settings. fixed 2018-07-23 15:03:00 +02:00
maliakal_d 40c96b5562 Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings 2018-07-18 12:29:19 +02:00