|
|
9df1eac3c1
|
Merge branch 'main-rc' into b2.2.0
2.2.0
|
2020-11-30 15:46:45 +01:00 |
|
|
|
5ededf9be4
|
Merge branch 'main-rc' into b2.1.1
2.1.1
|
2020-11-30 15:16:57 +01:00 |
|
|
|
3e8774798a
|
Merge branch 'main-rc' into b2.1.0
2.1.0
|
2020-11-30 15:13:43 +01:00 |
|
Dhanya Maliakal
|
0e5d4d1d8e
|
Merge remote branch 'slsDetectorCalibration/2.2' into 2.2
|
2017-12-12 11:14:01 +01:00 |
|
Dhanya Maliakal
|
a2986784d3
|
Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1
|
2017-12-12 11:13:34 +01:00 |
|
Dhanya Maliakal
|
975cbb576e
|
Merge remote branch 'slsDetectorCalibration/2.1' into 2.1
|
2017-12-12 11:06:15 +01:00 |
|
Dhanya Maliakal
|
e48a92d9cd
|
Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5
2.0.5
|
2017-12-12 11:02:57 +01:00 |
|
Dhanya Maliakal
|
025c836e25
|
Merge remote branch 'slsDetectorGui/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
Dhanya Maliakal
|
5d5abae3f4
|
Merge remote branch 'slsReceiverSoftware/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
Dhanya Maliakal
|
e2ad46386e
|
Merge remote branch 'slsDetectorSoftware/2.2' into 2.2
|
2017-12-04 16:47:26 +01:00 |
|
Dhanya Maliakal
|
308d44e452
|
Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
Dhanya Maliakal
|
69da61b1fb
|
Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
Dhanya Maliakal
|
460168ce04
|
Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:21 +01:00 |
|
Dhanya Maliakal
|
4e429c0d77
|
Merge remote branch 'slsDetectorGui/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
Dhanya Maliakal
|
bf4fab549d
|
Merge remote branch 'slsReceiverSoftware/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
Dhanya Maliakal
|
f7705eb1da
|
Merge remote branch 'slsDetectorSoftware/2.1' into 2.1
|
2017-12-04 16:45:32 +01:00 |
|
Dhanya Maliakal
|
a2217e2066
|
Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:33:33 +01:00 |
|
Dhanya Maliakal
|
aaa02706fc
|
Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:31:52 +01:00 |
|
Dhanya Maliakal
|
111856ed7b
|
hv should work now
|
2017-01-06 15:16:05 +01:00 |
|
Dhanya Maliakal
|
0fdbac981e
|
should work for serial comm hv for 9m
|
2017-01-05 12:58:49 +01:00 |
|
Dhanya Maliakal
|
bd1601c2eb
|
fixwed the printing of errors but not error message
|
2016-12-19 11:37:14 +01:00 |
|
Dhanya Maliakal
|
2d1c91c0e0
|
bug in sem for new scans
|
2016-12-16 14:59:55 +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
|
f464be38a3
|
xyrangechanged not checked for histogram
|
2016-12-16 14:46:02 +01:00 |
|
Dhanya Maliakal
|
ed3129029d
|
Merge branch '9m_rest' into 2.2-rc
|
2016-12-15 14:32:34 +01:00 |
|
Dhanya Maliakal
|
983f517e07
|
added users to the package
|
2016-12-15 14:04:37 +01:00 |
|
Dhanya Maliakal
|
2a508435c7
|
change the filenaming according to det position and not det id
|
2016-12-13 11:41:27 +01:00 |
|
|
|
3c0ce23bc2
|
fixed hardcoded port number, cleanup
|
2016-12-02 15:21:22 +00: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
|
28b0897dd7
|
fixed bug of crash when changing dr sometimes, latestdata was incorrectly inititalized
|
2016-12-02 08:55:07 +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 |
|
|
|
657d3e5759
|
first functional commit, still some workarounds. Can start, acquire, stop, restart
|
2016-12-01 15:59:12 +00:00 |
|
|
|
f61d819599
|
wip for Eiger9M
|
2016-12-01 07:43:46 +00:00 |
|
Dhanya Maliakal
|
d9016c95de
|
updated the server bins
|
2016-11-30 11:23:46 +01:00 |
|
Dhanya Maliakal
|
ce086fe79d
|
updaterev
|
2016-11-30 11:20:42 +01:00 |
|
Dhanya Maliakal
|
790cef37ff
|
updaterev
|
2016-11-30 11:20:16 +01:00 |
|
Dhanya Maliakal
|
37ea7d425f
|
updaterev
|
2016-11-30 11:17:38 +01:00 |
|
Dhanya Maliakal
|
1fe810d9d1
|
uncommented imagereconstruction in normal checkout script and also added but commented tests repository
|
2016-11-30 11:16:59 +01:00 |
|
Dhanya Maliakal
|
09645cbba8
|
bottom is defined as flippeddatax in config file, not anymore as argument for receiver
|
2016-11-30 10:36:46 +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
|
0c8ca874e4
|
image reconstruction should work now
|
2016-11-28 14:52:46 +01:00 |
|
Dhanya Maliakal
|
5445552b17
|
removed bug where it shuts down socket and tries to read it as it is -1
|
2016-11-25 14:34:49 +01:00 |
|
Dhanya Maliakal
|
af8c750b5a
|
made the eiger like the jungfrau ignoring packets
|
2016-11-25 12:22:21 +01:00 |
|
Dhanya Maliakal
|
52dbb7f9fc
|
smaller changes to make arguments const
|
2016-11-25 12:22:00 +01:00 |
|
Dhanya Maliakal
|
b131f268e0
|
added the check for detector and receiver online in refreshing tabs
|
2016-11-22 14:11:11 +01:00 |
|
Dhanya Maliakal
|
c70f453de4
|
changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely
|
2016-11-22 14:01:07 +01:00 |
|
Dhanya Maliakal
|
96d8478b46
|
gui ensuring receiver offline caught, also at progress
|
2016-11-22 13:59:27 +01:00 |
|
Dhanya Maliakal
|
09d146ee55
|
changed a printout
|
2016-11-22 11:39:47 +01:00 |
|
Dhanya Maliakal
|
9031b3998b
|
removed warnings and zmq only when not mythen
|
2016-11-22 11:06:05 +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 |
|
