1941 Commits

Author	SHA1	Message	Date
Erik Frojdh	9d3fdaaadc	minor clean	2018-05-28 12:22:25 +02:00
Erik Frojdh	06f84585af	compareRetrun.. to minusOneIf..	2018-05-28 11:55:11 +02:00
Erik Frojdh	4765849613	minor	2018-05-25 17:09:23 +02:00
Erik Frojdh	05ed8dca4e	more cleanup	2018-05-25 17:02:01 +02:00
Erik Frojdh	4f600f3129	even more	2018-05-25 16:32:40 +02:00
Erik Frojdh	4b72d685f3	migrating more multiSlsDetector calls to the generic function	2018-05-25 15:39:28 +02:00
Erik Frojdh	bbd7e7906a	replacing pulsechip with a generic algorithm	2018-05-25 15:10:57 +02:00
Erik Frojdh	f735baf9d7	more cleaning	2018-05-25 12:21:36 +02:00
Erik Frojdh	ad14381ab4	replacing ReceiverReadTimer, Frequency calibratePedestal	2018-05-25 11:44:39 +02:00
Erik Frojdh	7702865409	replacing slsDetectorMember calls with generic function	2018-05-25 11:38:59 +02:00
Erik Frojdh	2f8c1b453e	renaming generic call	2018-05-25 11:06:33 +02:00
Erik Frojdh	883317dd28	replaced logic in getSettingsFile	2018-05-25 10:46:36 +02:00
Erik Frojdh	8ed67119b9	replacing logic in getLastClientIP and getReceiverLastClientIP with generic function	2018-05-25 10:39:34 +02:00
Erik Frojdh	f45e2b4ab9	changed type of getCalDir to std::string	2018-05-25 10:30:02 +02:00
Erik Frojdh	228d624d8f	general function for returning first or concatenated string	2018-05-25 10:01:51 +02:00
Erik Frojdh	e0c9805ee8	clang-format on multiDetector	2018-05-25 08:23:59 +02:00
Erik Frojdh	4eef81fbe9	clean up of multiSlsDetector::getSettingsDir	2018-05-24 18:14:02 +02:00
Erik Frojdh	301600e720	chaning return type of getSettingsDir and setSettingsDir to std::string	2018-05-24 17:47:12 +02:00
Erik Frojdh	e65b416215	cleaning up sgetDetectorsType	2018-05-24 16:32:20 +02:00
Erik Frojdh	24df69d57f	cleaning up getHostname	2018-05-24 16:21:48 +02:00
Erik Frojdh	183c306166	modify string name in multi checkOnline	2018-05-24 16:03:17 +02:00
Erik Frojdh	1dfdcfcb7e	finished removing using namespace std	2018-05-24 15:24:01 +02:00
Erik Frojdh	212218396a	removal of using namespace std from theadFiles	2018-05-24 14:47:45 +02:00
Erik Frojdh	b78b8425fd	ifstream and ofstream to std::	2018-05-24 14:27:01 +02:00
Erik Frojdh	12832a3a96	adding more std:: in slsDetectorActions.h	2018-05-24 14:24:10 +02:00
Erik Frojdh	621b7cfb2a	adding std:: where needed	2018-05-24 14:11:30 +02:00
Erik Frojdh	a67d9e60da	removing more using namespace std	2018-05-24 13:47:48 +02:00
Erik Frojdh	d71008bd10	removing using namespace std from headers in slsDetector	2018-05-24 12:18:25 +02:00
Dhanya Thattil	a154d0a088	slsDetectorUsers: added setthreshold without trimbits for eiger	2018-05-23 16:39:52 +02:00
Dhanya Thattil	c5262458d5	eiger and jungfrau server, updated virtual versions with start and stop acquisition	2018-05-23 15:28:39 +02:00
Dhanya Thattil	cb635d800a	eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode	2018-05-22 18:43:13 +02:00
Dhanya Thattil	bdf9373e0d	gotthard and jungfrau servers do not need to send whole module for sending settings anymore	2018-05-22 14:52:53 +02:00
Dhanya Thattil	e19a27bf62	eiger server: bug fix for saving trimbits to file, was copying from destination to source in server	2018-05-22 10:59:04 +02:00
Dhanya Thattil	8b39443197	slsReciever, slsDetector: configurable number of images per file, removed all the receiver threads from using generalData->maxframesperfile, yet to do: infinite images, bug fix, virtual hdf5 has -1 for all pixels in last image	2018-05-18 13:47:10 +02:00
Dhanya Thattil	b4d9a6a09d	slsReceiver, slsDetector(eiger server), client: added sub period to receiver, fixed eiger subperiod updates to client, added subperiod and subexptime to users, fixed hdf5 warnings	2018-05-17 12:34:18 +02:00
Dhanya Thattil	51fd9ed423	added subperiod in command line	2018-05-16 09:13:43 +02:00
Dhanya Thattil	23d73ae5ae	jungfrau server: programming allowed only in -update or -dev mode, -dev strictly for Carlos, in update mode one can only do programming	2018-05-11 13:42:46 +02:00
Dhanya Thattil	8986b008dd	jungfrau server: programfpga: handling bus error, and printing a message for user to restart servers when done in client command line	2018-05-09 15:57:18 +02:00
Dhanya Thattil	30f1e6ad3f	eiger and jungfrau server, updated binaries	2018-05-09 15:28:34 +02:00
Dhanya Thattil	02cc284422	added binaries	2018-05-09 15:27:28 +02:00
Dhanya Thattil	e6c0304af1	jungfrau server: programfpga: stop server also mapped during a reset, binaries added	2018-05-09 15:16:04 +02:00
Dhanya Thattil	16fe4d305e	Merge branch 'progfpga' into esrfchanges	2018-05-09 11:21:07 +02:00
Dhanya Thattil	68e9648854	created programming mode, where only programming is allowed, one has to restart servers afterwards	2018-05-09 11:20:54 +02:00
Dhanya Thattil	6653cc9cb1	slsDetectorSoftware: jungfrau program fpga: mkstemp being used instead of creating file at source location	2018-05-03 11:22:02 +02:00
Dhanya Thattil	a37bbc50fe	updated server binaries	2018-05-02 17:48:46 +02:00
Dhanya Thattil	5b01b4cbd8	Merge branch 'developer' into esrfchanges	2018-05-02 16:57:03 +02:00
Dhanya Thattil	d3a0319863	esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails	2018-05-02 16:49:27 +02:00
Dhanya Thattil	fdd19bc316	slsReceiver: udp socket buffer size, additional prints	2018-05-01 12:01:33 +02:00
Dhanya Thattil	1152555663	esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size	2018-05-01 11:55:48 +02:00
Carlos Lopez	516336963e	[CTB] - Modified memory map address shift for the interface between FPGA and Blackfin SOM. Shift has to be set to 1 since the basic AMC data transfers is 8-bit and not 16-bit.	2018-04-27 15:11:37 +02:00