linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,775 Commits 1 Branch 0 Tags
f2568b681dde1025c3b696590dfdbb07d0b4f4a0
Commit Graph

127 Commits

Author SHA1 Message Date
Douglas Clowes
0afb08a7a3 Adjustments to mtth/vwi/vei for Pelican 
Reverse sign on mom[abc] in set_vwi proc
Add hdbchain for vwi for mtth
Add sicslist setatt ... for vei as for vwi
 2014-12-15 15:33:05 +11:00
Douglas Clowes
2852cc9d79 Fix IP address of Pelican HV 2014-09-16 11:27:37 +10:00
Douglas Clowes
8b4bcc4c9e Pelican does not currently have a PLC interface 2014-09-10 17:03:00 +10:00
Ferdi Franceschini
47d3d0a7e8 Pelican doesn't seem to have a PLC interface. 2014-08-26 10:33:14 +10:00
Ferdi Franceschini
78cfe7f5a9 SICS-770 Fixed SICS reports 'bad status code' when scanning the schp motor 2014-08-26 10:33:13 +10:00
Ferdi Franceschini
2c753a3f18 Make sample stages configurable and add Oxford magnet sample stick motor as an option. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
8a6da09326 Deploy all environment control drivers. 2014-08-06 10:08:10 +10:00
Douglas Clowes
8bed9404e4 Pelican merge: pelican_configuration.tcl, motor_configuration.tcl 2014-06-26 15:15:58 +10:00
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Ferdi Franceschini
0ae4d40470 Deploy all environment drivers to all instruments. 2014-05-16 13:56:51 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
852bc7462b Updated from ics2-pelican 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
472ca4f9d9 Updated from ics2-pelican. 2013-12-20 09:08:53 +11:00
Ferdi Franceschini
1af24fcb0a _histmem proc isn't created if the common hmm config file is loaded with the "source" command. 2013-09-10 21:44:45 +10:00
Douglas Clowes
f3e2a6cd7f Add LS340 to Pelican deployment 2013-08-30 14:16:19 +10:00
Ferdi Franceschini
d48b771ac3 Updated mom motor stepsperX and cntsperX for Pelican. 2013-08-15 14:56:28 +10:00
Ferdi Franceschini
643017d486 Source channel gains from das1-pelican and set MESYTEC thresholds. 2013-08-15 14:19:05 +10:00
Ferdi Franceschini
ca1e34856a Speed up histmem config when SICS starts up. 
Clock scale, frame freq and source should be set in the instrument specific
hmm_configuration.tcl file, not in hmm_configuration_common_1.tcl.
 2013-08-15 13:56:50 +10:00
Ferdi Franceschini
05f17515cf SICS-645: Setting mtype attribute to stop scan from checking thread0 2013-08-09 05:30:57 +10:00
Ferdi Franceschini
2c36a8f466 SICS-644: Set precision to 50ns on Pelican fermi chopper phase motors. 2013-08-09 05:30:54 +10:00
Ferdi Franceschini
d872aedbec Don't create Pelican fermichopper motors when loading the configuration file. 
This should be done in the local extraconfig.tcl
 2013-05-31 11:13:10 +10:00
Ferdi Franceschini
cd3bbe64e3 SICS-594 Check and update motor configuration for the monochromator motors. 2013-05-21 12:26:32 +10:00
Ferdi Franceschini
735b402655 SICS-606 Anticollision script for Pelican monochromator. 2013-05-17 03:25:27 +10:00
Ferdi Franceschini
ea3c8b7821 BUGFIX Set 50ns veto window parameter correctly on the Fermi chopper. 
Also disable the idle setting in the 'run' command.
And check that the 'run' command actually succeeded.
 2013-05-13 22:15:43 +10:00
Ferdi Franceschini
b8d059c266 BUGFIX Forgot to actually send coil value when set. 
Also cleared stale error messages.
 2013-05-13 22:14:22 +10:00
Ferdi Franceschini
a192276023 Don't send a start when driving the phase-control fermi-motors. 
We don't want to start a chopper before the speed is set if the
following command is issued,
  drive mchp 1.3e6 mchs 4000
 2013-05-08 10:54:02 +10:00
Ferdi Franceschini
59eb6d2b0d Catch the fermi chopper setspeed error and pass it up to motor.c 2013-05-08 08:00:40 +10:00
Ferdi Franceschini
50dbadc811 Set both fermi choppers to phase mode. 
You can set both speed and phase delay in phase mode.
 2013-05-08 07:15:55 +10:00
Ferdi Franceschini
c50d73740b Added phase motors for fermi master and slave choppers. 2013-05-07 18:51:03 +10:00
Ferdi Franceschini
7e1e4e2d45 Don't allow change of direction if the fermimotor speed != 0. 
Added an "idle" subcommand so the speed can be set to zero without
delevitating.  Also added alarm reset command.
 2013-05-03 00:36:53 +10:00
Ferdi Franceschini
90d05682e2 Fix x_pixel_angular_offset spacing in hdf file. 2013-05-02 19:17:00 +10:00
Ferdi Franceschini
68c45ff183 Add 'idle' subcommand to fermi motors. 2013-05-02 14:08:59 +10:00
Ferdi Franceschini
ecd9707eb2 Set fermi chopper direction when setting speed. 2013-05-01 07:32:31 +10:00
Ferdi Franceschini
c452e8982b Fermi chopper motors should ignore INT1712 interrupts. 
Don't halt choppers just because someone tried to interrupt a scan.
Also make slave chopper optional in mkFermiMotors.
 2013-04-29 20:44:46 +10:00
Ferdi Franceschini
961f581bf2 Fixed parsing of intlck_status. It's 16 bits not 8 bits! 2013-04-29 20:41:06 +10:00
Ferdi Franceschini
b15014bfd5 The mchs and schs motors can now be driven via run and drive command 
wrappers.
Running mchs and schs sets the motor gain parameters.
Uses new ANSTO tclmotor implementation.
 2013-04-23 10:26:28 +10:00
Ferdi Franceschini
b5ff1e82f5 Fix sics_simulation check. 2013-04-23 10:22:20 +10:00
Ferdi Franceschini
a9bd5cc5da SICS-587 (in progress) Put IP and PORT configurations in a single file. 
Pelican DONE motor, counter, chopper. TODO hmm, environment.
 2013-04-21 14:57:57 +10:00
Ferdi Franceschini
91d6e52a41 SICS-580 Pom precision was too high. 
The encoder resolution is 0.044 degrees so made precisoin = 0.05
 2013-04-20 18:37:55 +10:00
Ferdi Franceschini
b98ff24528 Added configuration file changes from ics1-pelican 2013-04-20 17:53:17 +10:00
Ferdi Franceschini
191e3719b7 Use ns instead of micro-seconds for veto-windows. 2013-03-14 15:29:31 +11:00
Jing Chen
e9f7c0547d r3784 | jgn | 2012-11-02 13:46:19 +1100 (Fri, 02 Nov 2012) | 1 line 2012-11-15 17:41:10 +11:00
Jing Chen
4e2ba8c458 change unit from dW to W 
r3783 | jgn | 2012-11-02 13:30:02 +1100 (Fri, 02 Nov 2012) | 1 line
 2012-11-15 17:41:05 +11:00
Jing Chen
e21b3eb135 r3772 | jgn | 2012-10-24 16:26:47 +1100 (Wed, 24 Oct 2012) | 1 line 2012-11-15 17:41:00 +11:00
Jing Chen
c85cd9f081 r3765 | jgn | 2012-10-10 11:23:52 +1100 (Wed, 10 Oct 2012) | 1 line 2012-11-15 17:40:27 +11:00
Jing Chen
d4784a5ec1 r3764 | jgn | 2012-10-10 10:12:07 +1100 (Wed, 10 Oct 2012) | 1 line 2012-11-15 17:40:22 +11:00
Jing Chen
dd885c3a13 r3763 | jgn | 2012-10-10 10:12:00 +1100 (Wed, 10 Oct 2012) | 1 line 2012-11-15 17:40:17 +11:00
Jing Chen
a3214236a8 add ls218 controller 
r3761 | jgn | 2012-10-09 13:38:21 +1100 (Tue, 09 Oct 2012) | 1 line
 2012-11-15 17:40:06 +11:00
Ferdi Franceschini
e1ad82ca76 Set time of flight channel width. 
r3754 | ffr | 2012-09-26 12:03:01 +1000 (Wed, 26 Sep 2012) | 2 lines
 2012-11-15 17:39:33 +11:00
Ferdi Franceschini
2ab1abb95c Oat table was defined twice. Removed the wrong definition. 
r3753 | ffr | 2012-09-26 12:00:45 +1000 (Wed, 26 Sep 2012) | 2 lines
 2012-11-15 17:39:28 +11:00