|
|
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 |
|
|
|
0b140111b3
|
sharedmem: more modifications on command line to remove features such as id, remove, add
|
2018-06-26 12:10:50 +02:00 |
|
|
|
d7831f6c64
|
sharedmem: command line refactor, fixing to do
|
2018-06-25 19:18:00 +02:00 |
|
|
|
a97b725f43
|
sharedmem: command line done, fixing to do
|
2018-06-25 19:14:41 +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 |
|
|
|
55517e6d4c
|
sharedmem: done with multi .h, sls and command line left
|
2018-06-20 17:12:48 +02:00 |
|
|
|
2853f97fe7
|
sharedmem: done with multi, sls and command line left to do
|
2018-06-20 14:06:10 +02:00 |
|
|
|
fc0f8ef9da
|
more changes for multi for shared mem
|
2018-06-19 16:38:18 +02:00 |
|
|
|
99bf6446fe
|
shared mem in the middle of modifying multi
|
2018-06-18 17:51:30 +02:00 |
|
|
|
2eecf43fbb
|
multi sharedmemory, basic done, left to go thru whole file, and slsDetector left to do
|
2018-06-12 18:00:26 +02:00 |
|
|
|
b294b3e8b1
|
in progress with integratign new shm in multi
|
2018-06-12 12:14:55 +02:00 |
|
|
|
2dece5c635
|
jungfrau server: reading power status (fixed in firmware)
|
2018-06-06 16:15:30 +02:00 |
|
|
|
24db58e615
|
jungfrau server required firmware version on server changed from 0x2018 to 0x18
|
2018-06-06 10:23:06 +02:00 |
|
|
|
bab7d8e3fb
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-06-01 11:05:03 +02:00 |
|
|
|
2339fb2a0e
|
slsDetectorSoftware: bug fix, changing dr didnt change the databytesinclgappixels immediately
|
2018-06-01 11:04:54 +02:00 |
|
Erik Frojdh
|
378392c0f5
|
fixed return storage cell
|
2018-05-29 18:10:36 +02:00 |
|
Erik Frojdh
|
fcde40b854
|
minor
|
2018-05-29 17:26:27 +02:00 |
|
Erik Frojdh
|
ceed0eaa9b
|
generic call for hostname and sgetDetectorsType
|
2018-05-29 16:59:55 +02:00 |
|
Erik Frojdh
|
e3088d822f
|
removed commented section
|
2018-05-29 16:09:09 +02:00 |
|
Erik Frojdh
|
27ebd9c713
|
applying callDetectorMember in getTimerLeft
|
2018-05-29 16:08:08 +02:00 |
|
Erik Frojdh
|
6cf7bf2e06
|
using callDetectorMember for portType
|
2018-05-29 15:51:55 +02:00 |
|
Erik Frojdh
|
fc7ae98eee
|
using parallel call for checkCompatibility
|
2018-05-29 15:45:13 +02:00 |
|
|
|
0f6cb4dc41
|
Merge branch 'developer' into gotthardversioning
|
2018-05-29 12:14:59 +02:00 |
|
|
|
ecc970bc73
|
gotthard server: check client api version done
|
2018-05-29 12:14:46 +02:00 |
|
|
|
15aaa93130
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-05-28 19:17:37 +02:00 |
|
|
|
34b659fa15
|
first draft of gotthard versioning
|
2018-05-28 19:17:06 +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
|
32c1a45e11
|
minor
|
2018-05-28 18:46:08 +02:00 |
|
Erik Frojdh
|
da1b6ad62d
|
more generalization in multi
|
2018-05-28 17:12:19 +02:00 |
|
Erik Frojdh
|
49d6dcb6e2
|
templated functions in multi
|
2018-05-28 13:23:30 +02:00 |
|
Erik Frojdh
|
9d3fdaaadc
|
minor clean
|
2018-05-28 12:22:25 +02:00 |
|
Erik Frojdh
|
06f84585af
|
compareRetrun.. to minusOneIf..
|
2018-05-28 11:55:11 +02:00 |
|
Erik Frojdh
|
4765849613
|
minor
|
2018-05-25 17:09:23 +02:00 |
|
Erik Frojdh
|
05ed8dca4e
|
more cleanup
|
2018-05-25 17:02:01 +02:00 |
|
Erik Frojdh
|
4f600f3129
|
even more
|
2018-05-25 16:32:40 +02:00 |
|
Erik Frojdh
|
4b72d685f3
|
migrating more multiSlsDetector calls to the generic function
|
2018-05-25 15:39:28 +02:00 |
|
Erik Frojdh
|
bbd7e7906a
|
replacing pulsechip with a generic algorithm
|
2018-05-25 15:10:57 +02:00 |
|
Erik Frojdh
|
f735baf9d7
|
more cleaning
|
2018-05-25 12:21:36 +02:00 |
|
Erik Frojdh
|
ad14381ab4
|
replacing ReceiverReadTimer, Frequency calibratePedestal
|
2018-05-25 11:44:39 +02:00 |
|
Erik Frojdh
|
7702865409
|
replacing slsDetectorMember calls with generic function
|
2018-05-25 11:38:59 +02:00 |
|
Erik Frojdh
|
2f8c1b453e
|
renaming generic call
|
2018-05-25 11:06:33 +02:00 |
|
Erik Frojdh
|
883317dd28
|
replaced logic in getSettingsFile
|
2018-05-25 10:46:36 +02:00 |
|
Erik Frojdh
|
8ed67119b9
|
replacing logic in getLastClientIP and getReceiverLastClientIP with generic function
|
2018-05-25 10:39:34 +02:00 |
|
Erik Frojdh
|
f45e2b4ab9
|
changed type of getCalDir to std::string
|
2018-05-25 10:30:02 +02:00 |
|
Erik Frojdh
|
228d624d8f
|
general function for returning first or concatenated string
|
2018-05-25 10:01:51 +02:00 |
|
Erik Frojdh
|
e0c9805ee8
|
clang-format on multiDetector
|
2018-05-25 08:23:59 +02:00 |
|
Erik Frojdh
|
4eef81fbe9
|
clean up of multiSlsDetector::getSettingsDir
|
2018-05-24 18:14:02 +02:00 |
|
Erik Frojdh
|
301600e720
|
chaning return type of getSettingsDir and setSettingsDir to std::string
|
2018-05-24 17:47:12 +02:00 |
|
