|
|
1102153d2b
|
Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically)
|
2018-08-09 15:43:56 +02:00 |
|
|
|
52b1e98726
|
merge
|
2018-08-08 12:06:14 +02:00 |
|
|
|
44fdc46c11
|
some changes in the moench executables
|
2018-08-08 10:23:35 +02:00 |
|
|
|
a970bacbe5
|
slsDetectorGui: JCTB does not kill itself for wrong settings anymore
|
2018-05-28 11:29:35 +02:00 |
|
Erik Frojdh
|
f45e2b4ab9
|
changed type of getCalDir to std::string
|
2018-05-25 10:30:02 +02:00 |
|
Erik Frojdh
|
abdf4b1ada
|
converting to Qstring
|
2018-05-25 10:19:09 +02:00 |
|
|
|
563b1bb8b7
|
slsDetectorGui:added subexptime and subperiod to gui
|
2018-05-17 15:34:35 +02:00 |
|
|
|
501d2478a5
|
Merge branch 'jungfraunew' into esrfchanges
|
2018-04-26 16:37:33 +02:00 |
|
|
|
08b6eb78c5
|
gui: always mask out gain bit for jungfrau, even if missing packet
|
2018-04-26 16:32:03 +02:00 |
|
|
|
a09c2e38a3
|
storage cell fix in gui for non jungfrau detectors
|
2018-04-25 17:03:25 +02:00 |
|
|
|
e024774323
|
added storage cells
|
2018-04-13 15:05:43 +02:00 |
|
|
|
9847729f3c
|
gap pixels included in gui
|
2018-04-09 11:13:20 +02:00 |
|
|
|
252e924f92
|
separated start gui button into start and stop to prevent multiple click syndrome
|
2018-03-27 17:49:01 +02:00 |
|
|
|
fe2ba8621b
|
updating versioning to only have date
|
2018-03-27 11:00:15 +02:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
deb59530ab
|
eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau
|
2018-03-08 15:49:01 +01:00 |
|
|
|
ac9d9f6a93
|
removing --f from the gui options help, bugfix gotthard auto to trigger to auto mode and changing tabs will result in num gates and delay being enabled
|
2018-02-26 16:58:45 +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 |
|
|
|
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 |
|
Dhanya Maliakal
|
d6bdbf8524
|
Merge branch '3.0.1' into developer
|
2017-12-11 13:51:20 +01:00 |
|
Dhanya Maliakal
|
bb3e5351b4
|
solving warnings from latest linux
|
2017-12-11 13:51:11 +01:00 |
|
Dhanya Maliakal
|
24c305ec59
|
solved conflicts from merge of version being used to binary
|
2017-12-06 19:07:06 +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
|
7e932bf84b
|
Merge branch '3.0.1' into developer
|
2017-12-05 16:04:26 +01:00 |
|
Dhanya Maliakal
|
b498043ea6
|
remember old read freq if not 0 in gui
|
2017-12-05 16:04:10 +01:00 |
|
Dhanya Maliakal
|
98e09b29d5
|
merge conflict solved -1 in adc in gui
|
2017-12-05 15:39:02 +01:00 |
|
Dhanya Maliakal
|
7aaf95a565
|
-1 in getadc fixed in gui as well
|
2017-12-05 15:37:34 +01:00 |
|
Dhanya Maliakal
|
385e6714cc
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:19 +01:00 |
|
Dhanya Maliakal
|
baee38802b
|
wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it
|
2017-11-30 16:20:26 +01:00 |
|
Dhanya Maliakal
|
1c606df752
|
using file index from zmq
|
2017-11-28 14:45:01 +01:00 |
|
Dhanya Maliakal
|
addf964901
|
Merge branch '3.0.1' into developer
|
2017-11-28 09:37:09 +01:00 |
|
Dhanya Maliakal
|
d5c310a2db
|
only call register call back which already enables streaming in client and receiveR
|
2017-11-28 09:36:14 +01:00 |
|
Dhanya Maliakal
|
e29371ca8d
|
makng the zmq work without external flag
|
2017-11-27 17:06:11 +01:00 |
|
Dhanya Maliakal
|
375b1c9485
|
not required to restart client datastreaming due to connect everytime for acquire
|
2017-11-27 15:40:36 +01:00 |
|
Dhanya Maliakal
|
f0431bd873
|
Merge branch '3.0.1' into developer
|
2017-11-23 18:24:33 +01:00 |
|
Dhanya Maliakal
|
9f733c1dfb
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 18:22:26 +01:00 |
|
Dhanya Maliakal
|
d40a2e0efa
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:29 +01:00 |
|
Dhanya Maliakal
|
d23c9d52ed
|
somewhere
|
2017-11-23 14:53:33 +01:00 |
|
Dhanya Maliakal
|
39a20e1616
|
comment
|
2017-11-22 11:34:55 +01:00 |
|
Dhanya Maliakal
|
4159e83fd6
|
making gui work temporarily for jctb
|
2017-11-22 09:27:01 +01:00 |
|
Dhanya Maliakal
|
7f58b77dfb
|
Merge branch '3.0.1' into developer
|
2017-11-21 15:12:32 +01:00 |
|
Dhanya Maliakal
|
fd4dd5b1e9
|
removed printout
|
2017-11-21 15:12:05 +01:00 |
|
Dhanya Maliakal
|
9c55cb4974
|
removed merge conflicts from bug fix of zmq buffering while acquire from command line
|
2017-11-21 14:57:52 +01:00 |
|
Dhanya Maliakal
|
49ba893d7e
|
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:38:31 +01:00 |
|
Dhanya Maliakal
|
70e4c6e2a2
|
zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:37:00 +01:00 |
|
Dhanya Maliakal
|
28e2ebf75a
|
merge conflict resolved from 3.0.1
|
2017-11-17 09:40:42 +01:00 |
|
Dhanya Maliakal
|
d7137e0c75
|
fixed segmentation fault issue of xputsn the right way, fixed warnings
|
2017-11-17 09:26:05 +01:00 |
|
Dhanya Maliakal
|
2569ffbf10
|
fixed warnings, back to int warning in debugstream due to 64 bit
|
2017-11-17 08:53:05 +01:00 |
|
