linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,649 Commits 1 Branch 0 Tags
9281ebf4dd946d01e7661f5606376430e49855fa
Commit Graph

1181 Commits

Author SHA1 Message Date
Jing Chen
9281ebf4dd r3692 | jgn | 2012-08-03 15:34:16 +1000 (Fri, 03 Aug 2012) | 1 line 2012-11-15 17:35:43 +11:00
Jing Chen
27a37364ab Fixing hang-on bug in lfgen protocol 
r3689 | jgn | 2012-08-03 14:09:14 +1000 (Fri, 03 Aug 2012) | 1 line
 2012-11-15 17:35:29 +11:00
Jing Chen
a311f331cd add Dlition Sample temperautre contorl 
r3686 | jgn | 2012-08-01 09:50:08 +1000 (Wed, 01 Aug 2012) | 1 line
 2012-11-15 17:35:19 +11:00
Jing Chen
152d637507 added features 
r3684 | jgn | 2012-07-30 15:22:31 +1000 (Mon, 30 Jul 2012) | 1 line
 2012-11-15 17:35:10 +11:00
Douglas Clowes
6f836ae4cf bring back some changes from the instrument 
r3681 | dcl | 2012-07-26 15:47:15 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:56 +11:00
Douglas Clowes
45549fddb5 Improve logging robustness 
r3680 | dcl | 2012-07-26 15:46:07 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:51 +11:00
Douglas Clowes
d6ad841174 Set auto by default on startup - as per Paolo 
r3679 | dcl | 2012-07-26 15:45:13 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:46 +11:00
Douglas Clowes
8da55b8784 Taipan uses MC1-4,6 and not MC5 
r3678 | dcl | 2012-07-26 12:09:34 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:41 +11:00
Jing Chen
7453eb2458 add new protocl controller for ag1010 
r3674 | jgn | 2012-07-23 13:42:05 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:23 +11:00
Jing Chen
96d8af4de2 add new protocl controller for ag1010 
r3671 | jgn | 2012-07-23 13:41:03 +1000 (Mon, 23 Jul 2012) | 1 line
 2012-11-15 17:34:09 +11:00
Jing Chen
87e623c9af add magnetic 
r3650 | jgn | 2012-07-16 09:56:45 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:40 +11:00
Jing Chen
df847f6239 add magnetic 
r3649 | jgn | 2012-07-16 09:56:37 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:36 +11:00
Jing Chen
e0e7745291 add magnetic 
r3648 | jgn | 2012-07-16 09:56:02 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:31 +11:00
Jing Chen
21af2ad20e add magnetic 
r3647 | jgn | 2012-07-16 09:50:15 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:26 +11:00
Jing Chen
e4a57f0162 add magnetic 
r3646 | jgn | 2012-07-16 09:50:06 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:21 +11:00
Jing Chen
291892e6d7 use same folder name magnetic 
r3645 | jgn | 2012-07-16 09:44:48 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:17 +11:00
Jing Chen
83e8b77271 use same folder name magnetic 
r3643 | jgn | 2012-07-16 09:41:40 +1000 (Mon, 16 Jul 2012) | 1 line
 2012-11-15 17:33:07 +11:00
Ferdi Franceschini
a6fd5af72c Made the isobus address configurable for the Oxford Mercury ITC. 
NOTE: Address is option and defaults to @1
Eg Set tol=5.0 and isobus address= @8 for the Mercury ITC
add_itc500 tc1 localhost 7777 5.0 "@8"

r3642 | ffr | 2012-07-13 15:48:30 +1000 (Fri, 13 Jul 2012) | 5 lines
 2012-11-15 17:33:03 +11:00
Ferdi Franceschini
d85341b8fc Added aerotech motor control for 12T oxford magnet and oxford 
temperatuer controller.

r3641 | ffr | 2012-07-13 15:41:42 +1000 (Fri, 13 Jul 2012) | 3 lines
 2012-11-15 17:32:58 +11:00
Ferdi Franceschini
ff2657c5e3 Update parameters to match parameters on instrument. 
r3629 | ffr | 2012-07-09 09:53:00 +1000 (Mon, 09 Jul 2012) | 2 lines
 2012-11-15 17:32:16 +11:00
Ferdi Franceschini
fd703373d8 New home position readings for Huber cradle. 
r3628 | ffr | 2012-07-09 09:51:37 +1000 (Mon, 09 Jul 2012) | 2 lines
 2012-11-15 17:32:11 +11:00
Ferdi Franceschini
9ef0bb8afd Make sure bmon scans can save scratch files when the savetype is set to nosave. 
r3624 | ffr | 2012-06-29 16:12:30 +1000 (Fri, 29 Jun 2012) | 2 lines
 2012-11-15 17:31:53 +11:00
Ferdi Franceschini
a2a9eb6f72 Fixed typo. Although this didn't seem to cause any problems. 
r3623 | ffr | 2012-06-29 16:05:50 +1000 (Fri, 29 Jun 2012) | 2 lines
 2012-11-15 17:31:48 +11:00
Douglas Clowes
4000de7ec8 Restore stth StepsPerX to 250000 after the coupling was repaired. 
r3618 | dcl | 2012-06-27 15:03:22 +1000 (Wed, 27 Jun 2012) | 1 line
 2012-11-15 17:31:34 +11:00
Ferdi Franceschini
d99d9cc7ee SICS-435: Save setpoint in data file. 
r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines
 2012-11-15 17:31:11 +11:00
Douglas Clowes
393c20b23d Implement a virtuel Ei motor (vei) that does not drive anything but M1 and M2 
r3609 | dcl | 2012-06-19 13:44:11 +1000 (Tue, 19 Jun 2012) | 1 line
 2012-11-15 17:30:57 +11:00
Douglas Clowes
e6c6552bd7 Set the same units and encoder values as in SpICE (point in time) 
r3608 | dcl | 2012-06-19 13:42:14 +1000 (Tue, 19 Jun 2012) | 1 line
 2012-11-15 17:30:52 +11:00
Jing Chen
ca6ee7a191 add switch (on/off) in controlling data recording in log file 
r3601 | jgn | 2012-06-14 11:28:03 +1000 (Thu, 14 Jun 2012) | 1 line
 2012-11-15 17:30:48 +11:00
Jing Chen
50e508d79b r3599 | jgn | 2012-06-12 14:10:46 +1000 (Tue, 12 Jun 2012) | 1 line 2012-11-15 17:30:39 +11:00
Jing Chen
97fcb9ecf3 remove HMM component of Dingo 
r3598 | jgn | 2012-06-12 10:01:17 +1000 (Tue, 12 Jun 2012) | 1 line
 2012-11-15 17:30:34 +11:00
Jing Chen
f6cb6602b1 re-produce package for Dingo 
r3596 | jgn | 2012-06-06 12:01:42 +1000 (Wed, 06 Jun 2012) | 1 line
 2012-11-15 17:30:25 +11:00
Jing Chen
06ab0664eb r3595 | jgn | 2012-06-06 11:30:16 +1000 (Wed, 06 Jun 2012) | 1 line 2012-11-15 17:30:20 +11:00
Jing Chen
dc230ad1ab add items to log file 
r3593 | jgn | 2012-06-05 12:03:28 +1000 (Tue, 05 Jun 2012) | 1 line
 2012-11-15 17:30:10 +11:00
Ferdi Franceschini
a24df1fc78 SICS-477 In the runscan command restrict mode to 'time' and 'monitor' when the detector type is 
set to 'bmon'.  Also check that detector type is either 'bmon' or
'histmem'.

r3592 | ffr | 2012-06-05 08:21:33 +1000 (Tue, 05 Jun 2012) | 4 lines
 2012-11-15 17:30:06 +11:00
Ferdi Franceschini
192baf1e95 SICS-477 Set the detector type to "bmon" for Taipan and lock it so that 
it can't be changed.

r3591 | ffr | 2012-06-04 20:19:00 +1000 (Mon, 04 Jun 2012) | 3 lines
 2012-11-15 17:30:01 +11:00
Ferdi Franceschini
d5da9eba15 SICS-477 Added the "detector" parameter to the "runscan" command tree 
with a default value of "histmem".  Also created a "detector"
convenience macro so that the detector type can be easily queried and
set from the command line.

r3590 | ffr | 2012-06-04 20:16:07 +1000 (Mon, 04 Jun 2012) | 5 lines
 2012-11-15 17:29:56 +11:00
Ferdi Franceschini
6b3f71cc6a SICS-477 Modified the runscan command to do bmon scans as well as 
hmscans.  The type of scan is determined by the new "detector" parameter
on the /commands/scan/runscan tree.  It is fixed to 'bmon' for Taipan
but is selectable on other instruments with default="histmem"

r3589 | ffr | 2012-06-04 20:11:51 +1000 (Mon, 04 Jun 2012) | 5 lines
 2012-11-15 17:29:52 +11:00
Ferdi Franceschini
d71dbd9b9a Load new environment controllers and logbook command. 
r3588 | ffr | 2012-06-04 19:51:33 +1000 (Mon, 04 Jun 2012) | 2 lines
 2012-11-15 17:29:47 +11:00
Ferdi Franceschini
81befc1e0a instrument/MANIFEST.TXT 
r3587 | ffr | 2012-06-04 19:48:54 +1000 (Mon, 04 Jun 2012) | 2 lines
 2012-11-15 17:29:42 +11:00
Ferdi Franceschini
f7ed40b160 Deploy some extra environment controllers to Taipan. 
r3586 | ffr | 2012-06-04 19:45:25 +1000 (Mon, 04 Jun 2012) | 2 lines
 2012-11-15 17:29:38 +11:00
Jing Chen
c3b99ff2f0 update sct_hv.tcl accroing to new requirements 
r3585 | jgn | 2012-06-04 15:42:37 +1000 (Mon, 04 Jun 2012) | 1 line
 2012-11-15 17:29:33 +11:00
Ferdi Franceschini
0b393d04f4 SICS-469: Define a dummy ::histogram_memory::set_sobj_attributes 
function for Taipan because SICS will abort setting the attributes on
other objects if this raises an error.  This means that some objects
like environment controllers (eg ls340) won't be added to the control
interface or saved in the data file.

r3584 | ffr | 2012-06-04 13:21:42 +1000 (Mon, 04 Jun 2012) | 6 lines
 2012-11-15 17:29:29 +11:00
Jing Chen
9518e46440 remove hmm from Dingo 
r3575 | jgn | 2012-06-04 09:34:16 +1000 (Mon, 04 Jun 2012) | 1 line
 2012-11-15 17:29:24 +11:00
Jing Chen
66aa3f943c create initial SICS file for Dingo 
r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
 2012-11-15 17:29:19 +11:00
Douglas Clowes
6b6838eaae Do NOT fix the motors here 
r3559 | dcl | 2012-05-30 14:38:28 +1000 (Wed, 30 May 2012) | 1 line
 2012-11-15 17:29:14 +11:00
Douglas Clowes
d057d0e7dc WIP Commissioning refinement 
r3558 | dcl | 2012-05-30 14:37:44 +1000 (Wed, 30 May 2012) | 1 line
 2012-11-15 17:29:10 +11:00
Douglas Clowes
85d88a7bc6 WIP Commissioning refinement 
r3557 | dcl | 2012-05-30 14:09:27 +1000 (Wed, 30 May 2012) | 1 line
 2012-11-15 17:29:05 +11:00
Jing Chen
ac494897c6 move lcoation of sct_hv.tcl 
r3556 | jgn | 2012-05-30 11:54:14 +1000 (Wed, 30 May 2012) | 1 line
 2012-11-15 17:29:01 +11:00
Jing Chen
d3390e278d move file sct_hv.tcl to ./hmm 
r3555 | jgn | 2012-05-30 11:52:58 +1000 (Wed, 30 May 2012) | 1 line
 2012-11-15 17:28:56 +11:00
Jing Chen
915ab1a0a2 replace name hv_control.tcl with sct_hv.tcl 
r3554 | jgn | 2012-05-30 11:50:11 +1000 (Wed, 30 May 2012) | 1 line
 2012-11-15 17:28:51 +11:00