Commit Graph

264 Commits

Author SHA1 Message Date
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
Douglas Clowes
98a2081f99 Update safety PLC multichan to remove RS232 controller
r1868 | dcl | 2007-04-18 09:32:58 +1000 (Wed, 18 Apr 2007) | 2 lines
2012-11-15 13:15:05 +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
6d17aca411 Counters have a mode subcommand, not countmode!
r1765 | ffr | 2007-04-01 10:46:51 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:36 +11:00
Ferdi Franceschini
9d9937a5b7 Control simulated hmm driver with simulated counter to mimic the real hmc.
r1764 | ffr | 2007-04-01 10:41:26 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:32 +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
7526a7b93d Modified the simulated hmm configurations so that they now source the common config and override the hmc control, the histogram::initialize and the histogram::hmmdititemval procs.
r1753 | ffr | 2007-03-31 11:27:52 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:56 +11:00
Ferdi Franceschini
307d7ba068 Renamed the dummy hmm control procs to match the names in the real hmm setup.
count_bm_controlled now does a blocking count for the simulated hmm.

r1751 | ffr | 2007-03-31 09:27:28 +1000 (Sat, 31 Mar 2007) | 3 lines
2012-11-15 13:11:49 +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
f6bb48f9e1 Variables to calculate polar angles in a region of interest.
r1632 | ffr | 2007-03-12 09:43:12 +1100 (Mon, 12 Mar 2007) | 2 lines
2012-11-15 13:05:57 +11:00
Ferdi Franceschini
ea3bfe6cbb Added dummy functions to make scan, and nexus operations happy.
r1631 | ffr | 2007-03-12 09:25:56 +1100 (Mon, 12 Mar 2007) | 2 lines
2012-11-15 13:05:54 +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
6eb1a84a53 Run make file in config dir.
r1602 | ffr | 2007-03-05 21:03:31 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:29 +11:00
Ferdi Franceschini
56178e5ca9 Set detector_type and detector_description for wombat.
r1601 | ffr | 2007-03-05 21:02:54 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:26 +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
4567aacb0b Only need anstohm_full.xml
r1575 | ffr | 2007-03-03 09:14:51 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:03:07 +11:00
Ferdi Franceschini
6a8a57e8c4 THIS SHOULD NOT BE HERE!
IT HAS BEEN MOVED TO config/hmm

r1574 | ffr | 2007-03-03 09:13:45 +1100 (Sat, 03 Mar 2007) | 3 lines
2012-11-15 13:03:04 +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
Ferdi Franceschini
1562aa16f0 Create simulated counter.
r1571 | ffr | 2007-03-03 08:52:57 +1100 (Sat, 03 Mar 2007) | 2 lines
2012-11-15 13:02:56 +11:00
Ferdi Franceschini
1ccaf23319 Moved counter config into counter.tcl.
Added dummy functions for simulated hmm

r1570 | ffr | 2007-03-03 08:52:12 +1100 (Sat, 03 Mar 2007) | 3 lines
2012-11-15 13:02:53 +11:00