Commit Graph

  • aae4e3f993 removed unnessary printout Dhanya Maliakal 2017-03-20 11:22:35 +01:00
  • 911ff49238 changes for merges from 2.3 incl standard packet header Dhanya Maliakal 2017-03-20 11:22:07 +01:00
  • 6731c39ce2 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer Dhanya Maliakal 2017-03-20 10:48:54 +01:00
  • 81eade8ede Merge branch '2.3' into developer Dhanya Maliakal 2017-03-20 10:48:38 +01:00
  • 78958c7699 updaterev Dhanya Maliakal 2017-03-20 09:30:15 +01:00
  • 575c9617c7 fixed gui for new header Dhanya Maliakal 2017-03-20 09:28:15 +01:00
  • 1ab80b0517 updaterev Dhanya Maliakal 2017-03-20 09:28:02 +01:00
  • 4b388f56b2 fixed gui for new header Dhanya Maliakal 2017-03-20 09:27:38 +01:00
  • fb91ba25f3 uncomment gui. insignificant Dhanya Maliakal 2017-03-20 09:26:13 +01:00
  • 4d5506a0a8 manual Gemma Tinti 2017-03-15 15:52:19 +01:00
  • 1413244617 update rev Dhanya Maliakal 2017-03-15 15:02:28 +01:00
  • dc77b07c92 update rev Dhanya Maliakal 2017-03-15 15:02:22 +01:00
  • 9f68fc6f3b fixed call backs with new standard header Dhanya Maliakal 2017-03-15 15:00:25 +01:00
  • 47a769e677 modified users receiver to have all objects defined in one Dhanya Maliakal 2017-03-15 15:00:01 +01:00
  • ecaa8e45a4 some changes to the command help Dhanya Maliakal 2017-03-15 14:52:19 +01:00
  • 36e92c194d changes for callback to work Dhanya Maliakal 2017-03-14 08:23:47 +01:00
  • 4a8f2b5a69 Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 2.3-rc Dhanya Maliakal 2017-03-14 08:22:29 +01:00
  • 22e0332833 changes to callback Dhanya Maliakal 2017-03-14 08:21:27 +01:00
  • 53be854efd including subframe number Dhanya Maliakal 2017-03-13 11:33:06 +01:00
  • 0a1aaec708 resolved the recovering from receiver start error , but still does not acknowledge error in gui Dhanya Maliakal 2017-03-10 13:24:00 +01:00
  • cad8ffc0c6 resolved the recovering from receiver start error , but still does not acknowledge error in gui Dhanya Maliakal 2017-03-10 13:07:33 +01:00
  • 8ebbfbb84b incl. prev commit: Included file overwrite, format and changed the functonality of filewrite enable and file path Dhanya Maliakal 2017-03-10 12:21:19 +01:00
  • 2ef44ec70b somewhere Dhanya Maliakal 2017-03-10 10:51:47 +01:00
  • 978b54dff9 somewhere Dhanya Maliakal 2017-03-10 10:51:37 +01:00
  • 300b014f73 somewhere Dhanya Maliakal 2017-03-10 10:51:28 +01:00
  • 1e94ec0c6a fixed short gotthard Dhanya Maliakal 2017-03-09 13:28:03 +01:00
  • 86018684c9 made it work for gotthard Dhanya Maliakal 2017-03-09 11:40:48 +01:00
  • 300bf85dae uncommented extra comments Dhanya Maliakal 2017-03-09 11:40:26 +01:00
  • 1cbbf9409f manual Gemma Tinti 2017-03-09 09:23:57 +01:00
  • 0ff79b7d5a manual Gemma Tinti 2017-03-09 09:21:50 +01:00
  • 0dccd78567 not yet gotthard Dhanya Maliakal 2017-03-08 14:37:00 +01:00
  • 0e4c7a9494 adjusted for jungfrau Dhanya Maliakal 2017-03-07 14:59:38 +01:00
  • 679e747b5c Merge branch '2.3-rc' into developer Dhanya Maliakal 2017-03-07 07:30:40 +01:00
  • b16757e8d1 adapt eiger noise Gemma Tinti 2017-03-06 12:18:32 +01:00
  • daaf13d99c manual with new calibration scheme Gemma Tinti 2017-03-03 16:45:25 +01:00
  • 6c3165b31a manual with new calibration scheme Gemma Tinti 2017-03-03 16:42:03 +01:00
  • e86e9361b6 removed std:: to make round compile Dhanya Maliakal 2017-03-03 16:00:22 +01:00
  • 50f8366bc2 small changes for jungfrau, but also for the gui Dhanya Maliakal 2017-03-03 15:57:48 +01:00
  • f3bf331b5f solved bug of decoding data with distorted image Dhanya Maliakal 2017-03-03 13:48:47 +01:00
  • 73ec3903bf added data structures for mythen3.01 and adcsar2 for jctb Anna Bergamaschi 2017-03-03 13:10:14 +01:00
  • 85cc0d8184 Merge branch 'developer' into hdf5 Dhanya Maliakal 2017-03-03 10:09:44 +01:00
  • 7e00d9f395 Merge branch 'developer' into hdf5 Dhanya Maliakal 2017-03-03 10:06:34 +01:00
  • bd7f3567f8 Merge branch 'developer' into hdf5 Dhanya Maliakal 2017-03-03 09:33:53 +01:00
  • bd0f72c60e removed std:: in front of round, else compile error Dhanya Maliakal 2017-03-03 09:12:19 +01:00
  • 2505369c08 updaterev Dhanya Maliakal 2017-03-03 09:07:46 +01:00
  • ab4572f544 updaterev Dhanya Maliakal 2017-03-03 09:07:36 +01:00
  • 80fb0a99a8 Merge branch '2.3-rc' into hdf5 Dhanya Maliakal 2017-03-03 09:06:49 +01:00
  • bdff083402 Merge branch '2.3-rc' into hdf5 Dhanya Maliakal 2017-03-03 09:05:40 +01:00
  • 053e05628f callback Dhanya Maliakal 2017-03-03 08:50:55 +01:00
  • d8b0a13ee2 changed to have only one virtual file with bunch id, subfnum and data datasets all linked in master file Dhanya Maliakal 2017-03-03 08:39:53 +01:00
  • 537260879a created virtual datasets for bunchid and subframenumber Dhanya Maliakal 2017-03-02 11:43:11 +01:00
  • a7309be567 created links to virtual files in master file Dhanya Maliakal 2017-03-01 08:44:43 +01:00
  • 829ba49c1c moving subframenumber into a 32 bit number, also in stremer, changing json header to mention 4 bit and version number Dhanya Maliakal 2017-02-28 15:30:53 +01:00
  • fa6d18e9b2 moving subframenumber into a 32 bit number Dhanya Maliakal 2017-02-28 15:29:53 +01:00
  • fd42fad045 Added sebastians python script for interpolation - final debug version Anna Bergamaschi 2017-02-28 15:13:58 +01:00
  • 447c5bb8fe gui works Dhanya Maliakal 2017-02-28 13:42:56 +01:00
  • 475f0692a0 Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 2.3-rc Dhanya Maliakal 2017-02-28 13:42:16 +01:00
  • 2024eb5d6e gui works Dhanya Maliakal 2017-02-28 13:14:18 +01:00
  • cf8b53adff gui works Dhanya Maliakal 2017-02-28 13:14:06 +01:00
  • 3aac30b8ee added zmqasocket Dhanya Maliakal 2017-02-27 16:06:58 +01:00
  • 62de278f24 bug fix: loading trimbit file should not care about settings Dhanya Maliakal 2017-02-27 16:05:27 +01:00
  • 3b07afe3fc in the process of streamer Dhanya Maliakal 2017-02-27 15:38:46 +01:00
  • d90db50a60 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Anna Bergamaschi 2017-02-23 12:05:55 +01:00
  • f12df80c5b some changes for chiptest board and mythen server now compiles Anna Bergamaschi 2017-02-23 12:05:34 +01:00
  • 936dfea8a7 works so far, no gui yet Dhanya Maliakal 2017-02-22 12:01:00 +01:00
  • 9e9c109898 adding cmath and std:round interp Erik Frojdh 2017-02-22 11:31:01 +01:00
  • 9e21583331 virtual, master all works, still to do rewriting file in an acquisition Dhanya Maliakal 2017-02-21 15:13:59 +01:00
  • 19460a03f5 sending position id and num detectors in x and y dir Dhanya Maliakal 2017-02-21 15:13:27 +01:00
  • 72c2fbee9c manual eiger Gemma Tinti 2017-02-21 09:20:16 +01:00
  • 2cd38fefcd master hdf5 does not work, but so far good Dhanya Maliakal 2017-02-16 12:48:15 +01:00
  • 549e346ad4 Merge branch '2.3-rc' into hdf5 Dhanya Maliakal 2017-02-10 11:56:37 +01:00
  • 111f8beab3 updaterev Dhanya Maliakal 2017-02-10 11:51:29 +01:00
  • 4c351ba686 updated server with version variables Dhanya Maliakal 2017-02-10 11:51:05 +01:00
  • a1f00518b8 updaterev Dhanya Maliakal 2017-02-10 11:50:24 +01:00
  • 3d2264fa56 updaterev Dhanya Maliakal 2017-02-10 11:50:13 +01:00
  • 3e9476cca2 updaterev Dhanya Maliakal 2017-02-10 11:49:58 +01:00
  • 54f92fb26c changed namings Dhanya Maliakal 2017-02-10 10:41:01 +01:00
  • b260d08225 somewhere Dhanya Maliakal 2017-02-10 10:08:00 +01:00
  • c89f6e649c fnum wrong, need to add file features Dhanya Maliakal 2017-02-07 08:52:27 +01:00
  • 5287441a65 removed warning Dhanya Maliakal 2017-02-07 08:52:05 +01:00
  • 9b3f4a3a66 commonFiles/error_defs.h Dhanya Maliakal 2017-02-03 14:34:05 +01:00
  • 1decd2dd89 Merge branch '2.3-rc' into hdf5 Dhanya Maliakal 2017-02-03 14:30:09 +01:00
  • 490e756622 added the servers Dhanya Maliakal 2017-02-03 12:31:33 +01:00
  • 87ce1ed736 moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable Dhanya Maliakal 2017-02-03 12:29:44 +01:00
  • 0896704de7 moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable Dhanya Maliakal 2017-02-03 12:29:33 +01:00
  • d95aaa2089 somewhere in between.. next step include generalData pointer in listerner and dataprocessor calss in constructor and a setter Dhanya Maliakal 2017-01-31 08:42:16 +01:00
  • 01d54a7a4c Complete rewrite of receiver, with new changes Dhanya Maliakal 2017-01-27 15:40:36 +01:00
  • 70a7d83175 somewhere Dhanya Maliakal 2017-01-18 15:22:05 +01:00
  • f6927ad1bf in between Dhanya Maliakal 2017-01-17 10:56:01 +01:00
  • bd31ac1d52 changes to variable name Dhanya Maliakal 2017-01-17 10:55:43 +01:00
  • b16d087fd1 Merge branch '2.2-rc' into hdf5 Dhanya Maliakal 2017-01-06 15:17:40 +01:00
  • 3563f0deec Merge branch '2.2-rc' into developer Dhanya Maliakal 2017-01-06 15:17:14 +01:00
  • 111856ed7b hv should work now Dhanya Maliakal 2017-01-06 15:16:05 +01:00
  • 0fdbac981e should work for serial comm hv for 9m Dhanya Maliakal 2017-01-05 12:58:49 +01:00
  • adb5ab5ed1 chunked upto 1000 and new dataset every 10000 Dhanya Maliakal 2017-01-03 12:11:55 +01:00
  • abb5bfb6e4 creating new datasets every 10,000 images in same file Dhanya Maliakal 2017-01-03 08:57:59 +01:00
  • 987aeda6fb sorted out problem with CPU read out Anna Bergamaschi 2016-12-22 17:24:53 +01:00
  • d847a289a4 changed progress prints, file naming etc Dhanya Maliakal 2016-12-21 10:53:56 +01:00
  • 66c488b79a working so far Dhanya Maliakal 2016-12-20 14:13:00 +01:00
  • aa99d289c3 added library path in makefile.include so that you dont have to do ld_library_path Dhanya Maliakal 2016-12-19 18:04:59 +01:00