92 Commits

Author SHA1 Message Date
152186ee59 updated gotthard server binaries 2019-01-03 14:14:17 +01:00
3a51d107bd gotthard server bug fix: switching between roi and no roi has complex fnum reengineering as fnum and pnum doesnt exist for gotthard, sol at the moment: send an image when configuremac, identify first packet if first two channels is 0xcacacaca, ifthe fnum is odd, then increment. Looking at this only at first image in an acquisition, also reduces roi time by configuring mac only when setting roi, not when getting 2018-12-04 12:09:46 +01:00
f9b95b63eb gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all 2018-09-27 18:20:03 +02:00
4aa0d26f26 gotthard server: trying to resolve roi problem that is only affected by latest firmware 2018-09-21 17:29:43 +02:00
961489edb1 bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware 2018-09-18 18:02:01 +02:00
6213b5e07a gotthard server and slsDetectorSoftware: more accuracy when converting from double to int64_t by adding 0.5, improved clock precision of gotthard from 32.1 to 32.007729 2018-07-26 13:46:41 +02:00
bdf9373e0d gotthard and jungfrau servers do not need to send whole module for sending settings anymore 2018-05-22 14:52:53 +02:00
74f327a959 gotthard server: red in stopping server for debugging 2018-02-26 17:34:35 +01:00
de3bfd85a1 fixed gothard not taking initial images after configuring MAC of detector. 2018-02-26 17:07:12 +01:00
4338217bda jungfrau 25um server, added start acq delay to server config file 2018-02-08 15:16:23 +01:00
f7bf1ae2f1 gotthard server simplified trigger, remove synchronization and master for 50um, changed measurement time, fixed compiler bugs 2018-02-08 11:40:35 +01:00
Dhanya Maliakal
d24ab31d87 gotthard fix 2017-11-09 13:44:38 +01:00
Dhanya Maliakal
f4b01bc18b rst to sw1 for all 2017-08-16 16:03:57 +02:00
Dhanya Maliakal
41288302f4 fixed resolution for exptime, period and delay in server 2017-08-04 14:01:17 +02:00
Dhanya Maliakal
039092f292 bug fix: changes for the multipurpose reg in configuremac 2017-08-04 11:21:32 +02:00
Dhanya Maliakal
fbee70818a 25 um server using a config.txt file 2017-08-03 14:16:18 +02:00
Dhanya Maliakal
931a5840e8 changes to gotthard server to include write adc, and also changes to fix the dma=dma+1 2017-07-11 10:54:21 +02:00
Dhanya Maliakal
48f853aa1a fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets) 2017-06-20 12:38:59 +02:00
Dhanya Maliakal
0ea9cc34b0 changed gotthard dynamic gain value and fixed bug of writing settings enum with more offset to not mixup with conf gain value in firmware 2015-10-23 10:57:45 +02:00
Maliakal Dhanya
8788a060dd creating a separate receiver 2014-05-21 09:44:35 +02:00
l_maliakal_d
eba9bcf9ac gotthard server fix: problem for new board due to component version change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@675 951219d9-93cf-4727-9268-0efd64621fa3
2013-10-02 14:20:44 +00:00
l_maliakal_d
679a7dfd7e a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@529 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 12:07:10 +00:00
l_maliakal_d
a7bc91da1d a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@525 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:56:43 +00:00
l_maliakal_d
507debd7f4 a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@522 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:29:43 +00:00
l_maliakal_d
bc61fd4883 included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@463 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:53:07 +00:00
l_cartier
6adeca51ed gotthardServer: added pedestal substraction function (not yet working properly).
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@462 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-15 17:13:26 +00:00
l_maliakal_d
51a008784b first time detector starts, chip of interest was not configured at all and this was never configured if via blackfin, fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@461 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-12 13:59:26 +00:00
l_maliakal_d
4a4efda69f added calibrate pedestal for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@456 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 10:45:41 +00:00
l_maliakal_d
22bd638f64 the gotthard receiver works for short frames, gui commented out for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 16:41:36 +00:00
l_maliakal_d
2176620ca4 server should be up to date
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@442 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 14:33:03 +00:00
l_maliakal_d
3be74327f3 fixed clean fifo roi_flag error(being set after cleanfifo called)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@433 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 10:23:53 +00:00
l_maliakal_d
4fca3d302a cleaned up a bit of gotthard detector server side
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@430 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 10:39:38 +00:00
l_maliakal_d
fc2e1cedee probes was screwing up gotthard data, changed in places to be only for data
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@429 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 10:16:44 +00:00
l_maliakal_d
5d88f249a4 localhost works as a receiver now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@426 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-14 16:40:10 +00:00
l_maliakal_d
42fe126f33 by default readout through blackfin upon server startup
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@422 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:17:41 +00:00
l_maliakal_d
af2d3d87b3 not really a change in the server, but this seems to have worked for cpu transfer after changing vhdl code
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@420 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-10 15:54:45 +00:00
l_maliakal_d
f74ea5191d included detector ip and detector mac defaults in client, which can be specified in config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@374 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-10 13:58:47 +00:00
l_cartier
9d9d00cdc7 added adcprepare in server and updaed TOKEN_RESTART_DELAY and TOKEN_TIMING_REV
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@373 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-10 11:22:37 +00:00
l_maliakal_d
ac2c4211e2 included settting up of udpport from client and getting receiver mac from receiver and also listening to only one ethernet interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@371 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-06 14:27:52 +00:00
l_maliakal_d
452812aaf8 changed cleanfifo and setdaq
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@367 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-05 16:39:35 +00:00
l_maliakal_d
f6ff1359aa implemented server to have a phase shift input
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@341 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 12:31:41 +00:00
l_maliakal_d
33fa69d546 configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@335 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-08 08:21:33 +00:00
l_maliakal_d
2338de4054 added receiver in here
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-30 10:06:58 +00:00
l_maliakal_d
f37cd6640f acquire works with receiver now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@324 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 17:00:53 +00:00
l_maliakal_d
db249237c9 fixed error with cleaning fifo
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@316 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 10:21:09 +00:00
l_maliakal_d
964ff9006f using daq register function in configuremac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@308 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 12:08:20 +00:00
l_maliakal_d
524160422f using daq register function in configuremac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@300 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:27:35 +00:00
l_maliakal_d
f0450fbf5e included DAQ reg editing in configuremac function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@299 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:07:55 +00:00
l_maliakal_d
6cf4fc5e43 editing configuremac to include adc number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@298 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 15:31:46 +00:00
l_maliakal_d
29a540818f configuremac after starting receiver, also telling the server to send packets to receiver or cpu with receiver start and receiver stop
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@290 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-11 12:53:48 +00:00