|
7649865a8f
|
jungfrau bug fix: adc phase corrected to correctly return value in -1
|
2018-03-08 14:02:02 +01:00 |
|
|
61e7c0148f
|
updating versions to 3.1.0
|
2018-02-27 12:40:53 +01:00 |
|
|
5849725b97
|
posisibility to overwrite rx_udpmac even with receiver
|
2018-02-26 18:22:07 +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 |
|
|
a6b917851c
|
finetuning printout
|
2018-02-07 15:22:19 +01:00 |
|
|
5198e67dbd
|
made the detector ip and detector mac update client in configuremac
|
2018-02-07 15:16:16 +01:00 |
|
|
ecf1e9fac1
|
bugfix: returning pointer to local variable, char* to string in function definition
|
2018-02-07 10:14:52 +01:00 |
|
|
618f6291cf
|
server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number
|
2018-02-07 09:23:52 +01:00 |
|
|
e6bd874a88
|
modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade
|
2018-02-05 11:50:22 +01:00 |
|
|
5d04067973
|
added auto comp disable feature
|
2018-02-02 18:01:01 +01:00 |
|
Dhanya Maliakal
|
061abf7be0
|
jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up
|
2018-01-11 16:52:08 +01:00 |
|
Dhanya Maliakal
|
2d6e4c95a2
|
temp_threshold, temp_control, temp_event done
|
2018-01-11 15:37:24 +01:00 |
|
Dhanya Maliakal
|
bb3e5351b4
|
solving warnings from latest linux
|
2017-12-11 13:51:11 +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
|
8c123982d2
|
get detector and receiver status only when necessary for stopacquisition
|
2017-12-08 11:50:10 +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
|
bf9905ad2a
|
possible to use binary --version or -v to get the branch and versionid
|
2017-12-06 19:05:35 +01:00 |
|
Dhanya Maliakal
|
c4a242e10a
|
changed all variables from svn to git, included --version for receiver binary
|
2017-12-06 10:29:57 +01:00 |
|
Dhanya Maliakal
|
7436d6c8d3
|
updaterev
|
2017-12-06 08:44:07 +01:00 |
|
Dhanya Maliakal
|
7aaf95a565
|
-1 in getadc fixed in gui as well
|
2017-12-05 15:37:34 +01:00 |
|
Dhanya Maliakal
|
7b1f935da2
|
allowing to read adcs/temp during acquire
|
2017-12-05 14:49:20 +01:00 |
|
Dhanya Maliakal
|
d00c837977
|
updated write config and write parameters list
|
2017-12-05 13:41:16 +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
|
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 |
|
Dhanya Maliakal
|
ba71529ff2
|
comment in users
|
2017-11-28 10:50:35 +01:00 |
|
Dhanya Maliakal
|
1fce54ec4b
|
zmqport in users fixed
|
2017-11-28 10:35:06 +01:00 |
|
Dhanya Maliakal
|
1dd300f713
|
only call register call back which already enables streaming in client and receiver, added to postprocessing
|
2017-11-28 09:36:54 +01:00 |
|
Dhanya Maliakal
|
9f91b78696
|
update comments
|
2017-11-28 09:26:12 +01:00 |
|
Dhanya Maliakal
|
d1eab6f750
|
updated slsdetector users for zmqport set up
|
2017-11-28 09:24:40 +01:00 |
|
Dhanya Maliakal
|
c0a114345b
|
bug fix set error mask when setting wrong settings
|
2017-11-27 16:11:33 +01:00 |
|
Dhanya Maliakal
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
Dhanya Maliakal
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
Dhanya Maliakal
|
dc5384f0f9
|
copy zmq port even if receiver not online, else it is lost
|
2017-11-23 17:20:07 +01:00 |
|
Dhanya Maliakal
|
856ad76247
|
included setreceiver online in users class, so that one can start using users without config file
|
2017-11-23 10:21:54 +01:00 |
|
Dhanya Maliakal
|
7860637b46
|
switching off data streaming from command line only in receiver start and not in receiver as a whoel put command
|
2017-11-22 18:02:36 +01:00 |
|
Dhanya Maliakal
|
2cc11f1ff0
|
bug fix: enabledatastreaming get should return shared memory variable and not from receiver, bug fix:zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same
|
2017-11-21 13:39:12 +01:00 |
|
Dhanya Maliakal
|
a0c014eb7d
|
changed rate correction back to what it was before in users class, enabling sets defaults
|
2017-11-20 15:14:01 +01:00 |
|
Dhanya Maliakal
|
23b415d837
|
streaming port set return same as get simple change
|
2017-11-17 14:04:03 +01:00 |
|
Dhanya Maliakal
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
Dhanya Maliakal
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
Dhanya Maliakal
|
8e0414d1b9
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:01:22 +01:00 |
|
Dhanya Maliakal
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
Dhanya Maliakal
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
Dhanya Maliakal
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
Dhanya Maliakal
|
6693d08331
|
fixed help of acquire doing an actual acquisition
|
2017-11-14 11:53:37 +01:00 |
|
Dhanya Maliakal
|
4903164f95
|
added high voltage to users class
|
2017-11-14 10:58:54 +01:00 |
|
Dhanya Maliakal
|
ef257d12e7
|
prev bug fix of ratecorr for eiger from users, made simpler
|
2017-11-14 09:13:32 +01:00 |
|
Dhanya Maliakal
|
7e0af1cc7c
|
bugfix: users rate correction able to set for eiger
|
2017-11-14 09:08:08 +01:00 |
|
Dhanya Maliakal
|
739187943d
|
replaced gethostbyname with getaddrinfo as it is not thread safe
|
2017-11-10 16:30:38 +01:00 |
|