1651 Commits

Author SHA1 Message Date
Erik Frojdh
b398322fd2 det base 2018-01-29 16:54:34 +01:00
Erik Frojdh
66e0049ded set of headers 2018-01-29 16:52:17 +01:00
Erik Frojdh
7d48c2f8ee actions 2018-01-29 16:48:22 +01:00
Erik Frojdh
988baca7f6 more inc 2018-01-29 16:46:03 +01:00
Erik Frojdh
afd2cd1923 fimnc 2018-01-29 16:40:37 +01:00
Erik Frojdh
2963d5c401 detector defs 2018-01-29 16:38:26 +01:00
Erik Frojdh
87d539a040 header 2018-01-29 16:18:12 +01:00
Erik Frojdh
3a18a0a6cf o 2018-01-23 17:49:40 +01:00
Erik Frojdh
fd03cf5b0f and more targets 2018-01-23 17:46:35 +01:00
Erik Frojdh
b3d6bc1800 targets 2018-01-23 17:37:54 +01:00
Erik Frojdh
0242db7e7a target for install 2018-01-23 17:16:26 +01:00
Dhanya Maliakal
6690335971 gotthard server bug fix, temp read 2017-12-19 17:50:20 +01:00
Dhanya Maliakal
bc8c706150 updated gotthard server binaries (3.0.0.6 was already used in 3.0.1) 2017-12-19 17:44:32 +01:00
Dhanya Maliakal
e39bee0113 gotthard server bug fix, temp fail 2017-12-19 17:33:27 +01:00
Dhanya Maliakal
a4dc00b252 gotthard server binary update 2017-12-19 17:08:28 +01:00
Dhanya Maliakal
6438238b55 gotthard server bug fix, read temp 2017-12-19 17:06:45 +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
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
ce1ec97571 some indentation in writing config file 2017-12-05 13:47:01 +01:00
Dhanya Maliakal
d00c837977 updated write config and write parameters list 2017-12-05 13:41:16 +01:00
Dhanya Maliakal
65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +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
712c9a4524 zmq connect earlier in gui to prevent losing first messages 2017-11-29 12:13:02 +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
65d7922286 merge solved 2017-11-23 18:24:24 +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
5eb8402742 bugfix zmq streaming both on 2017-11-23 17:28:35 +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
20dc338c90 when changing network parameter, switch off data streaming only if on 2017-11-23 17:00:12 +01:00
Dhanya Maliakal
8538604c0f somewhere 2017-11-23 14:53:37 +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
6753f8ba6c network parameter should return with extra plus at the end like hostname 2017-11-22 17:06:43 +01:00
Dhanya Maliakal
167a6cff3e restart streaming if port changed in multi level, sls detector level:need to take care of it on your own 2017-11-21 13:42:11 +01:00