Erik Frojdh
|
22ef1cee8b
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-05-28 12:22:35 +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 |
|
|
|
a970bacbe5
|
slsDetectorGui: JCTB does not kill itself for wrong settings anymore
|
2018-05-28 11:29:35 +02:00 |
|
|
|
5be2979fff
|
slsReceiver: fix to default number of frames per file, also set to 10k
|
2018-05-28 11:18:13 +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
|
abdf4b1ada
|
converting to Qstring
|
2018-05-25 10:19:09 +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 |
|
|
|
4d4e4a4ce7
|
first draft of versioning of client
|
2018-05-24 16:58:07 +02:00 |
|
|
|
ad3ac2cdee
|
Merge branch 'developer' into versioning
|
2018-05-24 16:56:39 +02:00 |
|
|
|
b10abd07ee
|
first draft of api versioning with client
|
2018-05-24 16:51:21 +02:00 |
|
Erik Frojdh
|
e65b416215
|
cleaning up sgetDetectorsType
|
2018-05-24 16:32:20 +02:00 |
|
Erik Frojdh
|
24df69d57f
|
cleaning up getHostname
|
2018-05-24 16:21:48 +02:00 |
|
Erik Frojdh
|
183c306166
|
modify string name in multi checkOnline
|
2018-05-24 16:03:17 +02:00 |
|
Erik Frojdh
|
1dfdcfcb7e
|
finished removing using namespace std
|
2018-05-24 15:24:01 +02:00 |
|
Erik Frojdh
|
212218396a
|
removal of using namespace std from theadFiles
|
2018-05-24 14:47:45 +02:00 |
|
Erik Frojdh
|
b78b8425fd
|
ifstream and ofstream to std::
|
2018-05-24 14:27:01 +02:00 |
|
Erik Frojdh
|
12832a3a96
|
adding more std:: in slsDetectorActions.h
|
2018-05-24 14:24:10 +02:00 |
|
Erik Frojdh
|
621b7cfb2a
|
adding std:: where needed
|
2018-05-24 14:11:30 +02:00 |
|
Erik Frojdh
|
a67d9e60da
|
removing more using namespace std
|
2018-05-24 13:47:48 +02:00 |
|
Erik Frojdh
|
d71008bd10
|
removing using namespace std from headers in slsDetector
|
2018-05-24 12:18:25 +02:00 |
|
|
|
a154d0a088
|
slsDetectorUsers: added setthreshold without trimbits for eiger
|
2018-05-23 16:39:52 +02:00 |
|
|
|
c5262458d5
|
eiger and jungfrau server, updated virtual versions with start and stop acquisition
|
2018-05-23 15:28:39 +02:00 |
|
|
|
cb635d800a
|
eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode
|
2018-05-22 18:43:13 +02:00 |
|
|
|
0ed82d4ef7
|
settingsdir for gotthard, jungfrau, propix, moench deleted, as these are default values in server
|
2018-05-22 15:13:26 +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 |
|
|
|
3f61206289
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-05-22 10:59:20 +02:00 |
|
|
|
e19a27bf62
|
eiger server: bug fix for saving trimbits to file, was copying from destination to source in server
|
2018-05-22 10:59:04 +02:00 |
|
Erik Frojdh
|
a1831c38ed
|
replace lostFocus with editingFinished for QT
|
2018-05-18 17:05:35 +02:00 |
|
|
|
c4b8c6385f
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-05-18 16:36:29 +02:00 |
|
|
|
f393751771
|
r_framesperfile configurable to have infinite frames in file with option 0
|
2018-05-18 16:35:50 +02:00 |
|
|
|
94ce042401
|
slsReceiver, fixed virtual hdf5 last row random values bug
|
2018-05-18 14:51:18 +02:00 |
|
Erik Frojdh
|
49b8024c43
|
added logger.h to publig headers
|
2018-05-18 14:15:17 +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 |
|
|
|
dcce66ee9f
|
slsReceiver: debug, insignificant
|
2018-05-17 15:57:16 +02:00 |
|
|
|
563b1bb8b7
|
slsDetectorGui:added subexptime and subperiod to gui
|
2018-05-17 15:34:35 +02:00 |
|
