Commit Graph

  • 31420ab850 Pullback from Echidna 2015-02-19 Douglas Clowes 2015-02-19 11:43:50 +11:00
  • da2383f5ce Pullback from Platypus 2015-02-19 Douglas Clowes 2015-02-19 11:30:48 +11:00
  • 40d2a1e2f4 Pullback from Pelican 2015-02-19 Douglas Clowes 2015-02-19 11:24:44 +11:00
  • 2dcf274618 Tilt configuration from Taipan 2015-02-19 Douglas Clowes 2015-02-19 10:35:21 +11:00
  • 666a70cb96 Dubious diffs from Taipan 2015-02-19 Douglas Clowes 2015-02-19 10:34:31 +11:00
  • fbdd46e258 Pullback from Taipan 2015-02-19 Douglas Clowes 2015-02-19 10:34:12 +11:00
  • a5498a2a77 Pull some changes from RELEASE-3_1 in gen_sct and *.sct Douglas Clowes 2015-02-19 09:48:38 +11:00
  • 8c4eed9bfe Merged changes from Quokka as at 2015-02-18 Douglas Clowes 2015-02-19 09:40:49 +11:00
  • 287b671569 Regenerate for limit changes Douglas Clowes 2015-02-19 09:14:23 +11:00
  • 45d4663816 Pullback limit adjustments from Quokka to sct template drivers Douglas Clowes 2015-02-19 09:04:43 +11:00
  • bf8be461ee Add in from Quokka Douglas Clowes 2015-02-18 14:46:54 +11:00
  • 4619a57eff Pullback from Quokka 2015-02-18 Douglas Clowes 2015-02-18 14:14:11 +11:00
  • 648c7bf1dd Update Quokka configuration file Douglas Clowes 2015-02-18 12:36:11 +11:00
  • f0bc6f0693 Backport the build command from RELEASE-3_2 Douglas Clowes 2015-02-18 11:54:08 +11:00
  • cad4f64dcc Regenerate the 3He driver for the coils Douglas Clowes 2015-02-16 12:38:43 +11:00
  • f80bec1403 Changes to get and set the field coil values Douglas Clowes 2015-02-16 12:38:02 +11:00
  • 22bb612296 Fake device for Oxford LabView testing Douglas Clowes 2015-02-16 12:36:12 +11:00
  • a924b657e0 Generate the TCL from the new Oxford Douglas Clowes 2015-02-13 10:58:50 +11:00
  • 3486b75d47 Generate the TCL from the new Oxford Douglas Clowes 2015-02-13 10:57:58 +11:00
  • 2993a04485 Alternative Oxford Magnet Labview interface Douglas Clowes 2015-02-13 10:56:21 +11:00
  • fcb47cea5a Alternative Oxford Magnet Labview interface Douglas Clowes 2015-02-13 10:56:21 +11:00
  • 59309cec60 SICS-847: Replace t0_chopper_id with master_chopper_id in Lt0 calculation. Also added some extra chopper status variables. Ferdi Franceschini 2015-02-06 14:36:39 +11:00
  • e45edb3913 selrs now reports status of shutters when called without arguments. Ferdi Franceschini 2015-02-06 14:31:19 +11:00
  • f1eb273db6 Allow selecting histogram memory server as source of beam monitor counts. Ferdi Franceschini 2015-02-06 08:20:06 +11:00
  • ae06a182c6 Add Oxford magnet configuration to Bilby. Ferdi Franceschini 2015-02-06 08:19:34 +11:00
  • 4c3b3f71e5 Fix reference to chopper sim_mode variable. Ferdi Franceschini 2015-02-06 08:00:18 +11:00
  • 79fb7292bc Fix some duplicate definitions. Ferdi Franceschini 2015-02-06 07:39:56 +11:00
  • 2a739e2f09 Remove some configuration code that was copied from Quokka. Ferdi Franceschini 2015-02-05 17:01:32 +11:00
  • fae83b3d9e Only set the posit_count parameter on motors that need to drive to discrete positions. Ferdi Franceschini 2015-02-05 17:00:34 +11:00
  • e8601615e6 Add an OUT position to apertures. Copy bug fixes and improvements from ics1-bilby. Also provide a motor object to read the second encoder on the velocity selector translation stage for diagnostic purposes. Ferdi Franceschini 2015-02-03 15:56:39 +11:00
  • ec1d83f77d Text nodes can't be mutable. Ferdi Franceschini 2015-02-03 15:52:13 +11:00
  • 6b1a192af6 Fix updating parameters when a value changes. Ferdi Franceschini 2015-02-03 15:51:36 +11:00
  • 56d63ebc30 SICS-842: Added 'enable' and 'disable' device control commands. Ferdi Franceschini 2015-01-16 16:20:01 +11:00
  • 06f1f2f62a SICS-841: import new selrs command. Ferdi Franceschini 2015-01-16 16:19:07 +11:00
  • 0c6168a526 SICS-840: Added selrs to select roughing slits and guarantee that a slit is always selected. Also disabled driving slits via hset on GumTree. Ferdi Franceschini 2015-01-16 16:17:53 +11:00
  • 9c3a0931ce SICS-841: You can now use set_oneshot to remove a callback. Ferdi Franceschini 2015-01-16 16:06:37 +11:00
  • f2590461b5 Make sure oneshot_state = 1 while a callback is waiting for an event. Ferdi Franceschini 2015-01-14 13:27:26 +11:00
  • 9d0780047c SICS-843: Add Galil I/O arrays @IN and @OUT with SB and CB commands. Added extra (non galil) IB command to set entries in @IN. Ferdi Franceschini 2015-01-14 13:16:08 +11:00
  • fb19bf9bf6 Harmonized status text codes between second generation objects and sctdriveadpater, sctdriveobj Koennecke Mark 2015-02-04 14:35:21 +01:00
  • be0d932a21 SICS-846 Off by one error in argc check sct_asyncqueue.c Douglas Clowes 2015-01-23 17:13:50 +11:00
  • b88580a571 SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files Douglas Clowes 2015-01-23 12:28:53 +11:00
  • 86e1f7b7cf SICS-819 Fix SICS crash in logsetup Douglas Clowes 2015-01-23 09:18:14 +11:00
  • fa885cb705 SICS-819 Fix SICS crash in logsetup Douglas Clowes 2015-01-23 09:18:14 +11:00
  • 7f066d75d7 Remove RELEASE-3_1 artifacts Douglas Clowes 2015-01-22 13:19:05 +11:00
  • e317e4b341 Change names from sct_*.tcl to *_sct.tcl in config/deploy files Douglas Clowes 2015-01-22 13:16:09 +11:00
  • 89d609524d Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2015-01-21 09:23:56 +11:00
  • c91d8b67af Handle nested GROUP and VAR constructs in gen_sct.py Douglas Clowes 2015-01-21 09:21:37 +11:00
  • 3be586f6bf SICS-841: Add a oneshot callback facility for scriptcontext drivers. Ferdi Franceschini 2015-01-09 10:05:47 +11:00
  • 18456d2af8 Remove trailing spaces and blank lines from sct_bm.tcl Douglas Clowes 2015-01-08 11:41:09 +11:00
  • 1851154b6b Remove sct_epson_pandp.tcl artifact from RELEASE-3_1 Douglas Clowes 2015-01-07 14:14:18 +11:00
  • 34b16fafe7 Remove sct_srs_sr630 and sct_west_6100 artifacts from RELEASE-3_1 Douglas Clowes 2015-01-07 14:12:39 +11:00
  • f4314fc215 Remove sct_eurotherm_3200.tcl artifact from RELEASE-3_1 Douglas Clowes 2015-01-07 14:10:21 +11:00
  • cf1385d3f9 Remove sct_mvp_valve.tcl artifact from RELEASE-3_1 Douglas Clowes 2015-01-07 14:06:59 +11:00
  • 9e76c7d60d Remove sct_keysight_N8740A.tcl artifact from RELEASE-3_1 Douglas Clowes 2015-01-07 14:04:35 +11:00
  • d85d6127fe Remove sct_he3_polanal.tcl artifact from RELEASE-3_1 Douglas Clowes 2015-01-07 14:00:20 +11:00
  • c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 Douglas Clowes 2014-09-01 13:23:21 +10:00
  • 9c38845b84 SIS IO Box Beam monitor driver. Jing Chen 2015-01-07 13:01:21 +11:00
  • 2b73a7eaca Remove extra include (<rs232controller.h>) Douglas Clowes 2015-01-07 11:05:39 +11:00
  • 679838eac3 Port new Aerolas Doppler driver from RELEASE-3_1 Douglas Clowes 2015-01-07 10:29:07 +11:00
  • 76d7191754 SICS-839 Change TCL var from nominal_outp_current to NominalOutpCurrent Douglas Clowes 2015-01-07 10:20:40 +11:00
  • 0afb08a7a3 Adjustments to mtth/vwi/vei for Pelican Douglas Clowes 2014-12-15 15:33:05 +11:00
  • 2d4c725d10 Regen keysight Douglas Clowes 2014-12-12 15:24:50 +11:00
  • f09cf4d080 move keysight from environment to instrument class Douglas Clowes 2014-12-12 15:24:25 +11:00
  • 159184cb30 Regen SCT driver for Keysight PS Douglas Clowes 2014-12-12 14:28:48 +11:00
  • b81b226fe8 Allow output voltage to be ramped on Keysight PS Douglas Clowes 2014-12-12 14:27:40 +11:00
  • c61cb22270 Handle bigger modbus messages Douglas Clowes 2014-12-12 14:25:24 +11:00
  • ff03b1108b Regen the omron SCT driver Douglas Clowes 2014-12-08 16:27:03 +11:00
  • bdc11e914f Change the protocol to omron_ap for the omron driver Douglas Clowes 2014-12-08 16:26:03 +11:00
  • 33fbe4ed01 Regen the doppler SCT driver Douglas Clowes 2014-12-08 16:24:44 +11:00
  • 82f81b4b02 Change the byte order and start addresses for the doppler modbus driver Douglas Clowes 2014-12-08 16:24:30 +11:00
  • e23dff2141 -Fixed a small bug in sicsdata copytonode where the start position was not honoured Koennecke Mark 2014-12-04 11:33:43 +01:00
  • 06a0ebad19 Regen SCT driver Douglas Clowes 2014-12-03 12:12:28 +11:00
  • f28115552a Add additional doppler modbus registers Douglas Clowes 2014-12-03 12:12:17 +11:00
  • 99671f2aa5 New driver for AeroLas Doppler drive for Emu Douglas Clowes 2014-12-02 16:15:12 +11:00
  • 8ff7368f34 develop keysight_N8740A.sct Douglas Clowes 2014-12-02 13:25:03 +11:00
  • 0aa292bc96 develop keysight_N8740A.sct Douglas Clowes 2014-12-02 13:24:51 +11:00
  • 5f2223510f Regenerate SCT drivers Douglas Clowes 2014-12-02 10:09:17 +11:00
  • e64b7bf409 Instructed bruker_BEC1 wrapper to not make a script context controller. Ferdi Franceschini 2014-12-01 14:30:05 +11:00
  • 7adec62e61 Driver for Agilent/Keysight N8740A Power Supply Douglas Clowes 2014-12-01 12:59:49 +11:00
  • 34f748e426 Set the driver name and the ip_address/tcp_port for nosctcontroller Douglas Clowes 2014-11-27 15:15:13 +11:00
  • 99f23cda50 Regen the Oxford Mercury SCT driver Douglas Clowes 2014-11-24 12:45:12 +11:00
  • f5994bb760 Add auto/manual switch and setting, change to all lowercase Douglas Clowes 2014-11-24 12:44:29 +11:00
  • de766e465e Regen of Mercury driver Douglas Clowes 2014-11-20 17:37:58 +11:00
  • 7960bab345 Changes to Mercury driver Douglas Clowes 2014-11-20 17:37:34 +11:00
  • 51026a09af Pull various config files closer into alignment Douglas Clowes 2014-11-20 16:06:32 +11:00
  • f629ea24ed Pull various config files closer into alignment Douglas Clowes 2014-11-20 15:56:30 +11:00
  • 892ca1cdc5 Merge branch 'RELEASE-3_1' Douglas Clowes 2014-11-20 15:11:56 +11:00
  • e04f107bc9 Add new SCT driver for Oxford Mercury Douglas Clowes 2014-11-20 14:52:13 +11:00
  • 1469a60b5d Regen SCT driver with new spacing Douglas Clowes 2014-11-20 14:51:54 +11:00
  • 11b68fb957 New driver for the Oxford Mercury (using conditional and exec) Douglas Clowes 2014-11-20 14:46:24 +11:00
  • 9b178f3014 Add a new (configurable) fake Oxford Mercury Douglas Clowes 2014-11-20 14:44:43 +11:00
  • d4de7d4ea1 Pretty-up the spacing around the conditional code in gen_sct.py Douglas Clowes 2014-11-20 12:49:43 +11:00
  • 7269314220 Regenerate SCT drivers (new spacing, new Oxford Mercury) Douglas Clowes 2014-11-20 14:48:00 +11:00
  • a7e6017fd5 New driver for the Oxford Mercury (using conditional and exec) Douglas Clowes 2014-11-20 14:46:24 +11:00
  • 01c0bf1f3c Add a new (configurable) fake Oxford Mercury Douglas Clowes 2014-11-20 14:44:43 +11:00
  • c838e4ffe2 Pretty-up the spacing around the conditional code in gen_sct.py Douglas Clowes 2014-11-20 12:49:43 +11:00
  • f274f3bcdb - Fixed a sget bug which caused text wrongly to be identified as numbers - Fixed a sput bug: SetHipadabaPar versus UpdateHipadabaPar - Modified hdelcb to be able to remove callbacks from SICS objects Koennecke Mark 2014-11-18 09:24:27 +01:00
  • 225c4c5ee7 Regenerate SCT drivers Douglas Clowes 2014-11-13 14:54:36 +11:00
  • 89b23eda07 Make the Lakeshore 218 driver less noisy and have less channels Douglas Clowes 2014-11-13 14:54:25 +11:00
  • b84efe47cf Regenerate SCT drivers Douglas Clowes 2014-11-13 14:53:48 +11:00