18fe63f594
wip
2021-06-28 13:32:44 +02:00
137b0cc288
merge from developer
2021-06-21 16:34:42 +02:00
5ca4c7f943
merged from developer
2021-06-21 16:32:36 +02:00
fc6a0d4a26
Wip
2021-06-21 14:08:08 +02:00
9c19fc3272
wip
2021-06-21 13:39:20 +02:00
789d0df81c
wip
2021-06-21 12:31:35 +02:00
bb91375533
wip
2021-06-21 09:37:31 +02:00
665a3be6d8
wip
2021-06-18 19:38:47 +02:00
a8c0049f88
wip
2021-06-18 14:22:01 +02:00
fd2cc856b8
wip
2021-06-18 12:25:14 +02:00
2ae2f84441
wip
2021-06-17 17:39:49 +02:00
028edd0d08
wip
2021-06-17 07:13:27 +02:00
a9f892483d
wip
2021-06-11 17:29:01 +02:00
bdc3a5f3d9
connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger
2021-06-09 17:40:05 +02:00
45992b28a5
merge fix
2021-06-08 12:29:33 +02:00
1e640d90de
refactor minor
2021-06-08 09:47:15 +02:00
0afe093afc
wip
2021-06-04 12:30:59 +02:00
daae52ca63
m3: vthreshold set/get only enabled counters but remember value, vth always overwrite, disable counter sets vth to 2800, enable counter sets saved values
2021-05-27 17:25:55 +02:00
3079e41c3b
all loading pattern so far takes in logDEBUG5 print level as it is at detector start up. commands to call loadpattern can call logINFO level
2021-05-26 12:59:19 +02:00
89898beced
m3:different exception message for vths when counter disabled
2021-05-26 12:23:46 +02:00
d9525e9a92
m3: vthreshold and vthx gives correct exception messages (binaries not in)
2021-05-25 16:46:01 +02:00
9ac836c2f4
setting vthreshold exception message fix when not all counters enabled, appropriate message
2021-05-25 15:03:05 +02:00
224c8d9f8d
m3 server: setting counter mask, set vth[i] for counter[i] and its M_VTH1, not VTH1
2021-05-20 14:51:37 +02:00
Erik Frojdh
be5fee8126
M3: fixed gain bits with negative polarity
2021-04-12 16:44:47 +02:00
Erik Frojdh
779a2a0199
CSR in trim files
2021-04-01 08:09:04 +02:00
Erik Frojdh
01c785271f
WIP
2021-03-31 16:26:36 +02:00
Erik Frojdh
043d582616
initial implementation
2021-03-29 14:21:48 +02:00
Erik Frojdh
7c4f9ee044
read back of csr
2021-03-26 17:46:11 +01:00
63259ec5c8
Modified my3 functions for the pattern generator and moved to separate file; created loadPattern function - but should still be used in readDefaultPattern
2021-02-26 16:53:30 +01:00
Erik Fröjdh
10b315c2bd
Mythen3 improved synchronization ( #231 )
...
Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready
startDetector first starts the slaves then the master
acquire firs calls startDetector for the slaves then acquire on the master
getMaster to read back from hardware which one is master
2021-02-08 13:28:37 +01:00
Dhanya Thattil
f9f50f1d84
M3settings ( #228 )
...
* added temp m3 settings files
* renames settings noise to trim
* get threshold for M3
* some changes to compile on RH7 and in the server to load the default chip status register at startup
* Updated mythen3DeectorServer_developer executable with correct initialization at startup
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
2021-01-14 12:34:13 +01:00
Dhanya Thattil
a62e068a9a
M3defaultpattern ( #227 )
...
* default pattern for m3 and moench including Python bindings
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-12-09 13:28:39 +01:00
8e773c97dd
pattern load and save works
2020-11-27 14:19:38 +01:00
0eb204bfd3
compile for servers too
2020-11-27 12:37:22 +01:00
a12dd153ef
WIP
2020-11-25 15:29:46 +01:00
Dhanya Thattil
e63fa1d7c2
Setting pattern from memory ( #218 )
...
* ToString accepts c-style arrays
* added patternParameters to python
* fixed patwait time bug in validation
* moved load from file function to patterParameters
* server using patternparamters structure to get pattern
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-11-24 20:32:07 +01:00
Erik Frojdh
06dbf82e93
clang-format
2020-11-18 18:01:39 +01:00
e7ecb38b29
gotthard2 bug fix vetophoton server client api
2020-11-17 11:01:17 +01:00
Dhanya Thattil
a6d696a0f8
Nextframenumber ( #215 )
2020-11-16 17:26:12 +01:00
Dhanya Thattil
4c4e2ccb6b
Defaultdacs ( #214 )
2020-11-13 08:31:02 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls ( #212 )
2020-11-02 16:05:28 +01:00
Dhanya Thattil
47018b61cd
M3readout ( #209 )
...
* m3: readout command
2020-10-26 16:13:48 +01:00
5cd89487b6
blackfin fpga programming: if client socket killed or failure while writing to flash, only file pointer closed but fpga not asked to pick up from flash and client exception thrown. If all good and picking up from flash takes more than 10s, it will also throw exception in client. Client exception will prevent a reboot and hence allowing user to try to flash again.
2020-10-16 15:02:45 +02:00
e364fbcf32
m3: changed run clk div to 10, change run clkdiv to 40 while trimming, set default pipeline adif reg
2020-10-09 16:52:24 +02:00
38cc365c01
setting shared mutex attribute for non blackfins
2020-10-07 17:01:16 +02:00
51bfa17c6a
switching to pthread with shared process attribute as sem_init doesnt work for blackfin
2020-10-07 12:25:14 +02:00
c2d9532a69
updated versionign server color minor
2020-10-05 09:56:47 +02:00
af5798f569
wip, doc
2020-09-30 15:28:07 +02:00
Dhanya Thattil
2c1fddee84
Cmddacs ( #189 )
...
Moved dacs to it's own command for command line.
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-09-24 17:16:34 +02:00
Dhanya Thattil
3f19f29c9e
G2ContTrigger ( #188 )
...
* g2: setting #frames to 1 and period to 0 for cont trigger, extra frame reg is set to #frames for cont auto and #trigger for cont trigger
2020-09-24 11:59:11 +02:00
