linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 6f2226fa40 Changes to Makefile for building on 64-bit RHEL Douglas Clowes 2014-07-30 11:40:47 +10:00
  • 9b965e6313 Minimal scan.tcl and dingo_configuration.tcl FIX: The scan fails to update the motor positions in the camera server meta data. Ferdi Franceschini 2014-07-28 10:10:18 +10:00
  • a7039c5ca0 Don't abort server_init if one of the initialisation commands fails. Ferdi Franceschini 2014-07-28 10:02:49 +10:00
  • a24afd1298 Modify test configuration for testing on Dingo. The dingo_configuration.tcl could be based on this. TODO: Move scan configuration to scan.tcl Ferdi Franceschini 2014-07-24 13:57:15 +10:00
  • 29e17ba482 Report HWIdle to SICS if the camera driver has been reset via halt(). Ferdi Franceschini 2014-07-24 13:49:48 +10:00
  • 1707cba55f Add debug parameter to Dingo camera driver. Ferdi Franceschini 2014-07-24 12:48:00 +10:00
  • 67a3a198ac Added command latch ready event and camera upload configuration event. The camera driver will now upload the exposure time when it's called from a scan object. The output function now returns events which are not targeted at the camera or SICS so that they can be fed back into the state transition function. The input event handler (camera.c:camdriv_input) now feeds output events back into the transition function. Ferdi Franceschini 2014-07-24 12:35:47 +10:00
  • a62a284372 Define Echidna sics_config.ini with configurable sample stage. Ferdi Franceschini 2014-07-21 23:52:06 +10:00
  • 972e3232cd Change the names in all of the files Douglas Clowes 2014-07-23 17:30:44 +10:00
  • 9c90153f37 Perform the rename Douglas Clowes 2014-07-23 16:45:48 +10:00
  • e04785f3a8 Code to generate the move/rename Douglas Clowes 2014-07-23 16:39:45 +10:00
  • dda4a0f8f6 Fix erroneous filenames that match other files Douglas Clowes 2014-07-23 16:04:00 +10:00
  • dedcc49284 Fix erroneous filenames that match other files Douglas Clowes 2014-07-23 16:04:00 +10:00
  • e3b583150e SICS-696 Explicity include the namespace on mk_sct_ calls Douglas Clowes 2014-07-23 14:32:26 +10:00
  • 16b435befe Fix an unbalanced brace Douglas Clowes 2014-07-23 14:27:50 +10:00
  • 8d4366fa95 Change newserver to a link to server_date_time in deploySICS Douglas Clowes 2014-07-21 15:10:14 +10:00
  • 001d41a703 Change newserver to a link to server_date_time in deploySICS Douglas Clowes 2014-07-21 15:10:14 +10:00
  • ab3d7c5adf Remove explicit test debug_threshold from SCT files and regenerate Douglas Clowes 2014-07-21 10:58:01 +10:00
  • b9f67a2562 Fix saving t0_chopper_freq and tof length values. Ferdi Franceschini 2014-07-20 21:42:36 +10:00
  • 3d051f5bb9 Update aperture positions from Bilby spreadsheet. Ferdi Franceschini 2014-07-20 21:29:48 +10:00
  • c992ae0a2c Refactor aperture selection and report aperture positions at end of drive. Improve feedback. Ferdi Franceschini 2014-07-20 21:29:19 +10:00
  • b9b386e3f6 Capture error messages in prun and pdrive. Ferdi Franceschini 2014-07-20 20:49:20 +10:00
  • 1d1f102b08 - Fixed a serious bug in interface.c introduced while cleaning SetStatus Mark Koennecke 2014-07-18 15:50:04 +02:00
  • f5e797dd6a - Cleaned all old dtatus setting code Mark Koennecke 2014-07-18 14:02:57 +02:00
  • 0becbe914a Use the sct_pulser sctcontroller generated from the agilent_33220A.sct wrapper. Ferdi Franceschini 2014-07-18 15:51:37 +10:00
  • 9752c6dbaf Fix list of apertures which should be raised before moving guides. Optimise aperture selection. Ferdi Franceschini 2014-07-18 14:33:16 +10:00
  • b5b8b32788 Don't report non-numeric values on Ltof hdb nodes. This also eliminates logging type violation errors caused by polling of the hdb nodes when the guides are misaligned. Make sure that aprrest_list is empty when N = 8 Improved argument checking and optimisations. Ferdi Franceschini 2014-07-18 00:16:27 +10:00
  • 17c212ee2e Merge branch 'RELEASE-3_1' into RELEASE-3_2 Ferdi Franceschini 2014-07-17 11:55:26 +10:00
  • bffd3ae130 Workaround for SICS-596 'histmem loadconf' fails while histogram is running. The hmm init was being issued before the histogram had actually stopped. Ferdi Franceschini 2014-07-17 11:01:18 +10:00
  • 0cc126572d nguide now selects apertures as well as guides. Ferdi Franceschini 2014-07-17 09:44:56 +10:00
  • b5c64c2a03 Add convenience commands prun and pdrive for posit motors. Ferdi Franceschini 2014-07-17 09:44:18 +10:00
  • 22c701b816 Fix LS340 tc driveable by setting the right value for the model number. Ferdi Franceschini 2014-07-17 08:55:19 +10:00
  • 423244858e Added t0_chopper_freq for Bilby. Ferdi Franceschini 2014-07-16 15:02:49 +10:00
  • 3d6488e254 Rename blade to disk for Bilby choppers. Ferdi Franceschini 2014-07-16 15:02:18 +10:00
  • b217eb0dcf Add whatsthere.py to check revs on instruments Douglas Clowes 2014-07-07 14:54:41 +10:00
  • d698c302fd Merge branch 'RELEASE-3_1' into temp Douglas Clowes 2014-07-16 12:56:40 +10:00
  • 0e53fe3757 Save 5T magnet sensor reading and setpoint. Ferdi Franceschini 2014-07-16 11:27:13 +10:00
  • de264c5f02 Update 5T magnet driver name in Quokka sics_config.ini Ferdi Franceschini 2014-07-16 10:11:37 +10:00
  • c03bbdc38e Add permlink to 5T magnet driver and load the driver in the quokka config. Ferdi Franceschini 2014-07-16 10:11:07 +10:00
  • b29eecc549 Use V1 with I1 for autolab setup on wombat Ferdi Franceschini 2014-07-16 09:28:26 +10:00
  • 6a47bd9441 Merge branch 'master' into status Mark Koennecke 2014-07-15 16:46:22 +02:00
  • db6167bfa1 - Removed old stuff in conman - Fixed a bug in processnode which hangs SICS when processnode is called from multiple clients on the same node - Fixed a bug in multicountsersec which caused thrashing of the Tcl results which caused ugly error messages when calling the transfer script. Now a copy of the connection is made before calling the transfer script Mark Koennecke 2014-07-15 16:43:09 +02:00
  • fd7d369ea2 Julabo sct driver to use @@NOREPLY@@ Douglas Clowes 2014-07-15 18:51:43 +10:00
  • acec319ee3 Zeroing rotary encoder motor steps fix Douglas Clowes 2014-07-15 18:51:17 +10:00
  • db24e03106 Add sct driver for New Zealand magnet Douglas Clowes 2014-07-15 18:46:35 +10:00
  • 22b34395c1 SICS-761 Zero the motor step counter for rotary encoders. Douglas Clowes 2014-07-15 12:02:44 +10:00
  • 8849dc90c5 SICS-760 Add NOREPLY mechanism in aqadapter and asyncqueue Douglas Clowes 2014-07-15 10:06:35 +10:00
  • 994f4a48c1 Add 5T New Zealand magnet configuration to Quokka configuration. Ferdi Franceschini 2014-07-15 17:30:51 +10:00
  • 739ab393a5 Add an Autolab setup to the Wombat config and fix the mercury configuration. Ferdi Franceschini 2014-07-15 15:20:20 +10:00
  • 4996d84187 Set an @description property on the protek sensor reading. Ferdi Franceschini 2014-07-15 15:17:59 +10:00
  • d892d6c4df Fix broken catch block Ferdi Franceschini 2014-07-15 12:51:41 +10:00
  • c1b5b558f0 Make all sct drivers. Ferdi Franceschini 2014-07-15 10:56:27 +10:00
  • ac136f3426 Cleanup legacy Julabo driver. Ferdi Franceschini 2014-07-15 00:35:06 +10:00
  • c83e5d681c Update sics_config.ini files for Wombat and Quokka. Ferdi Franceschini 2014-07-15 00:34:38 +10:00
  • ee539a5341 Load wrapper code for legacy drivers. Ferdi Franceschini 2014-07-15 00:33:14 +10:00
  • 58a64da712 Wrapper code for legacy drivers. Ferdi Franceschini 2014-07-15 00:32:18 +10:00
  • 67b8576f35 Modify legacy drivers so that they can be called by sct wrappers and define wrapper templates. Ferdi Franceschini 2014-07-15 00:30:17 +10:00
  • 6112c8afa0 Don't copy 'id' from the option section into the implementation section. The read_config procs should fetch arguments from both the option and implemention sections. Ferdi Franceschini 2014-07-14 14:27:47 +10:00
  • deb6716f9b make_args can now be set in the option section of a sics_config.ini Ferdi Franceschini 2014-07-14 14:22:17 +10:00
  • 9305d6da53 Don't fetch an implementation if an option is disabled. Ferdi Franceschini 2014-07-12 16:53:13 +10:00
  • d010e76076 SICS-759 Make asyncprotocol look for the list command in the correct place. Douglas Clowes 2014-07-14 13:18:26 +10:00
  • f916462be6 Updated julabo SCT template Douglas Clowes 2014-07-11 18:28:31 +10:00
  • 47fbb1979e You can now set the privilege and type for MakeSICSObj in an sct template. Ferdi Franceschini 2014-07-11 17:14:08 +10:00
  • 867c6c8eaa Generate a wrapper for the old protek driver from a protekmm.sct template. Ferdi Franceschini 2014-07-11 13:52:37 +10:00
  • 4f72bcaaf5 allow legacy sct controllers in generated drivers Douglas Clowes 2014-07-11 13:18:38 +10:00
  • 5ee7e6719f Defer makesctdrive to end of mkDriver to avoid possible forward references. Douglas Clowes 2014-07-11 10:11:27 +10:00
  • 0dbe7bd53e Allow empty braces on sct vars and remove semicolons from python code Douglas Clowes 2014-07-11 10:07:05 +10:00
  • 35067c3673 Clean up Nagelfar warnings in generated drivers Douglas Clowes 2014-07-04 16:27:44 +10:00
  • a9e4c80a87 Reindent gen_sct.py to 4 spaces Douglas Clowes 2014-07-11 13:37:02 +10:00
  • 16b228dc0e Sort and save the the Quokka sics_config.ini file in its default configuration. Ferdi Franceschini 2014-07-11 09:30:59 +10:00
  • 679651bd28 Add some help and feedback when saving a file. Ferdi Franceschini 2014-07-11 08:41:10 +10:00
  • 6aa229ee75 Driver changes made on ics1-wombat-test. Ferdi Franceschini 2014-07-10 09:56:09 +10:00
  • d79865edb4 Write sections to the configuration file in the same order as the screen layout. Ferdi Franceschini 2014-07-10 06:42:43 +10:00
  • 8953273dac Show IP address and PORT number for implmentations that have them. Ferdi Franceschini 2014-07-10 05:35:41 +10:00
  • 9be5cc4cec set_imp now works in initialisation code and makes sure that 'none' is not used as a key in imp2opt_dict. Also provide consistency_check() method to check that there is a one to one mapping between options and implementations. Ferdi Franceschini 2014-07-10 04:34:26 +10:00
  • 1b4cca9390 Options not in the cascade list should have their implementation set to 'none' Ferdi Franceschini 2014-07-09 09:41:09 +10:00
  • b5d3b745c3 Don't allow the implementation of permanent options to be set to 'none'. Ferdi Franceschini 2014-07-08 20:23:18 +10:00
  • a294d50a1d A bit of refactoring, a bit of housekeeping. Make Pylint happy. Mmmmm nice. Ferdi Franceschini 2014-07-08 19:33:29 +10:00
  • dee4b0430e The order that __get_options() and __get_implementations() are called in shouldn't matter. Ferdi Franceschini 2014-07-08 18:36:15 +10:00
  • cc6634abe9 The implementation field is set only if an option is enabled in the config file. All other options should be shown as disabled with 'none' as the implementation. Conflicts between enabled options are resolved in favour of the first option returned by the ConfigParser which isn't necessarily the first enabled option in the file. Only enabled options are mapped in the imp2opt_dict dictionary. Ferdi Franceschini 2014-07-08 17:57:45 +10:00
  • cd80f567fe Only do the rotary_bits if the previous counts is valid Douglas Clowes 2014-07-10 13:13:57 +10:00
  • f05bf2e7db Change Dingo stth for multi-turn rotary encoder Douglas Clowes 2014-07-09 15:02:24 +10:00
  • f6dfc76ada Pull back changes from Dingo Douglas Clowes 2014-07-09 15:01:21 +10:00
  • 709118c286 - Added isactive command to scan. Such that collect can test for another scan running before starting Mark Koennecke 2014-07-08 08:47:28 +02:00
  • cc5400c595 Pull back changes in Kookaburra config Douglas Clowes 2014-07-07 14:48:12 +10:00
  • 852f87f131 Sort and massage Quokka's sics_config.ini Douglas Clowes 2014-07-07 13:59:41 +10:00
  • 737e56670b Use shutil.copy2 to preserve file dates Douglas Clowes 2014-07-07 13:59:03 +10:00
  • 47d5604e1e Make the Julabo work for asyncqueue adapters Douglas Clowes 2014-07-07 13:58:08 +10:00
  • 7193129956 Set bruker IP address and port Ferdi Franceschini 2014-07-07 10:25:09 +10:00
  • 8a8a08e57f Add sics_config.ini to quokka. Ferdi Franceschini 2014-07-07 10:22:06 +10:00
  • cc39cc08fe Select sample changer from sics_config.ini Ferdi Franceschini 2014-07-07 09:15:54 +10:00
  • 3ce563696f Remove debug output and cleanup a bit. Ferdi Franceschini 2014-07-06 20:15:41 +10:00
  • 46b0e1a9a3 Provide navigation context for __imp_unavailable method. Ferdi Franceschini 2014-07-06 20:09:15 +10:00
  • f1b13aa7c6 Remove dependency of viewer on data and manager objects. It just requires listboxes for the layout. Also use new style class definition for InstConfigData and InstConfigManager. Ferdi Franceschini 2014-07-06 18:27:45 +10:00
  • 80cc3350c5 Experiment with "pylint: disable" to eliminate false positives from pylint. Ferdi Franceschini 2014-07-06 15:08:03 +10:00
  • 9228dd2c0c Remove unused variable. Ferdi Franceschini 2014-07-06 12:15:13 +10:00
  • 82268ecc2e Make sure all instance attributes are defined in __init__ methods. Also play with named arguments that don't define a default value (**kwargs) Ferdi Franceschini 2014-07-06 12:03:19 +10:00
  • a5ea730343 Don't redefine the 'dict' builtin. (Caught by pylint) Also improve variable name consistency. Ferdi Franceschini 2014-07-06 11:47:23 +10:00
  • 8a6004e12d Stop pylint complaining about unimplemented abstract methods. But instantiating an apparently abstract class didn't bother Python??? Ferdi Franceschini 2014-07-06 11:14:36 +10:00
  • 13c837d9b5 Reduce pylint noise and remove unused variable imp_lw Ferdi Franceschini 2014-07-06 10:13:40 +10:00