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

47 Commits

Author SHA1 Message Date
Ferdi Franceschini
a151a2a163 Set motor_driver_type to "asim" when motor_simulation flag is true, otherwise set it to DMC2280. 
r1952 | ffr | 2007-05-10 13:24:28 +1000 (Thu, 10 May 2007) | 2 lines
 2012-11-15 13:16:40 +11:00
Ferdi Franceschini
55347984ec Checked files modified by the merge with: 
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
 2012-11-15 13:16:23 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2 
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:32 +11:00
Ferdi Franceschini
d0b8de93b1 Provided option to use simulated hmm drivers. 
r1852 | ffr | 2007-04-13 12:57:17 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:39 +11:00
Ferdi Franceschini
1c65171e4e Create beam monitor in instrument specific configuration and provide option for creating simulated beam monitor driver. 
r1851 | ffr | 2007-04-13 12:52:49 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:35 +11:00
Ferdi Franceschini
55f45afcc4 Fixes to RELEASE-1_1 
Tubes weren't paired when folding
Fix sign for cartesian coordinates on slits.

r1838 | ffr | 2007-04-06 19:32:57 +1000 (Fri, 06 Apr 2007) | 4 lines
 2012-11-15 13:13:59 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk. 
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
 2012-11-15 13:13:55 +11:00
Ferdi Franceschini
f338cf5b4e Map motor types to hipadaba paths in the motor_hpath tuple list. 
r1787 | ffr | 2007-04-02 18:20:20 +1000 (Mon, 02 Apr 2007) | 2 lines
 2012-11-15 13:13:45 +11:00
Douglas Clowes
636fb54aa7 Make the slits cartesian and do a little cleaning up 
r1781 | dcl | 2007-04-02 15:00:20 +1000 (Mon, 02 Apr 2007) | 2 lines
 2012-11-15 13:13:29 +11:00
Ferdi Franceschini
bb588c7d05 Fixed duplication of ss1u for long_name calls. 
r1768 | ffr | 2007-04-01 12:25:40 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:46 +11:00
Ferdi Franceschini
6d673e01dc Added missing long_name mphi. 
r1767 | ffr | 2007-04-01 12:24:16 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:42 +11:00
Ferdi Franceschini
4712347649 Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields. 
r1766 | ffr | 2007-04-01 11:58:58 +1000 (Sun, 01 Apr 2007) | 2 lines
 2012-11-15 13:12:39 +11:00
Ferdi Franceschini
51079b5e9d Set part names for real motors. 
r1757 | ffr | 2007-03-31 13:34:29 +1000 (Sat, 31 Mar 2007) | 2 lines
 2012-11-15 13:12:09 +11:00
Ferdi Franceschini
db9a45ff1e The instrument specific hmm configurations are now responsible for creating the hmm and hmc objects. This makes it possible to drop dummy or instrumented histogram memory objects into the common setup and control code. 
r1754 | ffr | 2007-03-31 11:30:31 +1000 (Sat, 31 Mar 2007) | 2 lines
 2012-11-15 13:11:59 +11:00
Ferdi Franceschini
d49a7be3bb Create single entry nexus files for scans with instrument state in 1D arrays indexed by scan point. 
Use putslab and sics data objects to grow arrays.

r1725 | ffr | 2007-03-27 08:04:19 +1000 (Tue, 27 Mar 2007) | 3 lines
 2012-11-15 13:10:24 +11:00
Douglas Clowes
5960ce1d00 Modify to use multichannel controller for motor connections 
r1722 | dcl | 2007-03-26 08:09:46 +1000 (Mon, 26 Mar 2007) | 2 lines
 2012-11-15 13:10:14 +11:00
Ferdi Franceschini
5ec8440355 Make mth entry consistent with hipd. 
Use correct units for slit motors.

r1701 | ffr | 2007-03-22 18:37:26 +1100 (Thu, 22 Mar 2007) | 3 lines
 2012-11-15 13:09:15 +11:00
Ferdi Franceschini
aaba6ffb44 Set new browser view display format. 
r1700 | ffr | 2007-03-22 18:34:14 +1100 (Thu, 22 Mar 2007) | 2 lines
 2012-11-15 13:09:12 +11:00
Ferdi Franceschini
737635dbd7 Source common counter configuration. 
r1699 | ffr | 2007-03-22 18:32:29 +1100 (Thu, 22 Mar 2007) | 2 lines
 2012-11-15 13:09:09 +11:00
Douglas Clowes
108d20b2f1 Change mtth softupperlim from 137 to 140 
r1692 | dcl | 2007-03-21 13:22:22 +1100 (Wed, 21 Mar 2007) | 2 lines
 2012-11-15 13:08:50 +11:00
Douglas Clowes
072d0fc1c6 Change mtth hardupperlim from 137 to 140 
r1689 | dcl | 2007-03-20 14:13:17 +1100 (Tue, 20 Mar 2007) | 2 lines
 2012-11-15 13:08:41 +11:00
Ferdi Franceschini
69d58fbaca Reduce entries for each "real" motor to just three types by nexus group. 
TODO: Configurable virtual motors.

r1686 | ffr | 2007-03-20 12:03:35 +1100 (Tue, 20 Mar 2007) | 3 lines
 2012-11-15 13:08:31 +11:00
Ferdi Franceschini
978b06587c Use new hmm setup and initialisation functions and initialise hmm_start to read from the start of the histogram memory for each instrument. 
r1685 | ffr | 2007-03-20 11:59:53 +1100 (Tue, 20 Mar 2007) | 2 lines
 2012-11-15 13:08:28 +11:00
Ferdi Franceschini
da2e771687 Update histogram memory configuration in anticipation of new histogram memory server. 
r1684 | ffr | 2007-03-20 11:57:40 +1100 (Tue, 20 Mar 2007) | 2 lines
 2012-11-15 13:08:24 +11:00
Douglas Clowes
9f49b838cc Increase pcx upper limit after modifying limit switch 
r1641 | dcl | 2007-03-13 12:29:22 +1100 (Tue, 13 Mar 2007) | 2 lines
 2012-11-15 13:06:19 +11:00
Ferdi Franceschini
2f499bfc60 Accidentally added generated files. 
r1637 | ffr | 2007-03-13 09:02:50 +1100 (Tue, 13 Mar 2007) | 2 lines
 2012-11-15 13:06:13 +11:00
Ferdi Franceschini
1fa195b906 Make nexus dics 
r1635 | ffr | 2007-03-13 08:42:53 +1100 (Tue, 13 Mar 2007) | 2 lines
 2012-11-15 13:06:06 +11:00
Ferdi Franceschini
122cdbee9e Initialise and setup hmm. 
r1630 | ffr | 2007-03-12 09:18:03 +1100 (Mon, 12 Mar 2007) | 2 lines
 2012-11-15 13:05:51 +11:00
Douglas Clowes
25f914431d Change reference zero for stth 
r1606 | dcl | 2007-03-06 08:46:51 +1100 (Tue, 06 Mar 2007) | 2 lines
 2012-11-15 13:04:42 +11:00
Ferdi Franceschini
b0f627e642 nexus dic files are now being constructed per use case. 
r1605 | ffr | 2007-03-05 21:05:59 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:04:39 +11:00
Ferdi Franceschini
df9b9e2ff1 Nexus file configuration is now modular. 
r1604 | ffr | 2007-03-05 21:04:40 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:04:36 +11:00
Ferdi Franceschini
efde01a193 Added common nxscript.tcl file. 
r1603 | ffr | 2007-03-05 21:03:52 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:04:32 +11:00
Ferdi Franceschini
b40b38f3e3 List of common configuration files. 
r1593 | ffr | 2007-03-05 18:06:09 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:04:01 +11:00
Ferdi Franceschini
6acd4f19fd Modified to use common configuration 
r1589 | ffr | 2007-03-05 16:43:33 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:03:49 +11:00
Ferdi Franceschini
3de5fefb5e Moved to instrument/config dir to provide a common config file. 
r1588 | ffr | 2007-03-05 16:42:42 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:03:46 +11:00
Ferdi Franceschini
8190bcb43a Added pcr and pcx motors. 
r1583 | ffr | 2007-03-03 11:14:55 +1100 (Sat, 03 Mar 2007) | 2 lines
 2012-11-15 13:03:31 +11:00
Ferdi Franceschini
315240ea52 New config file from Mark Lesha. 
r1578 | ffr | 2007-03-03 09:20:40 +1100 (Sat, 03 Mar 2007) | 2 lines
 2012-11-15 13:03:16 +11:00
Ferdi Franceschini
28a32cb950 Added user group, detector angular coverage, vertical axis and polar angle (currently filled with zeros because I recently broke it) 
r1573 | ffr | 2007-03-03 09:12:38 +1100 (Sat, 03 Mar 2007) | 2 lines
 2012-11-15 13:03:01 +11:00
Ferdi Franceschini
b1724bb541 Put start and end times in each scan point entry. 
r1572 | ffr | 2007-03-03 09:09:22 +1100 (Sat, 03 Mar 2007) | 2 lines
 2012-11-15 13:02:58 +11:00
Douglas Clowes
2a806a7abf Add airpads, settling and motoffdelay for mtth 
r1548 | dcl | 2007-02-23 08:18:25 +1100 (Fri, 23 Feb 2007) | 2 lines
 2012-11-15 13:01:49 +11:00
Douglas Clowes
9e0346f718 Update primary collimator and monochromator config 
r1545 | dcl | 2007-02-22 18:05:57 +1100 (Thu, 22 Feb 2007) | 2 lines
 2012-11-15 13:01:40 +11:00
Ferdi Franceschini
b9da38d603 Structural mods to nexus.dic following Mark Koenneckes review. 
Added support to write 2D polar angle array.

r1540 | ffr | 2007-02-22 16:11:55 +1100 (Thu, 22 Feb 2007) | 3 lines
 2012-11-15 13:01:26 +11:00
Ferdi Franceschini
2f1b481344 Fixed variable reference in hdb_hmscan proc 
r1533 | ffr | 2007-02-20 16:32:21 +1100 (Tue, 20 Feb 2007) | 2 lines
 2012-11-15 13:01:09 +11:00
Ferdi Franceschini
1d82d1b681 Use generic name for scan header. 
r1529 | ffr | 2007-02-20 16:06:09 +1100 (Tue, 20 Feb 2007) | 2 lines
 2012-11-15 13:00:57 +11:00
Ferdi Franceschini
b5d26e4560 Use generic name for nexus dictionary. 
r1528 | ffr | 2007-02-20 16:05:19 +1100 (Tue, 20 Feb 2007) | 2 lines
 2012-11-15 13:00:54 +11:00
Ferdi Franceschini
b88b6f8a05 Modularise to support common info between hrpd and hipd. 
r1521 | ffr | 2007-02-20 08:15:00 +1100 (Tue, 20 Feb 2007) | 2 lines
 2012-11-15 13:00:36 +11:00
Ferdi Franceschini
d5cde7c4f6 Modifications for new util, config directory structure. 
r1498 | ffr | 2007-02-16 16:43:59 +1100 (Fri, 16 Feb 2007) | 2 lines
 2012-11-15 12:59:31 +11:00