diff --git a/PPMACMotor.template b/PPMACMotor.template index cdc4fbb..08029c8 100644 --- a/PPMACMotor.template +++ b/PPMACMotor.template @@ -15,6 +15,7 @@ record(motor,"$(P):$(M)") field(EGU,"$(EGU=ustep)") field(DHLM,"$(DHLM=0)") field(DLLM,"$(DLLM=0)") - field(MDEL,"$(MDEL=0)") + field(MDEL,"$(MDEL=0.001)") + field(TWV,"$(TWV=0.1)") field(RTRY,"0") } diff --git a/SAR-EXPMX1.subs b/SAR-EXPMX1.subs index 85ad705..96ce2b2 100644 --- a/SAR-EXPMX1.subs +++ b/SAR-EXPMX1.subs @@ -17,8 +17,8 @@ file asyn.template {{P="$(P_M)1", PORT=$(PORT_M)}} file PPMACMotor.template { pattern{ DESC , P , M , PORT , ADDR, DIR, VELO, HVEL, ACCL, JAR, MRES , PREC, EGU , DHLM, DLLM} - { "Sample F-Trans Y", "$(P_M)", "MOT_FY" , "$(PORT_M)", 1 , 0 , 2 , 2 , 0.1 , 20 , 0.001, 4 , "mm" , 0 , 0 } - { "Sample F-Trans X", "$(P_M)", "MOT_FX" , "$(PORT_M)", 2 , 1 , 2 , 2 , 0.1 , 20 , 0.001, 4 , "mm" , 0 , 0 } + { "Sample F-Trans Y", "$(P_M)", "MOT_FY" , "$(PORT_M)", 1 , 0 , 16 , 2 , 0.1 , 20 , 0.001, 4 , "mm" , 0 , 0 } + { "Sample F-Trans X", "$(P_M)", "MOT_FX" , "$(PORT_M)", 2 , 1 , 16 , 2 , 0.1 , 20 , 0.001, 4 , "mm" , 0 , 0 } { "Rotation Y" , "$(P_M)", "MOT_ROT_Y", "$(PORT_M)", 3 , 0 , 50 , 50 , 0.1 , 20 , 0.001, 4 , "deg", 0 , 0 } { "Sample C-Trans X", "$(P_M)", "MOT_CX" , "$(PORT_M)", 4 , 1 , 2 , 2 , 0.1 , 20 , 0.001, 4 , "mm" , 0 , 0 } { "Sample C-Trans Z", "$(P_M)", "MOT_CZ" , "$(PORT_M)", 5 , 1 , 2 , 2 , 0.1 , 20 , 0.001, 4 , "mm" , 0 , 0 } diff --git a/SAR-EXPMX3.subs b/SAR-EXPMX3.subs index 295a21e..ca5ef27 100644 --- a/SAR-EXPMX3.subs +++ b/SAR-EXPMX3.subs @@ -26,5 +26,5 @@ pattern { "Girder U", "$(P_M)", "MOT_GIR_U", "$(PORT_M)", 11 , 0 , 40 , 0.001, 3 , "mrad"} { "Girder V", "$(P_M)", "MOT_GIR_V", "$(PORT_M)", 12 , 0 , 40 , 0.001, 3 , "mrad"} { "Girder W", "$(P_M)", "MOT_GIR_W", "$(PORT_M)", 13 , 0 , 40 , 0.001, 3 , "mrad"} -{ "Detector Z", "$(P_M)", "MOT_DET_Z", "$(PORT_M)", 6 , 0 , 2 , 0.001, 3 , "mm" } +{ "Detector Z", "$(P_M)", "MOT_DET_Z", "$(PORT_M)", 6 , 1 , 4 , 0.001, 3 , "mm" } }