497 Commits

Author	SHA1	Message	Date
maliakal_d	c2b1eef75c	slsDetectorSoftware: removed warnings, and made compilable via make	2018-07-10 14:58:18 +02:00
maliakal_d	ecd0c810ca	slsDetectorSoftware: Sharedmemory removed private methodf or removeshm, removed static isexisting as the usecases are all member method	2018-07-06 15:18:34 +02:00
maliakal_d	c366e94a96	bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do	2018-07-05 13:47:20 +02:00
maliakal_d	d7cc9fc023	slsDetectorSoftware: moved offsets from multi shm to sls shm, and moved updated offsets and createthreadpool to end of addmultipledetectors, so that it is not done each time per detector	2018-06-29 12:21:15 +02:00
maliakal_d	11de3dfde2	slsDetectorSoftware: trimen in multi does not check for each value in slsdet, fixed	2018-06-28 18:06:53 +02:00
maliakal_d	f6660c0dac	slsDetectorSoftware: updated shared memory to have _sls_ instead of _single_, and updated versions	2018-06-28 10:37:46 +02:00
maliakal_d	73ac8bab38	commenting out printout	2018-06-28 08:58:34 +02:00
maliakal_d	3114512c3f	sharedmem: sls_detector_acquire multi and sls index scaning, error message when trying to acquire from a differet multi shm id, updateoffset and create threadpool after adding slsdetectors	2018-06-27 17:20:05 +02:00
maliakal_d	95254619c6	sharedmem: config, sethostname call freesharedmemory and call setupmulti, freesharedmemoy(nonstatic) also cleans up member variables to make it consistent with shm, sharedmemory pointer set to 0 in non static free shared memory to be able to continue within application, sethostname frees memory only if detectors found in shm, add calls addmultipledetectors, replace replaces a detector in sls detector level, should also take lines in config file that has comments in between while ignoring the comments, sethostname in slsdetector also updates client, adding object in sls when creating new shm complains if shm existed and must delete again, removed remove commands	2018-06-27 15:38:03 +02:00
maliakal_d	a0016cb005	sharedmem: working, need to add replace	2018-06-27 10:05:05 +02:00
maliakal_d	0b140111b3	sharedmem: more modifications on command line to remove features such as id, remove, add	2018-06-26 12:10:50 +02:00
maliakal_d	d7831f6c64	sharedmem: command line refactor, fixing to do	2018-06-25 19:18:00 +02:00
maliakal_d	a97b725f43	sharedmem: command line done, fixing to do	2018-06-25 19:14:41 +02:00
maliakal_d	69c71e48f6	sharedmem: updated slsdetector, changes left	2018-06-25 18:19:19 +02:00
maliakal_d	5e9871720b	sharedmem: slsdetector being modified intensively	2018-06-21 18:26:50 +02:00
maliakal_d	55517e6d4c	sharedmem: done with multi .h, sls and command line left	2018-06-20 17:12:48 +02:00
maliakal_d	2853f97fe7	sharedmem: done with multi, sls and command line left to do	2018-06-20 14:06:10 +02:00
maliakal_d	fc0f8ef9da	more changes for multi for shared mem	2018-06-19 16:38:18 +02:00
maliakal_d	99bf6446fe	shared mem in the middle of modifying multi	2018-06-18 17:51:30 +02:00
maliakal_d	2eecf43fbb	multi sharedmemory, basic done, left to go thru whole file, and slsDetector left to do	2018-06-12 18:00:26 +02:00
maliakal_d	b294b3e8b1	in progress with integratign new shm in multi	2018-06-12 12:14:55 +02:00
Erik Frojdh	378392c0f5	fixed return storage cell	2018-05-29 18:10:36 +02:00
Erik Frojdh	fcde40b854	minor	2018-05-29 17:26:27 +02:00
Erik Frojdh	ceed0eaa9b	generic call for hostname and sgetDetectorsType	2018-05-29 16:59:55 +02:00
Erik Frojdh	e3088d822f	removed commented section	2018-05-29 16:09:09 +02:00
Erik Frojdh	27ebd9c713	applying callDetectorMember in getTimerLeft	2018-05-29 16:08:08 +02:00
Erik Frojdh	6cf7bf2e06	using callDetectorMember for portType	2018-05-29 15:51:55 +02:00
Erik Frojdh	fc7ae98eee	using parallel call for checkCompatibility	2018-05-29 15:45:13 +02:00
maliakal_d	15aaa93130	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2018-05-28 19:17:37 +02:00
maliakal_d	cf8b0de433	slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up	2018-05-28 19:11:34 +02:00
Erik Frojdh	32c1a45e11	minor	2018-05-28 18:46:08 +02:00
Erik Frojdh	da1b6ad62d	more generalization in multi	2018-05-28 17:12:19 +02:00
Erik Frojdh	49d6dcb6e2	templated functions in multi	2018-05-28 13:23:30 +02:00
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