|
|
06f84585af
|
compareRetrun.. to minusOneIf..
|
2018-05-28 11:55:11 +02:00 |
|
|
|
05ed8dca4e
|
more cleanup
|
2018-05-25 17:02:01 +02:00 |
|
|
|
4f600f3129
|
even more
|
2018-05-25 16:32:40 +02:00 |
|
|
|
4b72d685f3
|
migrating more multiSlsDetector calls to the generic function
|
2018-05-25 15:39:28 +02:00 |
|
|
|
bbd7e7906a
|
replacing pulsechip with a generic algorithm
|
2018-05-25 15:10:57 +02:00 |
|
|
|
7702865409
|
replacing slsDetectorMember calls with generic function
|
2018-05-25 11:38:59 +02:00 |
|
|
|
2f8c1b453e
|
renaming generic call
|
2018-05-25 11:06:33 +02:00 |
|
|
|
f45e2b4ab9
|
changed type of getCalDir to std::string
|
2018-05-25 10:30:02 +02:00 |
|
|
|
228d624d8f
|
general function for returning first or concatenated string
|
2018-05-25 10:01:51 +02:00 |
|
|
|
301600e720
|
chaning return type of getSettingsDir and setSettingsDir to std::string
|
2018-05-24 17:47:12 +02:00 |
|
|
|
1dfdcfcb7e
|
finished removing using namespace std
|
2018-05-24 15:24:01 +02:00 |
|
|
|
212218396a
|
removal of using namespace std from theadFiles
|
2018-05-24 14:47:45 +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 |
|
|
|
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 |
|
|
|
61897cbd41
|
in between
|
2018-04-04 14:27:53 +02:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
0d2dd93498
|
changed setBit and getBit to uint32_t
|
2018-03-08 17:13:13 +01:00 |
|
|
|
339956e5de
|
changed from int to uint32_t in read and writeRegister
|
2018-03-08 16:08:31 +01:00 |
|
|
|
06cdf8ad92
|
overloading access operator
|
2018-02-28 17:34:55 +01:00 |
|
|
|
77aa3fa215
|
added overloading of call operator for access detector
|
2018-02-16 15:25:35 +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 |
|
|
|
2d6e4c95a2
|
temp_threshold, temp_control, temp_event done
|
2018-01-11 15:37:24 +01:00 |
|
|
|
6e876d79ee
|
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
|
2017-12-08 11:45:29 +01:00 |
|
|
|
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 |
|
|
|
12348ac76c
|
merge conflict fix
|
2017-12-01 09:20:44 +01:00 |
|
|
|
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 |
|
|
|
5b88203bd9
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:35 +01:00 |
|
|
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
|
|
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 |
|
|
|
6a41b5ce3a
|
using file index from zmq
|
2017-11-28 14:45:29 +01:00 |
|
|
|
ca19993149
|
makng the zmq work without external flag
|
2017-11-27 17:06:18 +01:00 |
|
|
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
|
|
3439ccbec9
|
updates for merge for r_readfreq without reciever
|
2017-11-23 18:30:48 +01:00 |
|
|
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
|
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
|
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
|
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
|
|
82f503aa09
|
dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui
|
2017-10-31 12:50:31 +01:00 |
|
|
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
|
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
|
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|
|
|
afc08f8c30
|
double* changed to char* in gui data call back, decoding to be done by caller. enablegappixels skeleton created
|
2017-10-02 13:21:38 +02:00 |
|
|
|
352ade6457
|
just skeleton of gappixels
|
2017-09-27 17:08:00 +02:00 |
|
|
|
af98d2bb53
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:09:02 +02:00 |
|
|
|
663fd557ff
|
client gives now 3d positions of detector to be configured in udp header, only in jungfrau firmware till now
|
2017-09-22 15:28:57 +02:00 |
|
|
|
ab27437604
|
removed setframeindexenable from going to the receiver, it can figure it out on its own now
|
2017-09-22 12:23:39 +02:00 |
|
|
|
092487c08e
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:36 +02:00 |
|
