Auto-update from Github Actions Workflow

Deployed from commit 17a5f68 (refs/heads/master)

Deployed from commit 964d341 (refs/heads/master)

Author: github-actions

master/_sources/lcls-twincat-pmps_PMPS_source.rst.txt

@@ -9199,6 +9199,9 @@ FB_SXU
     VAR
         // From lcls-srv01: grep -e KDes  /u1/lcls/epics/ioc/data/sioc-unds-uc*/iocInfo/IOC.pvlist |sort
 
+        {attribute 'pytmc' := 'pv: 21; link: 2150:'}
+        fbSegment_21 : FB_UndulatorSegment;
+
         {attribute 'pytmc' := 'pv: 22; link: 2250:'}
         fbSegment_22 : FB_UndulatorSegment;
 
@@ -9289,7 +9292,7 @@ FB_SXU
         {attribute 'pytmc' := '
             pv: FirstSegment
             io: i'}
-        iLowBound  : UDINT := 22;
+        iLowBound  : UDINT := 21;
         {attribute 'pytmc' := '
             pv: LastSegment
              io: i'}
@@ -9333,6 +9336,7 @@ FB_SXU
         IF fbSegment[iIndex] <> 0 THEN
             fbCurrentSegment REF= fbSegment[iIndex]^;
             fbCurrentSegment(fbElectronEnergy:=fbElectronEnergy);
+            fbCurrentSegment.fPeriod_mm := fbCurrentSegment.fLambda_U*1000;
 
             //Mark the seed undulator, first undulator operating within K bounds
             IF fbCurrentSegment.xActive AND nSeedUndulator = 0 THEN
@@ -9365,15 +9369,17 @@ FB_SXU
             fbCurrentSegment REF= fbSegment[iIndex]^;
             fbCurrentSegment.fLowK := fLowK;
             fbCurrentSegment.fHiK := fHiK;
-            IF (iIndex >= 26)  THEN fbCurrentSegment.fPeriod_mm := fPeriod_39_mm;
-                ELSE fbCurrentSegment.fPeriod_mm := fPeriod_56_mm;
-            END_IF
         END_IF
     END_FOR
     bInitialized := TRUE;
     END_ACTION
 
     ACTION UndAdrUpdate:
+    fbSegment[21] := 0;
+    fbSegment[22] := ADR(fbSegment_22);
+    fbSegment[23] := ADR(fbSegment_23);
+    fbSegment[24] := ADR(fbSegment_24);
+    fbSegment[25] := ADR(fbSegment_25);
     fbSegment[26] := ADR(fbSegment_26);
     fbSegment[27] := ADR(fbSegment_27);
     fbSegment[28] := ADR(fbSegment_28);
@@ -9516,8 +9522,9 @@ FB_UndulatorSegment
 
     FUNCTION_BLOCK FB_UndulatorSegment
     VAR_INPUT
-        (* Undulator period in millimeters, to be set by subclasses *)
+        (* Undulator period in millimeters, to be set by subclasses for HXR, read by pv for SXR, left here for backward compatability *)
         fPeriod_mm : LREAL := 1.0;
+
         fbElectronEnergy : REFERENCE TO FB_LREALFromEPICS;
 
         fLowK : LREAL := 0;
@@ -9570,7 +9577,14 @@ FB_UndulatorSegment
         '}
         fKDes : LREAL;
 
-            {attribute 'pytmc' := '
+        {attribute 'pytmc' := '
+            pv: Lambda_U
+            io: i
+            field: DESC Period in m
+        '}
+        fLambda_U : LREAL;
+
+        {attribute 'pytmc' := '
             pv: KActValid
             io: i
             field: DESC Current K Readback Valid
@@ -9584,6 +9598,14 @@ FB_UndulatorSegment
         '}
         bKDesValid : BOOL;
 
+         {attribute 'pytmc' := '
+            pv: lambdaValid
+            io: i
+            field: DESC lambda_U Readback Valid
+        '}
+        blambdaValid : BOOL;
+
+
     END_VAR
 
     VAR
@@ -9599,18 +9621,27 @@ FB_UndulatorSegment
         '}
         fbKActual : FB_LREALFromEPICS;
 
+        {attribute 'pytmc' := '
+            pv: lambda_U
+            link: lambda_U
+        '}
+        fblambda_U : FB_LREALFromEPICS;
+
     END_VAR
     fbKDesired();
     fbKActual();
+    fblambda_U();
 
     fKAct := fbKActual.fValue;
     bKActValid := fbKActual.bValid;
     fKDes := fbKDesired.fValue;
     bKDesValid := fbKDesired.bvalid;
+    fLambda_U := fblambda_U.fValue;
+    blambdaValid:= fblambda_U.bValid;
 
     IF __ISVALIDREF(fbElectronEnergy) THEN
 
-        IF fbKActual.bValid AND fbElectronEnergy.bValid THEN
+        IF fbKActual.bValid AND fblambda_U.bValid AND fbElectronEnergy.bValid THEN
             fPhotonEnergyAct := F_CalculatePhotonEnergy(
                 fElectronEnergy_GeV:=fbElectronEnergy.fValue,
                 fUndulatorPeriod_mm:=fPeriod_mm,
@@ -9630,7 +9661,7 @@ FB_UndulatorSegment
                         (NOT fbKDesired.bValid OR NOT fbKDesired.bValid);
         END_IF
 
-        IF fbKDesired.bValid AND fbElectronEnergy.bValid THEN
+        IF fbKDesired.bValid AND fblambda_U.bValid AND fbElectronEnergy.bValid THEN
             fPhotonEnergyDes := F_CalculatePhotonEnergy(
                 fElectronEnergy_GeV:=fbElectronEnergy.fValue,
                 fUndulatorPeriod_mm:=fPeriod_mm,

master/_sources/lcls-twincat-pmps_PMPS_summary.rst.txt

@@ -24,7 +24,7 @@ Settings
 Pragmas
 -------
 
-Total pragmas found: 279
+Total pragmas found: 283
 Total linter errors: 0
 
 

master/_sources/lcls-twincat-pmps_pragmas.rst.txt

@@ -6,7 +6,7 @@ Pragmas
     :header: PLC Name, Total Pragmas, Errors
     :align: center
 
-    :ref:`PMPS <PMPS_overview_pragmas>`, 279, 0
+    :ref:`PMPS <PMPS_overview_pragmas>`, 283, 0
 
 
 .. _PMPS_overview_pragmas:
@@ -15,7 +15,7 @@ Pragmas
 PMPS
 ^^^^
 
-Total pragmas found: 279
+Total pragmas found: 283
 Total linter errors: 0