Skip to content

Commit

Permalink
Merge pull request #129 from ghalym/SXU
Browse files Browse the repository at this point in the history 
DEV: Additional UND on SXU Jira ECS-7229
  • Loading branch information
@ghalym
ghalym authored Feb 24, 2025
2 parents 8dba453 + aa80571 commit 96a1adb
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 24 deletions.
31 changes: 26 additions & 5 deletions lcls-twincat-pmps/PMPS/MajorComponents/PhotonEnergyInterface/FB_SXU.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,17 @@ END_VAR
VAR
// From lcls-srv01: grep -e KDes /u1/lcls/epics/ioc/data/sioc-unds-uc*/iocInfo/IOC.pvlist |sort
{attribute 'pytmc' := 'pv: 22; link: 2250:'}
fbSegment_22 : FB_UndulatorSegment;
{attribute 'pytmc' := 'pv: 23; link: 2350:'}
fbSegment_23 : FB_UndulatorSegment;
{attribute 'pytmc' := 'pv: 24; link: 2450:'}
fbSegment_24 : FB_UndulatorSegment;
{attribute 'pytmc' := 'pv: 25; link: 2550:'}
fbSegment_25 : FB_UndulatorSegment;
{attribute 'pytmc' := 'pv: 26; link: 2650:'}
fbSegment_26 : FB_UndulatorSegment;
Expand Down Expand Up @@ -121,22 +132,30 @@ VAR CONSTANT
{attribute 'pytmc' := '
pv: FirstSegment
io: i'}
iLowBound : UDINT := 26;
iLowBound : UDINT := 22;
{attribute 'pytmc' := '
pv: LastSegment
io: i'}
iHighBound : UDINT := 47;
{attribute 'pytmc' := '
pv: Period
pv: Period_Short
io: i
field: EGU mm
'}
fPeriod_39_mm : LREAL := 39.0;
{attribute 'pytmc' := '
pv: Period_Long
io: i
field: EGU mm
'}
fPeriod_mm : LREAL := 39.0;
fPeriod_56_mm : LREAL := 56.0;
{attribute 'pytmc' := '
pv: LowK
io: i
'}
fLowK : LREAL := 1.5;
fLowK : LREAL := 0.8;
{attribute 'pytmc' := '
pv: HiK
Expand Down Expand Up @@ -191,9 +210,11 @@ UndAdrUpdate();
FOR iIndex := iLowBound TO iHighBound DO
IF fbSegment[iIndex] <> 0 THEN
fbCurrentSegment REF= fbSegment[iIndex]^;
fbCurrentSegment.fPeriod_mm := fPeriod_mm;
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;]]></ST>
Expand Down
38 changes: 19 additions & 19 deletions lcls-twincat-pmps/PMPS/PMPS.tmc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{09D65632-4EAE-DD58-9808-D9977E35731C}" GeneratedBy="TwinCAT XAE Plc">
<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{037C61AE-BE1D-161C-0F5F-E50C8C1EE006}" GeneratedBy="TwinCAT XAE Plc">
<DataTypes>
<DataType>
<Name Namespace="Tc2_System">T_MaxString</Name>
Expand Down Expand Up @@ -8831,31 +8831,31 @@
<Name>bBusy</Name>
<Type>BOOL</Type>
<BitSize>8</BitSize>
<GetCodeOffs>80255500</GetCodeOffs>
<GetCodeOffs>80255332</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>bError</Name>
<Type>BOOL</Type>
<BitSize>8</BitSize>
<GetCodeOffs>80255536</GetCodeOffs>
<GetCodeOffs>80255368</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>hrErrorCode</Name>
<Type GUID="{18071995-0000-0000-0000-000000000019}">HRESULT</Type>
<BitSize>32</BitSize>
<GetCodeOffs>80255544</GetCodeOffs>
<GetCodeOffs>80255376</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>nStringSize</Name>
<Type>UDINT</Type>
<BitSize>32</BitSize>
<GetCodeOffs>80255524</GetCodeOffs>
<GetCodeOffs>80255356</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>sResult</Name>
<Type>STRING(255)</Type>
<BitSize>2048</BitSize>
<GetCodeOffs>80255540</GetCodeOffs>
<GetCodeOffs>80255372</GetCodeOffs>
</PropertyItem>
<Method>
<Name RpcEnable="plc" VTableIndex="0">__getbBusy</Name>
Expand Down Expand Up @@ -10094,15 +10094,15 @@
<Name>nId</Name>
<Type>UDINT</Type>
<BitSize>32</BitSize>
<GetCodeOffs>80255440</GetCodeOffs>
<SetCodeOffs>80255464</SetCodeOffs>
<GetCodeOffs>80255272</GetCodeOffs>
<SetCodeOffs>80255296</SetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>sName</Name>
<Type>STRING(255)</Type>
<BitSize>2048</BitSize>
<GetCodeOffs>80255480</GetCodeOffs>
<SetCodeOffs>80255492</SetCodeOffs>
<GetCodeOffs>80255312</GetCodeOffs>
<SetCodeOffs>80255324</SetCodeOffs>
</PropertyItem>
<Method>
<Name>ExtendName</Name>
Expand Down Expand Up @@ -10348,37 +10348,37 @@
<Name>eSeverity</Name>
<Type GUID="{B57D3F4A-0836-49B0-81C3-BED5F4817EC9}">TcEventSeverity</Type>
<BitSize>16</BitSize>
<GetCodeOffs>80255592</GetCodeOffs>
<GetCodeOffs>80255424</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>ipSourceInfo</Name>
<Type Namespace="LCLS_General.Tc3_EventLogger">I_TcSourceInfo</Type>
<BitSize>32</BitSize>
<GetCodeOffs>80255572</GetCodeOffs>
<GetCodeOffs>80255404</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>nEventId</Name>
<Type>UDINT</Type>
<BitSize>32</BitSize>
<GetCodeOffs>80255660</GetCodeOffs>
<GetCodeOffs>80255492</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>nUniqueId</Name>
<Type>UDINT</Type>
<BitSize>32</BitSize>
<GetCodeOffs>80255664</GetCodeOffs>
<GetCodeOffs>80255496</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>sEventClassName</Name>
<Type>STRING(255)</Type>
<BitSize>2048</BitSize>
<GetCodeOffs>80255620</GetCodeOffs>
<GetCodeOffs>80255452</GetCodeOffs>
</PropertyItem>
<PropertyItem>
<Name>sEventText</Name>
<Type>STRING(255)</Type>
<BitSize>2048</BitSize>
<GetCodeOffs>80255668</GetCodeOffs>
<GetCodeOffs>80255500</GetCodeOffs>
</PropertyItem>
<Method>
<Name>EqualsToEventClass</Name>
Expand Down Expand Up @@ -10977,7 +10977,7 @@
<Name>nTimeSent</Name>
<Type>ULINT</Type>
<BitSize>64</BitSize>
<GetCodeOffs>80255692</GetCodeOffs>
<GetCodeOffs>80255524</GetCodeOffs>
</PropertyItem>
<Method>
<Name>SetJsonAttribute</Name>
Expand Down Expand Up @@ -30466,7 +30466,7 @@ request loop (two arbiters elevating to each other), or there is a RequestAdd, R
<Name>TcVarGlobal</Name>
</Property>
</Properties>
<BitOffs>641872912</BitOffs>
<BitOffs>641873424</BitOffs>
</Symbol>
<Symbol>
<Name>PMPS_GVL.stRequestedBeamParameters</Name>
Expand Down Expand Up @@ -31494,7 +31494,7 @@ request loop (two arbiters elevating to each other), or there is a RequestAdd, R
</Property>
<Property>
<Name>ChangeDate</Name>
<Value>2024-06-18T15:24:12</Value>
<Value>2025-02-21T15:58:47</Value>
</Property>
<Property>
<Name>GeneratedCodeSize</Name>
Expand Down

0 comments on commit 96a1adb

Please sign in to comment.