Auto-update from Github Actions Workflow

Deployed from commit 07bbf55 (refs/heads/master)

Deployed from commit 973555b (refs/heads/master)

Deployed from commit 6b2dd01 (refs/heads/master)

Deployed from commit 6b4dd0b (refs/heads/master)

Deployed from commit 1f6ad49 (refs/heads/master)

Deployed from commit b0ba2e1 (refs/heads/master)

Deployed from commit 5aaf273 (refs/heads/master)

master/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: da3d56a0222bc40a26ade01531cb1e35
+config: a3bb70f5c13f78c386c2694e23698069
 tags: 645f666f9bcd5a90fca523b33c5a78b7

master/_sources/lcls-plc-rixs-optics_nc.rst.txt

@@ -653,17 +653,19 @@ Axis 19: SL1K2-Pitch-M19
     Enc:EncType, 29
     Enc:Inc:RefSoftSyncMask, #x0000ffff
     Enc:MaxCount, #xffffffff
-    Enc:Offset, -2.626
-    Enc:ScaleFactorNumerator, 7.1573649e-08
+    Enc:Offset, -0.266
+    Enc:ScaleFactorNumerator, 7.2519e-09
     Enc:SoftEndMaxControl:Enable, true
-    Enc:SoftEndMaxControl:Range, 1.9
+    Enc:SoftEndMaxControl:Range, 0.19
     Enc:SoftEndMinControl:Enable, true
-    Enc:SoftEndMinControl:Range, -1.9
+    Enc:SoftEndMinControl:Range, -0.19
     General:UnitName, Degree
     Id, 19
     OtherSettings:AllowMotionCmdToSlave, true
     OtherSettings:PulseDistanceNeg, 0.5
     OtherSettings:PulseDistancePos, 0.5
+    PEHControl:Time, 10
+    PositionAreaControl:Range, 0.01
     TargetPosControl:Range, 0.001
     Velo:FastManual, 2
     Velo:Maximum, 0.25
@@ -755,26 +757,27 @@ Axis 22: SL1K2-CrystalGap-M22
     AxisFolder, SL1K2
     AxisType, 1
     CreateSymbols, true
-    Dynamic:Acceleration, 0.0966002
-    Dynamic:Deceleration, 0.0966002
-    Dynamic:Jerk, 0.101984
+    Dynamic:Acceleration, 90
+    Dynamic:Deceleration, 200
+    Dynamic:Jerk, 200
     Enc:EncType, 29
     Enc:Inc:RefSoftSyncMask, #x0000ffff
     Enc:MaxCount, #xffffffff
-    Enc:Offset, -20.3002
-    Enc:ScaleFactorNumerator, 1e-06
+    Enc:Offset, -20225.2
+    Enc:ScaleFactorNumerator, 0.001
     Enc:SoftEndMaxControl:Enable, true
-    Enc:SoftEndMaxControl:Range, 11
+    Enc:SoftEndMaxControl:Range, 11000
     Enc:SoftEndMinControl:Enable, true
-    Enc:SoftEndMinControl:Range, 0.02
+    Enc:SoftEndMinControl:Range, 20
+    General:UnitName, um
     Id, 22
     OtherSettings:AllowMotionCmdToSlave, true
     OtherSettings:PulseDistanceNeg, 0.05
     OtherSettings:PulseDistancePos, 0.05
-    PositionAreaControl:Range, 0.01
-    TargetPosControl:Range, 0.0001
+    TargetPosControl:Range, 0.05
+    TargetPosControl:Time, 0.1
     Velo:FastManual, 0.2
-    Velo:Maximum, 0.15
+    Velo:Maximum, 150
     Velo:SlowManual, 0.075
 
 

master/_sources/lcls-plc-rixs-optics_rixs_optics_source.rst.txt

@@ -253,8 +253,8 @@ GVL_M1K2_Constants
     VAR_GLOBAL CONSTANT
         // Encoder reference values in counts = nm
         // Enc reference values after alignment 3-13-20
-        nYLEFT_ENC_REF : ULINT := 96270560;
-        nYRIGHT_ENC_REF : ULINT := 98728200;
+        nYLEFT_ENC_REF : ULINT := 99171678;
+        nYRIGHT_ENC_REF : ULINT := 101371326;
         nXUP_ENC_REF : ULINT := 19501048;
         nXDWN_ENC_REF : ULINT := 20872028;
 
@@ -430,15 +430,17 @@ Main
         (*MR1K2*)
         // Motors
         {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[EL7047_M1K2_Yleft]^STM Status^Status^Digital input 1;
-                                  .bLimitBackwardEnable:=TIIB[EL7047_M1K2_Yleft]^STM Status^Status^Digital input 2'}
+                                  .bLimitBackwardEnable:=TIIB[EL7047_M1K2_Yleft]^STM Status^Status^Digital input 2;
+                                  .nRawEncoderULINT:=TIIB[EL5042_M1K2_Yleftright]^FB Inputs Channel 1^Position'}
         {attribute 'pytmc' := '
             pv: MR1K2:SWITCH:MMS:YLEFT
         '}
         M1 : ST_MotionStage := (fVelocity:=100.0, nEnableMode:=ENUM_StageEnableMode.ALWAYS, bPowerSelf:=True); // M1K2 Yleft
         fbMotionStage_m1 : FB_MotionStage;
 
         {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[EL7047_M1K2_Yright]^STM Status^Status^Digital input 1;
-                                  .bLimitBackwardEnable:=TIIB[EL7047_M1K2_Yright]^STM Status^Status^Digital input 2'}
+                                  .bLimitBackwardEnable:=TIIB[EL7047_M1K2_Yright]^STM Status^Status^Digital input 2;
+                                  .nRawEncoderULINT:=TIIB[EL5042_M1K2_Yleftright]^FB Inputs Channel 2^Position'}
         {attribute 'pytmc' := '
             pv: MR1K2:SWITCH:MMS:YRIGHT
         '}
@@ -2362,6 +2364,10 @@ PRG_MR1K2_SWITCH
     M2.bExecute := FALSE; // M1K2-Yright
     M4.bExecute := FALSE; // M1K2-Xdwn
 
+    //Forcing limit switches for M1K2 pitch as the limit switches are no longer installed per ME they aren't able to install them precisely
+    M5.bLimitBackwardEnable := TRUE;
+    M5.bLimitForwardEnable := TRUE;
+
     // Convert nCurrGantry to um (smaller number) to read out in epics
     M1K2.fCurrGantryY_um := LINT_TO_REAL(M1K2.nCurrGantryY) / 1000.0;
     M1K2.fCurrGantryX_um := LINT_TO_REAL(M1K2.nCurrGantryX) / 1000.0;
@@ -3269,7 +3275,7 @@ PRG_SL1K2_EXIT
         Main.M22.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;
         //YAG
         Main.M23.bHardwareEnable := TRUE;
-        Main.M23.bPowerSelf :=TRUE;
+        Main.M23.bPowerSelf :=FALSE;
         Main.M23.nBrakeMode := ENUM_StageBrakeMode.NO_BRAKE;
         Main.M23.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;
 
@@ -3303,6 +3309,8 @@ PRG_SL1K2_EXIT
     fbPitch(stMotionStage:=Main.M19);//in Air
     fbRoll(stMotionStage:=Main.M20);//in Air
     fbVertical(stMotionStage:=Main.M21);//in Air
+
+    Main.M22.bLimitBackwardEnable := TRUE;
     fbGap(stMotionStage:=Main.M22);//in vacuum
     fbYag(stMotionStage:=Main.M23);//in vacuum
 
@@ -4023,8 +4031,8 @@ PRG_ZeroOrder_PMPS
     END_ACTION
 
     ACTION ACT_ExitSlitsGap:
-    // FAULT condition: Hzos -1.0mm <= Hb0m3) AND sl1k2 gap <= 8.0
-    ffZeroOrderBeamExitSlits.i_xOK := NOT( (( (Hzos*1E3) - 1) <= Hb0m3) AND ( M22.stAxisStatus.fActPosition <= 8.0));
+    // FAULT condition: Hzos -1.0mm <= Hb0m3) AND sl1k2 gap <= 8.0 mm
+    ffZeroOrderBeamExitSlits.i_xOK := NOT( (( (Hzos*1E3) - 1) <= Hb0m3) AND ( M22.stAxisStatus.fActPosition <= 8000(*um*)));
     ffZeroOrderBeamExitSlits(io_fbFFHWO := GVL_PMPS.fbFastFaultOutput1);
     END_ACTION