6223 Commits

Author SHA1 Message Date
b47f751d66 Merge branch 'm3' into eiger 2020-07-30 12:04:34 +02:00
aa52028690 Merge branch 'developer' into m3 2020-07-30 12:04:14 +02:00
6f5635a402 gotthard2: vetoref taken as decimal and not hex in server 2020-07-30 12:03:36 +02:00
5b9c7c4105 python vhighvoltage to highvoltage 2020-07-30 11:52:22 +02:00
98ffe350f3 changing command from vhighvoltage to highvoltage 2020-07-30 11:50:56 +02:00
7dfeb987db changing command from vhighvoltage to highvoltage 2020-07-30 11:50:03 +02:00
7899c5faef Merge branch 'm3' into eiger 2020-07-30 11:31:55 +02:00
17fb497774 Merge branch 'developer' into m3 2020-07-30 11:20:57 +02:00
Dhanya Thattil
e9c03c6eaf
Merge pull request #122 from slsdetectorgroup/g2
G2
2020-07-30 11:18:56 +02:00
f497177022 fixes fro review 2020-07-30 11:18:40 +02:00
984b43545e Merge branch 'm3' into eiger 2020-07-29 17:26:20 +02:00
327218cb2b Merge branch 'g2' into m3 2020-07-29 17:26:04 +02:00
cdfd3934ee Merge branch 'developer' into g2 2020-07-29 17:25:45 +02:00
4cebefbc55 Merge branch 'm3' into eiger 2020-07-29 17:21:14 +02:00
24c4cd8d84 Merge branch 'g2' into m3 2020-07-29 17:15:37 +02:00
f358492e09 all binaries in 2020-07-29 16:53:21 +02:00
86d3fc7e55 fixes from review, moving from array to vector to avoid VLA 2020-07-29 16:52:22 +02:00
89da671ae2 m3: numpackets to 2 or 20 depending on ten giga enable 2020-07-29 15:10:54 +02:00
Gemma Tinti
24e44d56fe Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-07-29 15:02:22 +02:00
Gemma Tinti
b13d04dd89 eiger manual in 5.x 2020-07-29 15:02:11 +02:00
Erik Frojdh
d19530b3d4 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-07-29 14:39:44 +02:00
Erik Frojdh
5ba3a414d6 Warn on the use of VLAs 2020-07-29 14:39:34 +02:00
54ad92a2bf binarires in 2020-07-29 13:26:55 +02:00
74a7ca9b71 gotthard2: vetophoton now has gain thresholds for each row and the get writes to file gain indices and adu for each channel, adus written in dec instead of hex, veto file in server removed and uses vetophoton instead 2020-07-29 13:24:42 +02:00
6846939f92 eiger rxr: space between subperiod(ns) in master file 2020-07-29 09:56:03 +02:00
99ec7f0046 eiger: always change speed when changing dr 2020-07-28 17:06:46 +02:00
df3ae7f409 gotthard2: reversing order of adc channels to chip 2020-07-28 15:08:13 +02:00
410f38c804 jungfrau calibrated settings in 2020-07-28 09:26:20 +02:00
Erik Frojdh
91652df5b1 minor 2020-07-28 08:41:45 +02:00
Erik Frojdh
02bda7c533 using GET_FLAG directly 2020-07-27 16:55:26 +02:00
Dhanya Thattil
9204a56ff7
Merge pull request #121 from slsdetectorgroup/checkargs
Check args for sending to detector/receiver
2020-07-27 15:49:19 +02:00
Dhanya Thattil
3ec637601d
Merge branch 'developer' into checkargs 2020-07-27 15:49:08 +02:00
Erik Frojdh
dc33f1a5da const 2020-07-27 09:14:58 +02:00
Erik Frojdh
879b2c8864 clean getThresholdTemp 2020-07-27 08:58:33 +02:00
Erik Frojdh
b1a4723028 WIP 2020-07-27 08:53:10 +02:00
Erik Frojdh
bad7fd3906 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-07-24 15:48:44 +02:00
Erik Frojdh
21c8b77e2c fixed tests 2020-07-24 15:45:21 +02:00
Erik Frojdh
097acf8086 renamed function to checkArgs 2020-07-24 14:26:58 +02:00
Dhanya Thattil
799f540d71
Update change_request.md 2020-07-24 11:32:51 +02:00
Dhanya Thattil
a412b465c6
Create change_request.md 2020-07-24 11:32:09 +02:00
Dhanya Thattil
bb2f70beb5
Update feature_request.md 2020-07-24 11:27:01 +02:00
Dhanya Thattil
096e94562a
Update bug_report.md 2020-07-24 11:25:54 +02:00
Dhanya Thattil
9063a8d4ed
Update feature_request.md 2020-07-24 11:25:02 +02:00
Dhanya Thattil
b1d3cbb25e
Create feature_request.md 2020-07-24 11:23:50 +02:00
Erik Frojdh
1fefc001f9 added const methods for detector 2020-07-24 11:17:45 +02:00
Erik Frojdh
e8556abbe7 WIP 2020-07-24 10:57:54 +02:00
Dhanya Thattil
f8da057735
Update bug_report.md 2020-07-24 10:57:00 +02:00
Dhanya Thattil
df0b52604f
Update bug_report.md 2020-07-24 10:55:39 +02:00
Dhanya Thattil
f792d59682
Update bug_report.md 2020-07-24 10:55:05 +02:00
Dhanya Thattil
98d061a032
Create bug_report.md 2020-07-24 10:51:43 +02:00