|
|
3eea80a121
|
compiles after merging
|
2016-12-19 13:50:25 +01:00 |
|
|
|
68b13a0ecd
|
merged to developer
|
2016-12-19 12:26:53 +01:00 |
|
|
|
12cd3d07a2
|
some changes for jctb
|
2016-12-19 12:05:59 +01:00 |
|
Dhanya Maliakal
|
bd1601c2eb
|
fixwed the printing of errors but not error message
|
2016-12-19 11:37:14 +01:00 |
|
Dhanya Maliakal
|
64843c1c76
|
made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread
|
2016-12-16 14:46:54 +01:00 |
|
Dhanya Maliakal
|
2a508435c7
|
change the filenaming according to det position and not det id
|
2016-12-13 11:41:27 +01:00 |
|
Dhanya Maliakal
|
a67f9d50de
|
removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen
|
2016-12-02 12:47:01 +01:00 |
|
Dhanya Maliakal
|
dd9387ef29
|
using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports
|
2016-12-02 08:53:08 +01:00 |
|
Dhanya Maliakal
|
466f1506a5
|
bottom is defined as flippeddatax in config file, not anymore as argument for receiver
|
2016-11-30 10:36:34 +01:00 |
|
Dhanya Maliakal
|
52dbb7f9fc
|
smaller changes to make arguments const
|
2016-11-25 12:22:00 +01:00 |
|
Dhanya Maliakal
|
394526a9c3
|
removed zmq threads from client and made it receive packets via for loop
|
2016-11-22 11:05:42 +01:00 |
|
Dhanya Maliakal
|
0ed9ee0e5d
|
fixing the 32 bit crash and empty plot using zmq
|
2016-11-21 12:02:45 +01:00 |
|
Dhanya Maliakal
|
9d106f6c93
|
changed clock for jungfrau, maybe other debugging stuff outside this folder
|
2016-11-21 09:21:30 +01:00 |
|
Dhanya Maliakal
|
44d6b0ffc0
|
fixed time interval in receiveR
|
2016-11-10 14:37:18 +01:00 |
|
Dhanya Maliakal
|
753ed306d9
|
changes to include eiger in gui
|
2016-11-10 08:41:46 +01:00 |
|
|
|
cb879c61ca
|
changes for new chipterboard -now works with reduced dynamic range and analog/digital readout
|
2016-11-09 11:36:59 +01:00 |
|
Dhanya Maliakal
|
dec82ab850
|
included datastream command earlier but not working yet
|
2016-11-08 15:21:56 +01:00 |
|
Dhanya Maliakal
|
52cf790dde
|
deletion of retval in getdatafrom, client
|
2016-11-07 17:57:03 +01:00 |
|
Dhanya Maliakal
|
39a2317d8d
|
somewhere
|
2016-11-07 17:34:41 +01:00 |
|
Dhanya Maliakal
|
e4dcd1cb6b
|
setting and getting printouts, changed the rx mess to 1000
|
2016-11-07 15:34:47 +01:00 |
|
Dhanya Maliakal
|
8caa9d8779
|
fixed jungfrau problem, changed set receiver to updatedetector before
|
2016-11-04 17:14:47 +01:00 |
|
Dhanya Maliakal
|
25780a2b4f
|
fixed jungfrau gui
|
2016-11-04 13:45:24 +01:00 |
|
Dhanya Maliakal
|
79d5a24af4
|
debugging
|
2016-11-04 12:02:37 +01:00 |
|
Dhanya Maliakal
|
4b99ff7fbe
|
reset fpga implemented, changed receiver configuration warning prints, powerchip implemented
|
2016-11-03 12:31:34 +01:00 |
|
Dhanya Maliakal
|
55c35b6669
|
merged
|
2016-11-02 14:36:21 +01:00 |
|
Dhanya Maliakal
|
88d5e4c9a0
|
threadstarted not initialized
|
2016-11-01 16:36:19 +01:00 |
|
Dhanya Maliakal
|
f0ac9a2e9c
|
back to not asking getframescaught
|
2016-11-01 15:59:43 +01:00 |
|
Dhanya Maliakal
|
1f3a418d93
|
make t crash
|
2016-11-01 15:02:14 +01:00 |
|
Dhanya Maliakal
|
92305a9f7a
|
something
|
2016-11-01 11:27:17 +01:00 |
|
Dhanya Maliakal
|
4c6c078442
|
settimer returning -1 now instead of 1 for different values
|
2016-10-28 08:12:55 +02:00 |
|
Dhanya Maliakal
|
f5f9e535de
|
acquiring flag cleared at configuration file load
|
2016-10-28 07:58:39 +02:00 |
|
Dhanya Maliakal
|
b28c68127a
|
check for why gui doesnt show all data
|
2016-10-25 16:48:04 +02:00 |
|
Dhanya Maliakal
|
fde7d2359c
|
check for why gui doesnt show all data
|
2016-10-25 16:22:03 +02:00 |
|
Dhanya Maliakal
|
f2abf0fbfd
|
check for why gui doesnt show all data
|
2016-10-25 16:08:36 +02:00 |
|
Dhanya Maliakal
|
a6fecca2b8
|
check for why gui doesnt show all data
|
2016-10-25 16:05:39 +02:00 |
|
Dhanya Maliakal
|
64965e2a1a
|
check for why gui doesnt show all data
|
2016-10-25 15:53:04 +02:00 |
|
Dhanya Maliakal
|
7803e94d79
|
check for why gui doesnt show all data
|
2016-10-25 15:38:32 +02:00 |
|
Dhanya Maliakal
|
1e361bb3ba
|
check for why gui doesnt show all data
|
2016-10-25 15:35:00 +02:00 |
|
Dhanya Maliakal
|
f7898bc62b
|
check for why gui doesnt show all data
|
2016-10-25 15:13:38 +02:00 |
|
Dhanya Maliakal
|
994ccac75b
|
check for why gui doesnt show all data
|
2016-10-25 15:03:13 +02:00 |
|
Dhanya Maliakal
|
e312098e56
|
check for why gui doesnt show all data
|
2016-10-25 14:52:25 +02:00 |
|
Dhanya Maliakal
|
12574f4c05
|
merged zmqdata to developer
|
2016-10-20 08:46:48 +02:00 |
|
Dhanya Maliakal
|
81d96a047d
|
slsDetector/slsDetectorCommand.cpp
|
2016-10-20 07:31:53 +02:00 |
|
Dhanya Maliakal
|
121e9faf56
|
trying with the actual 1 getframescaught
|
2016-10-19 10:32:11 +02:00 |
|
Dhanya Maliakal
|
673e7c8f20
|
removed asking only 1 for framescaugh
|
2016-10-19 10:22:35 +02:00 |
|
Dhanya Maliakal
|
749c64204e
|
done showing error when detectors not added in sharedmemory due to connect failure
|
2016-10-19 08:15:52 +02:00 |
|
Dhanya Maliakal
|
e49f97a03c
|
done showing error when detectors not added in sharedmemory due to connect failure
|
2016-10-19 08:10:42 +02:00 |
|
Dhanya Maliakal
|
f535e11bba
|
check not done
|
2016-10-18 15:31:48 +02:00 |
|
Dhanya Maliakal
|
028ba57876
|
check for giving an error in gui if cannot connect to hostname
|
2016-10-18 15:06:01 +02:00 |
|
Dhanya Maliakal
|
ca89835035
|
check for giving an error in gui if cannot connect to hostname
|
2016-10-18 15:03:44 +02:00 |
|
