Lines 3-4 were replaced by lines 3-4 |
- The command name is __drive__, as on other instruments. |
- __dr__ may be defined as an alias. |
+ The command name is __DR__. The command __drive__ as used at other instruments is available but behaves |
+ differently. |
At line 5 added 3 lines. |
+ [Markus Zolliker]: ''this behaviour may confuse the user. My proposition is to rename |
+ the original sics drive command and to make __dr__ and __drive__ act similar'' |
+ |
Lines 11-13 were replaced by line 14 |
- Drive within scattering plane: |
- |
- {{drive qh}} ''qh qk ql en'' |
+ Driving Q: |
Line 15 was replaced by line 16 |
- (sinals an error when outside scattering plane): |
+ {{> DR QH}} ''qh qk ql en'' |
Line 17 was replaced by line 18 |
- If ''en'' (the energy transfer value) is omitted, the energy transer |
+ If ''en'' (the energy transfer value) is omitted, the energy transfer |
Lines 19-24 were replaced by line 20 |
- value). It is an error to give less than 3 numbers, or to |
- drive outside the scattering plane. |
- |
- To drive in 3 dimensions: |
- |
- {{drive q3}} ''qh qk ql en'' |
+ value). It is an error to give less than 3 numbers. |
Line 26 was replaced by lines 22-23 |
- For powders (no more switch, qm is in Å-1): |
+ WARNING: The new system allows to drive Q out of plane within the limits of the sample goniometers sgu and sgl. If there is some |
+ sample device on the table which may not be tilted, restrict the movements of sgu and sgl through software limits. |
Line 28 was replaced by lines 25-26 |
- {{drive qm}} ''qm en'' |
+ [Markus Zolliker]: ''this behaviour is dangerous, because people will always forget to set software limits. My proposition is to have different names for Q-variables driven in 2 |
+ and 3 dimensions. An error should be signaled when driving the 2D Q-variable out of plane'' |
Line 30 was replaced by line 28 |
- Driving the energy transfer alone is also possible, (using the last given q values): |
+ For powders (no more powder mode switch, qm is in Å-1): |
Line 32 was replaced by line 30 |
- {{drive en}} ''en'' |
+ {{> DR QM}} ''qm'' {{EN}} ''en'' |
Line 34 was replaced by lines 32-33 |
- Analyzer and monochromator energies are represented by the virtual motors |
+ Driving the energy transfer alone is also possible, (using the last |
+ given q values): |
Line 36 was replaced by line 35 |
- {{ei ki ef kf}} |
+ {{> DR EN}} ''en'' |
Line 38 was replaced by lines 37-38 |
- as in TASMAD. |
+ Analyzer and monochromator energies are represented by the virtual |
+ motors __EI__, __KI__, __EF__ and __KF__, as in TASMAD. |
Lines 41-42 were replaced by lines 41-42 |
- * when real motors are mixed with virtual motors like __qh__, __en__ or __kf__ |
- * when incompatible virtual motors are driven (like __qh__ and __qm__) |
+ * when real motors are mixed with virtual motors like __QH__, __EN__ or __KF__ |
+ * when incompatible virtual motors are driven (like __QH__ and __QM__) |