|
|
ecabc94ade
|
Merge branch 'developer' into m3clks
|
2020-09-09 17:34:02 +02:00 |
|
|
|
c58a2d957d
|
Merge branch 'developer' into updatemode
|
2020-09-09 17:31:09 +02:00 |
|
Erik Frojdh
|
1b214778a5
|
fix import
|
2020-09-09 17:26:50 +02:00 |
|
|
|
d5f6cbc075
|
Merge branch 'm3clks' into pydoc
|
2020-09-09 16:45:38 +02:00 |
|
|
|
52303daffd
|
binaries in
|
2020-09-09 16:44:23 +02:00 |
|
|
|
02d4769f6a
|
WIP
|
2020-09-09 16:39:48 +02:00 |
|
|
|
a9d1a78662
|
m3:smp_clk (timing rxr) changed back to clk div 5
|
2020-09-09 15:55:13 +02:00 |
|
|
|
3cf2160a2d
|
binaries in
|
2020-09-09 15:25:48 +02:00 |
|
Dhanya Thattil
|
4917812bb0
|
Merge pull request #171 from slsdetectorgroup/rmMoenchAPI
Rm moench api
|
2020-09-09 15:22:30 +02:00 |
|
Erik Frojdh
|
a0f9c6fe8c
|
updated python API
|
2020-09-09 15:15:36 +02:00 |
|
|
|
82e978e901
|
WIP
|
2020-09-09 13:47:54 +02:00 |
|
|
|
04bf2aca6d
|
Merge branch 'developer' into rmMoenchAPI
|
2020-09-09 13:45:19 +02:00 |
|
Dhanya Thattil
|
8bdfe7527f
|
Merge pull request #170 from slsdetectorgroup/m3parallel
M3parallel
2020.09.09.dev0
|
2020-09-09 13:44:40 +02:00 |
|
|
|
b33fdf4462
|
merge conflict fixed and merged with developer
|
2020-09-09 12:31:36 +02:00 |
|
Dhanya Thattil
|
70386633f6
|
Merge pull request #168 from slsdetectorgroup/serverargs
Server arguments
|
2020-09-09 12:29:44 +02:00 |
|
|
|
6c8443f09e
|
binaries in
|
2020-09-09 12:14:38 +02:00 |
|
Erik Frojdh
|
bf52ec10da
|
help printed neutral
|
2020-09-09 11:06:47 +02:00 |
|
|
|
bdac4d133e
|
conflict solved and merged with developer
|
2020-09-09 10:27:14 +02:00 |
|
Dhanya Thattil
|
e8156d412e
|
G2: continuous internal mode (#167)
|
2020-09-09 10:13:15 +02:00 |
|
|
|
97687f0f6d
|
binary in
|
2020-09-08 17:33:06 +02:00 |
|
|
|
bfbfe204f4
|
m3: default clocks changed
|
2020-09-08 17:31:44 +02:00 |
|
|
|
67d57eb5cd
|
Merge branch 'updatemode' into m3trigger
|
2020-09-08 16:55:07 +02:00 |
|
|
|
f940c09290
|
Merge branch 'rmMoenchAPI' into updatemode
|
2020-09-08 16:54:44 +02:00 |
|
|
|
30293b1d36
|
Merge branch 'm3parallel' into rmMoenchAPI
|
2020-09-08 16:54:13 +02:00 |
|
|
|
8e09b50c5e
|
python and gui fix for parallel, gui: clkdivider also for jungfrau and parallel also for m3
|
2020-09-08 16:53:42 +02:00 |
|
|
|
87bad38f80
|
binary in
|
2020-09-08 15:46:32 +02:00 |
|
|
|
67f1f9924a
|
m3:software trigger
|
2020-09-08 15:45:35 +02:00 |
|
|
|
e1e04ee755
|
binaries in
|
2020-09-08 15:18:07 +02:00 |
|
|
|
6e06d4307d
|
WIP
|
2020-09-08 15:10:57 +02:00 |
|
|
|
20a959bf61
|
update mode to skip firmware checks and setupDetector, kernel check added to m3and g2
|
2020-09-08 15:08:45 +02:00 |
|
|
|
8e49a114db
|
moench: removed api that goes only to processor (future: one has to use rX_jsonaddheader or rx_jsonpara to set key and values)
|
2020-09-08 12:34:56 +02:00 |
|
|
|
aecde086a0
|
binaries in
|
2020-09-08 12:16:41 +02:00 |
|
|
|
311cebcd00
|
m3:added parallel mode
|
2020-09-08 12:16:02 +02:00 |
|
|
|
8496f5715f
|
binaries in
|
2020-09-08 11:55:17 +02:00 |
|
|
|
f26d8e514b
|
merged with g2continuous
|
2020-09-08 08:46:37 +02:00 |
|
|
|
0b9ff70244
|
binaries in
|
2020-09-08 08:25:24 +02:00 |
|
|
|
e82e531fb1
|
server arguments like linux
|
2020-09-08 08:18:48 +02:00 |
|
|
|
503f83e8e3
|
Merge branch 'developer' into g2continuous
|
2020-09-07 17:07:09 +02:00 |
|
Erik Frojdh
|
1a90c58d9e
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-09-07 16:52:07 +02:00 |
|
Erik Frojdh
|
c467bd677e
|
missing file
|
2020-09-07 16:52:03 +02:00 |
|
|
|
f280d033b9
|
binarie sin
|
2020-09-07 16:44:48 +02:00 |
|
|
|
c9cf845c9a
|
WIP
|
2020-09-07 16:44:26 +02:00 |
|
Dhanya Thattil
|
63bbbfb438
|
Merge pull request #166 from slsdetectorgroup/rxrmetadata
Rxrmetadata
|
2020-09-07 16:37:55 +02:00 |
|
|
|
5540f16116
|
Merge branch 'developer' into g2continuous
|
2020-09-07 16:36:42 +02:00 |
|
|
|
a77833b4c7
|
Merge branch 'developer' into g2continuous
|
2020-09-07 16:36:00 +02:00 |
|
Erik Frojdh
|
9ee67f2cfa
|
python rx_jsonpara
|
2020-09-07 16:23:28 +02:00 |
|
|
|
cf3758f155
|
Merge branch 'developer' into rxrmetadata
|
2020-09-07 16:15:56 +02:00 |
|
|
|
b20720686e
|
gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode
|
2020-09-07 16:13:33 +02:00 |
|
Dhanya Thattil
|
1edb1e8816
|
GUI: adding 1D detectors by default in x direction, others in y dir (#164)
|
2020-09-07 13:03:15 +02:00 |
|
|
|
30e06c6386
|
Merge branch 'developer' into rxrmetadata
|
2020-09-07 11:53:41 +02:00 |
|
