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

1609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
b8c3bc3acd bugfix: was overwriting short constant string or argv 
r3635 | dcl | 2012-07-11 12:04:43 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:30 +11:00
Douglas Clowes
6a539d2321 string literals are now const so declare args as such to suppress compiler warnings 
r3634 | dcl | 2012-07-11 11:59:16 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:25 +11:00
Douglas Clowes
556b69063c bugfix: was overwriting short constant string or argv 
r3633 | dcl | 2012-07-11 11:56:25 +1000 (Wed, 11 Jul 2012) | 1 line
 2012-11-15 17:32:21 +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
db8c6d6004 In monitor mode the multicounter should stop when the monitor is idle 
unless one of the other counters is in fault, nobeam or paused.
In timer mode the multicounter should stop when all the counters are idle
unless one of the other counters is in fault, nobeam or paused.

r3627 | ffr | 2012-07-06 07:49:07 +1000 (Fri, 06 Jul 2012) | 5 lines
 2012-11-15 17:32:07 +11:00
Ferdi Franceschini
540aaccc48 SICS-486: When in timer mode only stop the multicounter when all of the slaves are 
idle or at the first slave which reports a fault.
NOTE: If slave[0] == pause and slave[1] == fault then the multicounter will pause and then
possibly fail if slave[1] is still in fault when slave[0] continues.

r3626 | ffr | 2012-07-02 09:38:29 +1000 (Mon, 02 Jul 2012) | 5 lines
 2012-11-15 17:32:02 +11:00
Ferdi Franceschini
683e73b4e0 SICS-488: In monitor controlled acquisitions normalise the slave counts 
against slave time and monitor time and set slave time = monitor time.

r3625 | ffr | 2012-06-29 16:15:04 +1000 (Fri, 29 Jun 2012) | 3 lines
 2012-11-15 17:31:58 +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
66caf6916b Don't change anything on startup, defer settings until moving and then do each time 
We don't want to change anything on the controller when we start SICS so we don't interfere with whatever else is talking to it. So don't command it during init.

We also want to send Speed, Accel and Decel on each move so we defer those until then.
r3622 | dcl | 2012-06-28 15:39:47 +1000 (Thu, 28 Jun 2012) | 5 lines
 2012-11-15 17:31:44 +11:00
Douglas Clowes
2c4f45b573 Try to defer HWIdle notification until the motor is really idle 
r3620 | dcl | 2012-06-27 15:11:04 +1000 (Wed, 27 Jun 2012) | 1 line
 2012-11-15 17:31:39 +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
Douglas Clowes
eeac77f9ce Refactor the timer clearing; force timer clear on set; improve the tracing of timer operations. 
r3616 | dcl | 2012-06-26 14:36:32 +1000 (Tue, 26 Jun 2012) | 1 line
 2012-11-15 17:31:30 +11:00
Ferdi Franceschini
5dd1ff27a4 If the multicounter is set to count controlled mode then set all slave counters to timer mode with a preset time of one year 
otherwise set them to the given mode and preset.

r3615 | ffr | 2012-06-22 18:30:59 +1000 (Fri, 22 Jun 2012) | 3 lines
 2012-11-15 17:31:25 +11:00
Ferdi Franceschini
f8124ccc5c SICS-485: Revert r3251 so that we can set "mot interruptmode" to control the if an 
HWFault aborts a scan or batch file.

r3614 | ffr | 2012-06-21 18:09:49 +1000 (Thu, 21 Jun 2012) | 3 lines
 2012-11-15 17:31:20 +11:00
Douglas Clowes
79c4acc5ad Reverse compare operator to correct report rate logic 
r3613 | dcl | 2012-06-20 14:57:37 +1000 (Wed, 20 Jun 2012) | 1 line
 2012-11-15 17:31:16 +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
da624bba07 Change movecount to millisecond rather than loop count because of faster loop count on newere hardware/software 
r3611 | dcl | 2012-06-19 14:01:09 +1000 (Tue, 19 Jun 2012) | 1 line
 2012-11-15 17:31:07 +11:00
Douglas Clowes
6891ac08ee Add the date to the start of message in the log 
r3610 | dcl | 2012-06-19 14:00:10 +1000 (Tue, 19 Jun 2012) | 1 line
 2012-11-15 17:31:02 +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
Douglas Clowes
9fa9bcf4f9 Make the MOTEND reporting into a one-shot 
r3600 | dcl | 2012-06-13 17:15:41 +1000 (Wed, 13 Jun 2012) | 1 line
 2012-11-15 17:30:43 +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
843c12d208 add Dingo into Makefile 
r3597 | jgn | 2012-06-07 09:49:10 +1000 (Thu, 07 Jun 2012) | 1 line
 2012-11-15 17:30:29 +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
Ferdi Franceschini
dbef490724 getpar has a FUPAOPT argument which should be returned as text not as an 
iVal. See pg 237 (Function Parser) of the SICS reference manual or the
comment in fupa.h

r3594 | ffr | 2012-06-06 09:07:01 +1000 (Wed, 06 Jun 2012) | 4 lines
 2012-11-15 17:30:15 +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
Douglas Clowes
4887c8959a New 'limswi' function/command found on Pelican 
r3553 | dcl | 2012-05-29 10:27:54 +1000 (Tue, 29 May 2012) | 1 line
 2012-11-15 17:28:47 +11:00
Douglas Clowes
a9a90feaaf Bring into step with instrument 
r3552 | dcl | 2012-05-24 13:53:53 +1000 (Thu, 24 May 2012) | 1 line
 2012-11-15 17:28:42 +11:00