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 |
|
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 |
|
|
|
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 |
|
|
|
d3a0319863
|
esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails
|
2018-05-02 16:49:27 +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 |
|
|
|
e024774323
|
added storage cells
|
2018-04-13 15:05:43 +02:00 |
|
|
|
ccdc7d22e9
|
gappixels also work with new zmq handler
|
2018-04-09 11:19:31 +02:00 |
|
|
|
0eff9e1401
|
debug print
|
2018-04-09 10:13:14 +02:00 |
|
|
|
8cf6e0cbd6
|
in between
|
2018-04-06 17:48:10 +02:00 |
|
|
|
72b71f3fcd
|
Merge branch 'developer' into zmqhandler
|
2018-04-04 14:57:24 +02:00 |
|
|
|
e4868671ae
|
bugfix: users api version numbering always gives a -1.
|
2018-04-04 14:56:55 +02:00 |
|
|
|
61897cbd41
|
in between
|
2018-04-04 14:27:53 +02:00 |
|
|
|
5340b8ef24
|
added error mask for loading/writing config file to be caught by python
|
2018-03-26 18:07:10 +02:00 |
|
Erik Frojdh
|
9ba3fb9279
|
removed using namespace std from multiSlsDetector
|
2018-03-16 10:51:27 +01:00 |
|
Erik Frojdh
|
50111bcea7
|
removed unused variable in slsDetector
|
2018-03-16 10:41:30 +01:00 |
|
|
|
dd6301d66d
|
updated for compilation
|
2018-03-14 16:19:30 +01: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 |
|
|
|
7859df6aa3
|
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
|
2018-02-26 12:44:32 +01:00 |
|
|
|
c3d6852f97
|
fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different
|
2018-02-23 14:49:18 +01:00 |
|
|
|
a654febb7e
|
merge from 3.0.1 parallalize dr
|
2018-02-07 15:48:39 +01:00 |
|
|
|
94b61ea2c4
|
parallelized setting dynamic range
|
2018-02-07 15:45:59 +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 |
|
|
|
3da6a6df65
|
merge conflict removed, jungfrau server and eiger server re compiled
|
2018-02-05 12:33:05 +01:00 |
|
|
|
5d04067973
|
added auto comp disable feature
|
2018-02-02 18:01:01 +01:00 |
|
Dhanya Maliakal
|
2d6e4c95a2
|
temp_threshold, temp_control, temp_event done
|
2018-01-11 15:37:24 +01:00 |
|
Dhanya Maliakal
|
d2319459df
|
Merge branch '3.0.1' into developer
|
2017-12-11 18:03:01 +01:00 |
|
helfenstein_p
|
03de29de90
|
refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour
|
2017-12-11 18:02:33 +01:00 |
|
Dhanya Maliakal
|
1e849097ea
|
merge conflict fixed in filename bug
|
2017-12-08 12:09:10 +01:00 |
|
