Erik Frojdh
|
15235ab4fc
|
default initializer for slsDetector
|
2019-01-10 16:02:29 +01:00 |
|
Erik Frojdh
|
0f50b9f161
|
clang-tidy nullptr
|
2019-01-10 15:28:43 +01:00 |
|
|
|
a99584a0da
|
removed ndac from sls_detector_module and from the servers (not used), fixed setting module by eiger bug in sending number of channels
|
2018-11-02 17:08:25 +01:00 |
|
|
|
aec8c031de
|
kept the same client interface:tb changed when fixing error codes/exceptions, modified multi print, fixed roi bug in indexing to sls
|
2018-10-31 14:30:30 +01:00 |
|
|
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
|
|
cf87b6ca83
|
still updating slsdetector.cpp
|
2018-10-25 16:24:05 +02:00 |
|
|
|
86fb843021
|
in the process of rewriting detector client interface
|
2018-10-18 10:58:48 +02:00 |
|
Erik Frojdh
|
0070a79838
|
removed command threaded
|
2018-10-17 17:35:55 +02:00 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
|
b981fe78ef
|
connected command to execute command in receiver pc
|
2018-10-10 12:23:55 +02:00 |
|
|
|
5e7e7d3c33
|
moved client interface to common folder as receiver wills tart using it as well
|
2018-10-10 12:00:47 +02:00 |
|
|
|
78bfc9d0a5
|
insignificant, renamed recieverInterface to have a capital letter in class name
|
2018-10-10 11:43:35 +02:00 |
|
|
|
7d5b24fe33
|
solved errors with client compile, rxr yet to do
|
2018-10-09 13:43:50 +02:00 |
|
|
|
1c78400369
|
client compiles, more changes required
|
2018-10-08 09:34:08 +02:00 |
|
|
|
b5c35ddeac
|
slsdetector and users updated to reflect new signatures, not yet compiled
|
2018-10-05 15:28:25 +02:00 |
|
|
|
40ae74bb99
|
client multi.cpp getid and checkversioncompatibility are examples of how it might look like
|
2018-10-03 12:31:00 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c248b12455
|
refactored ONLY THE CLIENT first stage, compiles
|
2018-10-02 15:15:35 +02:00 |
|
|
|
c784f0f539
|
client: moved shortenable to roi in reciever, roi not yet written in master file
|
2018-09-19 17:35:26 +02:00 |
|
|
|
63c130a380
|
client:updated users class and release.txt
|
2018-08-22 18:08:35 +02:00 |
|
|
|
830f92dedc
|
client and receiver: silent mode put into shared memory, works properly now
|
2018-08-15 19:51:04 +02:00 |
|
|
|
f0ac49190a
|
slsReceiver:trying to get deactivate to work
|
2018-08-14 15:06:06 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c2b1eef75c
|
slsDetectorSoftware: removed warnings, and made compilable via make
|
2018-07-10 14:58:18 +02:00 |
|
|
|
c366e94a96
|
bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do
|
2018-07-05 13:47:20 +02:00 |
|
|
|
d7cc9fc023
|
slsDetectorSoftware: moved offsets from multi shm to sls shm, and moved updated offsets and createthreadpool to end of addmultipledetectors, so that it is not done each time per detector
|
2018-06-29 12:21:15 +02:00 |
|
|
|
f6660c0dac
|
slsDetectorSoftware: updated shared memory to have _sls_ instead of _single_, and updated versions
|
2018-06-28 10:37:46 +02:00 |
|
|
|
95254619c6
|
sharedmem: config, sethostname call freesharedmemory and call setupmulti, freesharedmemoy(nonstatic) also cleans up member variables to make it consistent with shm, sharedmemory pointer set to 0 in non static free shared memory to be able to continue within application, sethostname frees memory only if detectors found in shm, add calls addmultipledetectors, replace replaces a detector in sls detector level, should also take lines in config file that has comments in between while ignoring the comments, sethostname in slsdetector also updates client, adding object in sls when creating new shm complains if shm existed and must delete again, removed remove commands
|
2018-06-27 15:38:03 +02:00 |
|
|
|
a0016cb005
|
sharedmem: working, need to add replace
|
2018-06-27 10:05:05 +02:00 |
|
|
|
69c71e48f6
|
sharedmem: updated slsdetector, changes left
|
2018-06-25 18:19:19 +02:00 |
|
|
|
5e9871720b
|
sharedmem: slsdetector being modified intensively
|
2018-06-21 18:26:50 +02:00 |
|
|
|
15aaa93130
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-05-28 19:17:37 +02:00 |
|
|
|
cf8b0de433
|
slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up
|
2018-05-28 19:11:34 +02:00 |
|
Erik Frojdh
|
f45e2b4ab9
|
changed type of getCalDir to std::string
|
2018-05-25 10:30:02 +02:00 |
|
Erik Frojdh
|
301600e720
|
chaning return type of getSettingsDir and setSettingsDir to std::string
|
2018-05-24 17:47:12 +02:00 |
|
|
|
b10abd07ee
|
first draft of api versioning with client
|
2018-05-24 16:51:21 +02:00 |
|
|
|
bdf9373e0d
|
gotthard and jungfrau servers do not need to send whole module for sending settings anymore
|
2018-05-22 14:52:53 +02:00 |
|
|
|
8b39443197
|
slsReciever, slsDetector: configurable number of images per file, removed all the receiver threads from using generalData->maxframesperfile, yet to do: infinite images, bug fix, virtual hdf5 has -1 for all pixels in last image
|
2018-05-18 13:47:10 +02:00 |
|
|
|
1152555663
|
esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size
|
2018-05-01 11:55:48 +02:00 |
|
|
|
bc70cc3a26
|
jungfrau server: added storage start, connected auto_comp_disable, changed adcphase, added ADC_PORT_INVERT_VAL, ADC_OFST_HALF_SPEED_VAL, minimum exposure time
|
2018-04-13 17:33:46 +02:00 |
|
|
|
2bd8e6c166
|
zmq fixed to have additional json headers using rx_zmqjsonheader
|
2018-04-09 16:33:14 +02:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
Erik Frojdh
|
0d2dd93498
|
changed setBit and getBit to uint32_t
|
2018-03-08 17:13:13 +01:00 |
|
Erik Frojdh
|
339956e5de
|
changed from int to uint32_t in read and writeRegister
|
2018-03-08 16:08:31 +01:00 |
|
|
|
897cbac27d
|
merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file
|
2018-02-07 11:02:36 +01:00 |
|
|
|
ecf1e9fac1
|
bugfix: returning pointer to local variable, char* to string in function definition
|
2018-02-07 10:14:52 +01:00 |
|
