Ferdi Franceschini eea4d4d9eb L2mm depends on sample position (ported from RELEASE-2_0P1) ...

r2634 | ffr | 2008-06-18 10:56:27 +1000 (Wed, 18 Jun 2008) | 2 lines

2012-11-15 13:39:38 +11:00

..

anticollider

Manually merged the following changes from RELEASE-2_0P1

2012-11-15 13:39:18 +11:00

commands

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

counter

Merged new hdb and nexus code.

2012-11-15 13:21:03 +11:00

hipadaba

Merged new hdb and nexus code.

2012-11-15 13:21:03 +11:00

hmm

Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )

2012-11-15 13:39:10 +11:00

motors

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

nexus

Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.

2012-11-15 13:29:33 +11:00

optics

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

parameters

L2mm depends on sample position (ported from RELEASE-2_0P1)

2012-11-15 13:39:38 +11:00

plc

Change over to Quokka SIS PLC address

2012-11-15 13:36:21 +11:00

scan

Added placeholder for pre_hmscan_prepare hook.

2012-11-15 13:28:48 +11:00

velsel

Merged new hdb and nexus code.

2012-11-15 13:21:03 +11:00

INSTCFCOMMON.TXT

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

Makefile

Nexus dictionaries are now generated dynamically from the hdb tree, we no longer need to cobble together operation specific dictionaries when deploying SICS.

2012-11-15 13:29:33 +11:00