Commit Graph

  • fc7ae98eee using parallel call for checkCompatibility Erik Frojdh 2018-05-29 15:45:13 +02:00
  • 542dda8ece slsReceiver: deactivated no longer writes 0xFFFF, creates empty files Dhanya Thattil 2018-05-29 14:32:14 +02:00
  • 0f6cb4dc41 Merge branch 'developer' into gotthardversioning Dhanya Thattil 2018-05-29 12:14:59 +02:00
  • ecc970bc73 gotthard server: check client api version done Dhanya Thattil 2018-05-29 12:14:46 +02:00
  • 15aaa93130 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2018-05-28 19:17:37 +02:00
  • 34b659fa15 first draft of gotthard versioning Dhanya Thattil 2018-05-28 19:17:06 +02:00
  • cf8b0de433 slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up Dhanya Thattil 2018-05-28 19:11:34 +02:00
  • 32c1a45e11 minor Erik Frojdh 2018-05-28 18:46:08 +02:00
  • da1b6ad62d more generalization in multi Erik Frojdh 2018-05-28 17:12:19 +02:00
  • 49d6dcb6e2 templated functions in multi Erik Frojdh 2018-05-28 13:23:30 +02:00
  • 22ef1cee8b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2018-05-28 12:22:35 +02:00
  • 9d3fdaaadc minor clean Erik Frojdh 2018-05-28 12:22:25 +02:00
  • 06f84585af compareRetrun.. to minusOneIf.. Erik Frojdh 2018-05-28 11:55:11 +02:00
  • a970bacbe5 slsDetectorGui: JCTB does not kill itself for wrong settings anymore Dhanya Thattil 2018-05-28 11:29:35 +02:00
  • 5be2979fff slsReceiver: fix to default number of frames per file, also set to 10k Dhanya Thattil 2018-05-28 11:18:13 +02:00
  • 4765849613 minor Erik Frojdh 2018-05-25 17:09:23 +02:00
  • 05ed8dca4e more cleanup Erik Frojdh 2018-05-25 17:02:01 +02:00
  • 4f600f3129 even more Erik Frojdh 2018-05-25 16:32:40 +02:00
  • 4b72d685f3 migrating more multiSlsDetector calls to the generic function Erik Frojdh 2018-05-25 15:39:28 +02:00
  • bbd7e7906a replacing pulsechip with a generic algorithm Erik Frojdh 2018-05-25 15:10:57 +02:00
  • f735baf9d7 more cleaning Erik Frojdh 2018-05-25 12:21:36 +02:00
  • ad14381ab4 replacing ReceiverReadTimer, Frequency calibratePedestal Erik Frojdh 2018-05-25 11:44:39 +02:00
  • 7702865409 replacing slsDetectorMember calls with generic function Erik Frojdh 2018-05-25 11:38:59 +02:00
  • 2f8c1b453e renaming generic call Erik Frojdh 2018-05-25 11:06:33 +02:00
  • 883317dd28 replaced logic in getSettingsFile Erik Frojdh 2018-05-25 10:46:36 +02:00
  • 8ed67119b9 replacing logic in getLastClientIP and getReceiverLastClientIP with generic function Erik Frojdh 2018-05-25 10:39:34 +02:00
  • f45e2b4ab9 changed type of getCalDir to std::string Erik Frojdh 2018-05-25 10:30:02 +02:00
  • abdf4b1ada converting to Qstring Erik Frojdh 2018-05-25 10:19:09 +02:00
  • 228d624d8f general function for returning first or concatenated string Erik Frojdh 2018-05-25 10:01:51 +02:00
  • e0c9805ee8 clang-format on multiDetector Erik Frojdh 2018-05-25 08:23:59 +02:00
  • 4eef81fbe9 clean up of multiSlsDetector::getSettingsDir Erik Frojdh 2018-05-24 18:14:02 +02:00
  • 301600e720 chaning return type of getSettingsDir and setSettingsDir to std::string Erik Frojdh 2018-05-24 17:47:12 +02:00
  • 4d4e4a4ce7 first draft of versioning of client Dhanya Thattil 2018-05-24 16:58:07 +02:00
  • ad3ac2cdee Merge branch 'developer' into versioning Dhanya Thattil 2018-05-24 16:56:39 +02:00
  • b10abd07ee first draft of api versioning with client Dhanya Thattil 2018-05-24 16:51:21 +02:00
  • e65b416215 cleaning up sgetDetectorsType Erik Frojdh 2018-05-24 16:32:20 +02:00
  • 24df69d57f cleaning up getHostname Erik Frojdh 2018-05-24 16:21:48 +02:00
  • 183c306166 modify string name in multi checkOnline Erik Frojdh 2018-05-24 16:03:17 +02:00
  • 1dfdcfcb7e finished removing using namespace std Erik Frojdh 2018-05-24 15:24:01 +02:00
  • 212218396a removal of using namespace std from theadFiles Erik Frojdh 2018-05-24 14:47:45 +02:00
  • b78b8425fd ifstream and ofstream to std:: Erik Frojdh 2018-05-24 14:27:01 +02:00
  • 12832a3a96 adding more std:: in slsDetectorActions.h Erik Frojdh 2018-05-24 14:24:10 +02:00
  • 621b7cfb2a adding std:: where needed Erik Frojdh 2018-05-24 14:11:30 +02:00
  • a67d9e60da removing more using namespace std Erik Frojdh 2018-05-24 13:47:48 +02:00
  • d71008bd10 removing using namespace std from headers in slsDetector Erik Frojdh 2018-05-24 12:18:25 +02:00
  • a154d0a088 slsDetectorUsers: added setthreshold without trimbits for eiger Dhanya Thattil 2018-05-23 16:39:52 +02:00
  • c5262458d5 eiger and jungfrau server, updated virtual versions with start and stop acquisition Dhanya Thattil 2018-05-23 15:28:39 +02:00
  • 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 Dhanya Thattil 2018-05-22 18:43:13 +02:00
  • 0ed82d4ef7 settingsdir for gotthard, jungfrau, propix, moench deleted, as these are default values in server Dhanya Thattil 2018-05-22 15:13:26 +02:00
  • bdf9373e0d gotthard and jungfrau servers do not need to send whole module for sending settings anymore Dhanya Thattil 2018-05-22 14:52:53 +02:00
  • 3f61206289 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2018-05-22 10:59:20 +02:00
  • e19a27bf62 eiger server: bug fix for saving trimbits to file, was copying from destination to source in server Dhanya Thattil 2018-05-22 10:59:04 +02:00
  • a1831c38ed replace lostFocus with editingFinished for QT Erik Frojdh 2018-05-18 17:05:35 +02:00
  • c4b8c6385f Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2018-05-18 16:36:29 +02:00
  • f393751771 r_framesperfile configurable to have infinite frames in file with option 0 Dhanya Thattil 2018-05-18 16:35:50 +02:00
  • 94ce042401 slsReceiver, fixed virtual hdf5 last row random values bug Dhanya Thattil 2018-05-18 14:51:18 +02:00
  • 49b8024c43 added logger.h to publig headers Erik Frojdh 2018-05-18 14:15:17 +02:00
  • 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 Dhanya Thattil 2018-05-18 13:47:10 +02:00
  • dcce66ee9f slsReceiver: debug, insignificant Dhanya Thattil 2018-05-17 15:57:16 +02:00
  • 563b1bb8b7 slsDetectorGui:added subexptime and subperiod to gui Dhanya Thattil 2018-05-17 15:34:35 +02:00
  • 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 Dhanya Thattil 2018-05-17 12:34:18 +02:00
  • 51fd9ed423 added subperiod in command line Dhanya Thattil 2018-05-16 09:13:43 +02:00
  • 23d73ae5ae jungfrau server: programming allowed only in -update or -dev mode, -dev strictly for Carlos, in update mode one can only do programming Dhanya Thattil 2018-05-11 13:42:46 +02:00
  • 8986b008dd jungfrau server: programfpga: handling bus error, and printing a message for user to restart servers when done in client command line Dhanya Thattil 2018-05-09 15:57:18 +02:00
  • 30f1e6ad3f eiger and jungfrau server, updated binaries Dhanya Thattil 2018-05-09 15:28:34 +02:00
  • 02cc284422 added binaries Dhanya Thattil 2018-05-09 15:27:28 +02:00
  • e6c0304af1 jungfrau server: programfpga: stop server also mapped during a reset, binaries added Dhanya Thattil 2018-05-09 15:16:04 +02:00
  • 16fe4d305e Merge branch 'progfpga' into esrfchanges Dhanya Thattil 2018-05-09 11:21:07 +02:00
  • 68e9648854 created programming mode, where only programming is allowed, one has to restart servers afterwards Dhanya Thattil 2018-05-09 11:20:54 +02:00
  • 0417a7e97d fixing warnings Dhanya Thattil 2018-05-07 10:44:00 +02:00
  • 6653cc9cb1 slsDetectorSoftware: jungfrau program fpga: mkstemp being used instead of creating file at source location Dhanya Thattil 2018-05-03 11:22:02 +02:00
  • a37bbc50fe updated server binaries Dhanya Thattil 2018-05-02 17:48:46 +02:00
  • 5b01b4cbd8 Merge branch 'developer' into esrfchanges Dhanya Thattil 2018-05-02 16:57:03 +02:00
  • d3a0319863 esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails Dhanya Thattil 2018-05-02 16:49:27 +02:00
  • fdd19bc316 slsReceiver: udp socket buffer size, additional prints Dhanya Thattil 2018-05-01 12:01:33 +02:00
  • 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 Dhanya Thattil 2018-05-01 11:55:48 +02:00
  • 9ae1289616 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Anna Bergamaschi 2018-04-27 15:14:19 +02:00
  • 3baa677a2e minor changes by Anna Anna Bergamaschi 2018-04-27 15:14:09 +02:00
  • 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. Carlos Lopez 2018-04-27 15:11:37 +02:00
  • 99281e2690 esrf changes: previous commit compile Dhanya Thattil 2018-04-26 16:43:07 +02:00
  • 501d2478a5 Merge branch 'jungfraunew' into esrfchanges Dhanya Thattil 2018-04-26 16:37:33 +02:00
  • 08b6eb78c5 gui: always mask out gain bit for jungfrau, even if missing packet Dhanya Thattil 2018-04-26 16:32:03 +02:00
  • d096a5efeb jungfrau server: default storage cell start is 0xf Dhanya Thattil 2018-04-26 16:30:27 +02:00
  • 9f24bb0a98 jungfrauserver: bug fix: settings read correctly, forceswitchg2 mainly Dhanya Thattil 2018-04-26 15:49:09 +02:00
  • 173d8f740e esrf changes: slsReceiver: better checking of socket buffer pars. and warn on failures * not done. The 'setsockopt(SO_RECVBUF)' system call cannot set the socket buffer size lager than the specified in net.core.rmem_max. The requested value was 2 GB (commit 3b0e2e6), which is far too large for this application, so it was restored to the acceptable 100 MB value. Dhanya Thattil 2018-04-26 15:22:44 +02:00
  • 16428f3828 esrf changes: CMake: support to be added and installed as a sub-project: * Configure zmq as global imported library in slsReceiverSoftware * Install zmq, necessary if linking to slsReceiver library Dhanya Thattil 2018-04-25 18:24:08 +02:00
  • 1247f760f2 virtual hdf file mapping fix for fnum-1 images Dhanya Thattil 2018-04-25 17:39:09 +02:00
  • 11475316fd eiger binary updated Dhanya Thattil 2018-04-25 17:11:52 +02:00
  • a09c2e38a3 storage cell fix in gui for non jungfrau detectors Dhanya Thattil 2018-04-25 17:03:25 +02:00
  • 1c49fbb090 virtual hdf file mapping fnum-1 images, fixed Dhanya Thattil 2018-04-25 16:52:14 +02:00
  • b5909044f6 slsReceiver: remove static members in Listener, DataProcessing and DataStreamer: * Needed when more than one receiver is created by process * Replace NumberofXxxx by explicit index in constructor * Remove Error[Mask], use return value in constructor signature * Replace RunningMask by individual Running flags * Remove obsolete Mutex objects Dhanya Thattil 2018-04-25 09:24:39 +02:00
  • 62a88dadba Merge branch 'jungfraunew' of github.com:slsdetectorgroup/slsDetectorPackage into esrfchanges Dhanya Thattil 2018-04-23 17:45:12 +02:00
  • e0bb7d74f4 esrf changes: eiver: initialise global optind variable before calling getopt_long: Needed when multiple receivers are instantiated in the same process Dhanya Thattil 2018-04-23 17:43:54 +02:00
  • d09a1a0a95 esrf changes: users class added API functionality getNMods Dhanya Thattil 2018-04-23 17:38:40 +02:00
  • d38108e527 esrf changes: slsReceiver: extend CircularFifo to support blocking/non-blocking transfers: * Add blocking push (for performance) and non-blocking pop (for symmetry), default to blocking operations * Fix memory fault if Fifo allocation fails * Fix fifoFree initialisation to fifoSize elements (was fifoSize - 1) Dhanya Thattil 2018-04-23 17:32:40 +02:00
  • c9675d111a jungfrau server: fixed the settings for gain2 stages Dhanya Thattil 2018-04-23 16:11:04 +02:00
  • 8f9c657fa0 esrf remove changes: VRS to interpolate, not copy Dhanya Thattil 2018-04-23 14:41:01 +02:00
  • c35203ebfb fixed gitinfo Anna Bergamaschi 2018-04-23 14:19:55 +02:00
  • 1069bf5979 esrf changes: slsDetector: fix setThresholdEnergy and slsDetectorAnalysis file read: * slsDetector: Proper cleanup and return when no interpolation is possible * slsDetectorAnalysis: treat CAL DAC as irrelevant when interpolating settings for two energies(do not abort if different), also including VRS in copying Dhanya Thattil 2018-04-23 13:31:05 +02:00
  • cac913831c esrf change: CMake: add support for GCC versions older than 6.1 Dhanya Thattil 2018-04-23 12:07:13 +02:00