Commit Graph

  • 945a7ed10f Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-17 13:55:52 +02:00
  • 5ef0012518 command line docu update. more coming Dhanya Maliakal 2017-08-17 13:55:44 +02:00
  • 94e3874545 docu for bug fix eiger serbver Dhanya Maliakal 2017-08-17 12:07:57 +02:00
  • 722fb58010 bugfix:trimval gave first pixel value and not -1 if all are different Dhanya Maliakal 2017-08-17 12:04:54 +02:00
  • d63933b2de fixed 9m hv Dhanya Maliakal 2017-08-17 11:09:26 +02:00
  • c6c0819a5e Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 19:06:24 +02:00
  • 45681f86ce update client command doc Dhanya Maliakal 2017-08-16 19:06:17 +02:00
  • 50c5c12523 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer Dhanya Maliakal 2017-08-16 19:05:42 +02:00
  • 4f773120b2 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 19:05:36 +02:00
  • 4ffefc99a2 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 19:05:28 +02:00
  • 16fc44b3ab update client command doc Dhanya Maliakal 2017-08-16 19:05:17 +02:00
  • e8cfadaae3 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 18:46:19 +02:00
  • ac6720e27d appears double in the intro list Dhanya Maliakal 2017-08-16 18:46:10 +02:00
  • 65c76e10be Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 18:37:30 +02:00
  • ae7255953d compile error bug fix Dhanya Maliakal 2017-08-16 18:37:10 +02:00
  • 0bbee8d91e Merge branch '3.0-rc' into developer Gemma Tinti 2017-08-16 18:21:01 +02:00
  • 24d6d2c24a Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc Gemma Tinti 2017-08-16 18:18:48 +02:00
  • 28e9605ab7 eiger documentation Gemma Tinti 2017-08-16 18:18:31 +02:00
  • 6b28201f72 comments merged Anna Bergamaschi 2017-08-16 17:50:46 +02:00
  • ae49c04dcd added documentation to slsDetectorCommand.cpp Anna Bergamaschi 2017-08-16 17:29:04 +02:00
  • 87abe15227 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 17:28:09 +02:00
  • 5f90db723c increased default fifo depth for gotthard Dhanya Maliakal 2017-08-16 17:27:31 +02:00
  • 2ab90ae2ed Merge branch 'faststreamer' into 3.0-rc Dhanya Maliakal 2017-08-16 17:25:25 +02:00
  • 4b7970c191 Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0-rc Dhanya Maliakal 2017-08-16 17:23:50 +02:00
  • 3cf092d058 updating cmd line help Dhanya Maliakal 2017-08-16 17:23:37 +02:00
  • 0be51b69fb Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 17:12:40 +02:00
  • 57537a350f updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver Dhanya Maliakal 2017-08-16 17:12:23 +02:00
  • 2b030abf0d sync eiger manual Gemma Tinti 2017-08-16 16:32:53 +02:00
  • e8217b0867 do not complain when setting timers Dhanya Maliakal 2017-08-16 16:26:57 +02:00
  • 83bb7c99ea removed gotthard server binary..was for developer branch Dhanya Maliakal 2017-08-16 16:05:53 +02:00
  • 24d0d776b7 new gotthard server binary Dhanya Maliakal 2017-08-16 16:04:47 +02:00
  • f4b01bc18b rst to sw1 for all Dhanya Maliakal 2017-08-16 16:03:57 +02:00
  • 509d81ba7d Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 11:50:26 +02:00
  • eaed8bab08 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 11:50:13 +02:00
  • 3c59b3b8dd updated command line doc Dhanya Maliakal 2017-08-16 11:50:01 +02:00
  • 2935722b98 updated command line doc Dhanya Maliakal 2017-08-16 11:49:55 +02:00
  • af5f61bd95 updated command line doc Dhanya Maliakal 2017-08-16 11:13:40 +02:00
  • 8bc039c95f updated command line doc Dhanya Maliakal 2017-08-16 11:13:32 +02:00
  • b0b3701fcf moved the output dir of slsdetectorClientDocs Dhanya Maliakal 2017-08-16 11:11:26 +02:00
  • c489aeb9dc moved the output dir of slsdetectorClientDocs Dhanya Maliakal 2017-08-16 11:11:13 +02:00
  • db983c5439 moved the output dir of slsdetectorClientDocs Dhanya Maliakal 2017-08-16 11:10:56 +02:00
  • ca6fff9648 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-16 11:04:28 +02:00
  • 5de120f7e7 more changes to client docu. more coming up. removed slsDetectorClientDocs from here Dhanya Maliakal 2017-08-16 11:03:22 +02:00
  • c21f7f371a more changes to client docu. more coming up Dhanya Maliakal 2017-08-16 10:42:27 +02:00
  • 03cc80dc3c more changes to client docu. more coming up Dhanya Maliakal 2017-08-16 10:36:25 +02:00
  • 413a944e70 fixed problem with datastream help Dhanya Maliakal 2017-08-16 10:11:39 +02:00
  • 25ece55d7f more changes to client docu. more coming up Dhanya Maliakal 2017-08-16 10:09:27 +02:00
  • ca865a6636 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Anna Bergamaschi 2017-08-16 09:27:48 +02:00
  • 4d493504e3 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-15 18:42:51 +02:00
  • bb917b70f3 more changes to client docu. more coming up Dhanya Maliakal 2017-08-15 18:42:41 +02:00
  • c0d0ebb104 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-15 18:31:12 +02:00
  • f8060ef757 more changes to client docu. more coming up Dhanya Maliakal 2017-08-15 18:29:07 +02:00
  • 193139f06f Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-15 18:08:01 +02:00
  • f92a6e58d3 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-15 18:07:17 +02:00
  • 8e1a841b42 in between command line documentation Dhanya Maliakal 2017-08-15 18:06:45 +02:00
  • 6a2c0ac86d added command line documentation in release.txt Dhanya Maliakal 2017-08-15 18:06:20 +02:00
  • 9bb8a94c55 updated README Dhanya Maliakal 2017-08-15 14:14:47 +02:00
  • f8bb6a04a9 so that the first image shows Dhanya Maliakal 2017-08-15 14:10:43 +02:00
  • 1e7932f09c switched back to 200ms Dhanya Maliakal 2017-08-15 14:00:34 +02:00
  • 02b6228856 updated eiger server Dhanya Maliakal 2017-08-15 13:59:03 +02:00
  • bcf5e1fc0b updated server binary Dhanya Maliakal 2017-08-14 15:07:36 +02:00
  • 3fb92aa9dd changes done Dhanya Maliakal 2017-08-14 13:33:24 +02:00
  • 77d688e508 changes done Dhanya Maliakal 2017-08-14 13:33:11 +02:00
  • 1ec3a69e29 print memory allocated properly Dhanya Maliakal 2017-08-14 10:49:08 +02:00
  • 3aeb15648c Anna's modifications Anna Bergamaschi 2017-08-11 15:55:07 +02:00
  • 52e1bd32b9 Anna's modifications Anna Bergamaschi 2017-08-11 15:52:08 +02:00
  • aca3b4ca1b Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-10 19:09:58 +02:00
  • 0c6fcc1186 cannot put for get busy Dhanya Maliakal 2017-08-10 19:09:46 +02:00
  • 92ae104f39 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-10 18:46:42 +02:00
  • ae6884949b Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-10 18:46:42 +02:00
  • 1a313e4d5d moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix Dhanya Maliakal 2017-08-10 18:46:21 +02:00
  • e8d83a085f moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix Dhanya Maliakal 2017-08-10 18:46:10 +02:00
  • c724756b5f included subexptime in metadata for hdf5 Dhanya Maliakal 2017-08-10 17:33:32 +02:00
  • ad3e3ce255 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa Dhanya Maliakal 2017-08-10 17:25:28 +02:00
  • f084efd263 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa Dhanya Maliakal 2017-08-10 17:25:18 +02:00
  • af079f3168 posisibility to read adnd write registers in the front end board for eiger Dhanya Maliakal 2017-08-10 14:49:02 +02:00
  • 11943c4b5c merge insignificant conflicts Dhanya Maliakal 2017-08-10 11:19:36 +02:00
  • 389f356a3a high voltage reflects the master only, if 2 masters reflects -1 Dhanya Maliakal 2017-08-10 11:09:44 +02:00
  • 0219d09067 sub frame number for eiger in master ascii file, instead of exposure length Dhanya Maliakal 2017-08-10 11:07:56 +02:00
  • df11f41416 reworked version Leonardo Sala 2017-08-10 10:04:00 +02:00
  • 97330b65ca to handle frame number 0s from firmware Dhanya Maliakal 2017-08-09 18:47:55 +02:00
  • eed951016b frame number 0 from firmware in eiger is dealt with Dhanya Maliakal 2017-08-09 18:13:23 +02:00
  • 39847c5db6 esrf bug, shut down socket, but being processed and object deleted, fixed Dhanya Maliakal 2017-08-09 17:25:23 +02:00
  • 12592c1206 updaterev Dhanya Maliakal 2017-08-09 17:24:43 +02:00
  • cb90c3722d esrf bug, shut down socket, but being processed and object deleted, fixed Dhanya Maliakal 2017-08-09 17:24:34 +02:00
  • 851914f0ae manuals Gemma Tinti 2017-08-08 20:04:28 +02:00
  • e85973ec8b manuals Gemma Tinti 2017-08-08 19:48:32 +02:00
  • 7a30ab25bd Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-08 19:16:10 +02:00
  • 5a45f15c7f fixed the frameindex bug (always 0) Dhanya Maliakal 2017-08-08 19:15:57 +02:00
  • 558e5e2e9a added busy command, converted get frames etc to an integer output Dhanya Maliakal 2017-08-08 19:15:20 +02:00
  • 82d21b6971 changes to release.txt to include busy command and the frameindex bugfix Dhanya Maliakal 2017-08-08 19:13:22 +02:00
  • ccc60dacf4 updated release.txt and the cmk.sh help script Dhanya Maliakal 2017-08-08 16:24:33 +02:00
  • 517dfdf523 Merge branch '3.0-rc' into developer Dhanya Maliakal 2017-08-08 14:59:07 +02:00
  • 43ba40ec4c updaterev Dhanya Maliakal 2017-08-08 14:51:47 +02:00
  • 557d190236 changes for rest implementation Dhanya Maliakal 2017-08-08 14:51:32 +02:00
  • 5c6a99afca changes for rest implementation Dhanya Maliakal 2017-08-08 14:51:00 +02:00
  • c98c5e469b added warning in makefile Leonardo Sala 2017-08-08 07:06:43 +02:00
  • d827ccc115 backported changes implemented in 2.3.2.rest Leonardo Sala 2017-08-08 06:55:52 +02:00
  • a40d18f8b2 last packet even if many padded packets in between should be written (from carryoverflag) Dhanya Maliakal 2017-08-07 19:58:48 +02:00
  • 0cd18a3b7a more comments Dhanya Maliakal 2017-08-07 10:39:29 +02:00