 maliakal_d
|
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
|
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
|
a67d9e60da
|
removing more using namespace std
|
2018-05-24 13:47:48 +02:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
d3a0319863
|
esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails
|
2018-05-02 16:49:27 +02:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
e024774323
|
added storage cells
|
2018-04-13 15:05:43 +02:00 |
|
|
maliakal_d
|
ccdc7d22e9
|
gappixels also work with new zmq handler
|
2018-04-09 11:19:31 +02:00 |
|
|
maliakal_d
|
0eff9e1401
|
debug print
|
2018-04-09 10:13:14 +02:00 |
|
|
maliakal_d
|
8cf6e0cbd6
|
in between
|
2018-04-06 17:48:10 +02:00 |
|
|
maliakal_d
|
72b71f3fcd
|
Merge branch 'developer' into zmqhandler
|
2018-04-04 14:57:24 +02:00 |
|
|
maliakal_d
|
e4868671ae
|
bugfix: users api version numbering always gives a -1.
|
2018-04-04 14:56:55 +02:00 |
|
|
maliakal_d
|
61897cbd41
|
in between
|
2018-04-04 14:27:53 +02:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
dd6301d66d
|
updated for compilation
|
2018-03-14 16:19:30 +01:00 |
|
|
maliakal_d
|
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 |
|
|
Erik Frojdh
|
06cdf8ad92
|
overloading access operator
|
2018-02-28 17:34:55 +01:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
Erik Frojdh
|
77aa3fa215
|
added overloading of call operator for access detector
|
2018-02-16 15:25:35 +01:00 |
|
|
maliakal_d
|
a654febb7e
|
merge from 3.0.1 parallalize dr
|
2018-02-07 15:48:39 +01:00 |
|
|
maliakal_d
|
94b61ea2c4
|
parallelized setting dynamic range
|
2018-02-07 15:45:59 +01:00 |
|
|
maliakal_d
|
897cbac27d
|
merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file
|
2018-02-07 11:02:36 +01:00 |
|
|
maliakal_d
|
ecf1e9fac1
|
bugfix: returning pointer to local variable, char* to string in function definition
|
2018-02-07 10:14:52 +01:00 |
|
|
maliakal_d
|
3da6a6df65
|
merge conflict removed, jungfrau server and eiger server re compiled
|
2018-02-05 12:33:05 +01:00 |
|
|
maliakal_d
|
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 |
|
|
Dhanya Maliakal
|
e19d564364
|
bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name
|
2017-12-08 12:06:10 +01:00 |
|
|
Dhanya Maliakal
|
6e876d79ee
|
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
|
2017-12-08 11:45:29 +01:00 |
|
|
Dhanya Maliakal
|
40a7b3983a
|
put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle
|
2017-12-08 11:40:07 +01:00 |
|
|
Dhanya Maliakal
|
2d14da545d
|
Merge branch '3.0.1' into developer
|
2017-12-05 13:47:09 +01:00 |
|
|
Dhanya Maliakal
|
ce1ec97571
|
some indentation in writing config file
|
2017-12-05 13:47:01 +01:00 |
|
|
Dhanya Maliakal
|
3b684c4662
|
Merge branch '3.0.1' into developer
|
2017-12-05 13:41:26 +01:00 |
|
|
Dhanya Maliakal
|
d00c837977
|
updated write config and write parameters list
|
2017-12-05 13:41:16 +01:00 |
|
|
Dhanya Maliakal
|
12348ac76c
|
merge conflict fix
|
2017-12-01 09:20:44 +01:00 |
|
|
Dhanya Maliakal
|
18422ce215
|
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
|
2017-12-01 09:18:42 +01:00 |
|
|
Dhanya Maliakal
|
5b88203bd9
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:35 +01:00 |
|
|
Dhanya Maliakal
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
|
Dhanya Maliakal
|
2227265357
|
removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire
|
2017-11-30 16:25:23 +01:00 |
|