I07-366 Rationalise DIFF1 motor names

The ScannableMotor names in GDA will no longer be named specific to
the mode, instead will be using the name on the Epics scren prefixed
with "diff1".

Author: joeshannon

startup/i07EH1h.py

@@ -2,7 +2,7 @@
 from diffcalc.settings import NUNAME
 
 if GDA:    
-    from __main__ import diff1vdelta, diff1halpha, diff1vgamma, diff1homega, dcm1energy # @UnresolvedImport
+    from __main__ import diff1delta, diff1chi, diff1gamma, diff1theta, dcm1energy # @UnresolvedImport
 
 from diffcalc.hkl.you.geometry import YouRemappedGeometry
 
@@ -34,11 +34,11 @@ def __init__(self, beamline_axes_transform=None):
 ### Create dummy scannables ###
 if GDA:  
     ###map GDA scannable to diffcalc axis name###
-    _fourc = ScannableGroup('_fourc', (diff1vdelta, diff1vgamma, diff1halpha, diff1homega))
-    delta=_fourc.diff1vdelta
-    gam=_fourc.diff1vgamma
-    eta=_fourc.diff1halpha
-    phi=_fourc.diff1homega
+    _fourc = ScannableGroup('_fourc', (diff1delta, diff1gamma, diff1chi, diff1theta))
+    delta=_fourc.diff1delta
+    gam=_fourc.diff1gamma
+    eta=_fourc.diff1chi
+    phi=_fourc.diff1theta
     en=dcm1energy
     if float(en.getPosition()) == 0: # no energy value - dummy mode
         en(800)

startup/i07EH1v.py

@@ -2,7 +2,7 @@
 from diffcalc.settings import NUNAME
 
 if GDA:    
-    from __main__ import diff1vdelta, diff1valpha, diff1vgamma, diff1vomega, dcm1energy # @UnresolvedImport
+    from __main__ import diff1delta, diff1alpha, diff1gamma, diff1omega, dcm1energy # @UnresolvedImport
 
 from diffcalc.hkl.you.geometry import YouGeometry, YouPosition
 
@@ -28,11 +28,11 @@ def internal_position_to_physical_angles(self, internal_position):
 ### Create dummy scannables ###
 if GDA:  
     ###map GDA scannable to diffcalc axis name###
-    _fourc = ScannableGroup('_fourc', (diff1vdelta, diff1vgamma, diff1valpha, diff1vomega))
-    delta=_fourc.diff1vdelta
-    gam=_fourc.diff1vgamma
-    mu=_fourc.diff1valpha
-    phi=_fourc.diff1vomega
+    _fourc = ScannableGroup('_fourc', (diff1delta, diff1gamma, diff1alpha, diff1omega))
+    delta=_fourc.diff1delta
+    gam=_fourc.diff1gamma
+    mu=_fourc.diff1alpha
+    phi=_fourc.diff1omega
     en=dcm1energy
 else:
     #Create dummy axes to run outside GDA in IPython#