diff --git a/docs/epugf.fodt b/docs/epugf.fodt index a483d6d7c437a8fd9398e8666ed743da371d060d..4ad4cba012ca433c6cf570ee86d80d587c61bd2f 100644 --- a/docs/epugf.fodt +++ b/docs/epugf.fodt @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:officeooo="http://openoffice.org/2009/office" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - <office:meta><dc:title>YAMS-NE-010 IM481H Nota Esplicatica</dc:title><dc:description>Document was created by {applicationname}, version: {version}</dc:description><meta:initial-creator>Sincrotrone Trieste Soc.cons.p.A.</meta:initial-creator><meta:creation-date>2010-03-09T10:22:00</meta:creation-date><dc:date>2024-08-09T11:17:18.447590929</dc:date><meta:editing-cycles>133</meta:editing-cycles><meta:editing-duration>P24DT9H57M15S</meta:editing-duration><meta:generator>LibreOffice/7.0.4.2$Linux_X86_64 LibreOffice_project/00$Build-2</meta:generator><meta:printed-by>abrami </meta:printed-by><meta:print-date>2016-12-13T10:35:00</meta:print-date><dc:subject>YAMS-NE-010 IM481H Nota Esplicatica</dc:subject><dc:creator>abrami </dc:creator><meta:document-statistic meta:table-count="0" meta:image-count="4" meta:object-count="0" meta:page-count="6" meta:paragraph-count="46" meta:word-count="262" meta:character-count="1558" meta:non-whitespace-character-count="1309"/></office:meta> + <office:meta><dc:title>YAMS-NE-010 IM481H Nota Esplicatica</dc:title><dc:description>Document was created by {applicationname}, version: {version}</dc:description><meta:initial-creator>Sincrotrone Trieste Soc.cons.p.A.</meta:initial-creator><meta:creation-date>2010-03-09T10:22:00</meta:creation-date><dc:date>2024-08-12T11:03:52.084867323</dc:date><meta:editing-cycles>134</meta:editing-cycles><meta:editing-duration>P24DT9H59M41S</meta:editing-duration><meta:generator>LibreOffice/7.0.4.2$Linux_X86_64 LibreOffice_project/00$Build-2</meta:generator><meta:printed-by>abrami </meta:printed-by><meta:print-date>2016-12-13T10:35:00</meta:print-date><dc:subject>YAMS-NE-010 IM481H Nota Esplicatica</dc:subject><dc:creator>abrami </dc:creator><meta:document-statistic meta:table-count="0" meta:image-count="4" meta:object-count="0" meta:page-count="6" meta:paragraph-count="46" meta:word-count="296" meta:character-count="1644" meta:non-whitespace-character-count="1358"/></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> - <config:config-item config:name="ViewAreaTop" config:type="long">55113</config:config-item> + <config:config-item config:name="ViewAreaTop" config:type="long">109167</config:config-item> <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item> <config:config-item config:name="ViewAreaWidth" config:type="long">40509</config:config-item> <config:config-item config:name="ViewAreaHeight" config:type="long">24952</config:config-item> @@ -13,12 +13,12 @@ <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view2</config:config-item> - <config:config-item config:name="ViewLeft" config:type="long">19055</config:config-item> - <config:config-item config:name="ViewTop" config:type="long">67783</config:config-item> + <config:config-item config:name="ViewLeft" config:type="long">14870</config:config-item> + <config:config-item config:name="ViewTop" config:type="long">158919</config:config-item> <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item> - <config:config-item config:name="VisibleTop" config:type="long">55113</config:config-item> + <config:config-item config:name="VisibleTop" config:type="long">109167</config:config-item> <config:config-item config:name="VisibleRight" config:type="long">40508</config:config-item> - <config:config-item config:name="VisibleBottom" config:type="long">80063</config:config-item> + <config:config-item config:name="VisibleBottom" config:type="long">134117</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item> <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item> @@ -99,9 +99,9 @@ <config:config-item config:name="EndLine" config:type="string">$([\{£¥‘“〈《「『ã€ã€”$([{「£¥</config:config-item> </config:config-item-map-entry> </config:config-item-map-indexed> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">rAH+/2l0LWNvcHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzppdC1jb3B5AAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAzQAAAAAAAQAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9aXQtY29weQpvcmllbnRhdGlvbj1Qb3J0cmFpdApjb3BpZXM9MQpjb2xsYXRlPWZhbHNlCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6TGV0dGVyAElucHV0U2xvdDpQRjczMEIARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">rAH+/2l0LWNvcHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzppdC1jb3B5AAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAzQAAAAAAAQAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9aXQtY29weQpvcmllbnRhdGlvbj1Qb3J0cmFpdApjb3BpZXM9MQpjb2xsYXRlPWZhbHNlCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKRHVwbGV4Ok5vbmUASW5wdXRTbG90OlBGNzMwQgBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=</config:config-item> <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> - <config:config-item config:name="Rsid" config:type="int">1789707</config:config-item> + <config:config-item config:name="Rsid" config:type="int">1813468</config:config-item> <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> @@ -153,15 +153,15 @@ </office:script> </office:scripts> <office:font-face-decls> - <style:font-face style:name="Symbol1" svg:font-family="Symbol" style:font-charset="x-symbol"/> - <style:font-face style:name="Symbol" svg:font-family="Symbol" style:font-adornments="Regular" style:font-charset="x-symbol"/> + <style:font-face style:name="Symbol" svg:font-family="Symbol" style:font-charset="x-symbol"/> + <style:font-face style:name="Symbol1" svg:font-family="Symbol" style:font-adornments="Regular" style:font-charset="x-symbol"/> <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/> <style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/> - <style:font-face style:name="Times New Roman2" svg:font-family="'Times New Roman'" style:font-family-generic="roman"/> - <style:font-face style:name="Times New Roman3" svg:font-family="'Times New Roman'" style:font-adornments="Regular" style:font-family-generic="roman"/> + <style:font-face style:name="Times New Roman4" svg:font-family="'Times New Roman'" style:font-family-generic="roman"/> + <style:font-face style:name="Times New Roman2" svg:font-family="'Times New Roman'" style:font-adornments="Regular" style:font-family-generic="roman"/> <style:font-face style:name="Bitstream Vera Sans Mono" svg:font-family="'Bitstream Vera Sans Mono'" style:font-family-generic="modern" style:font-pitch="fixed"/> <style:font-face style:name="Times New Roman" svg:font-family="'Times New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/> - <style:font-face style:name="Times New Roman4" svg:font-family="'Times New Roman'" style:font-adornments="Bold" style:font-family-generic="roman" style:font-pitch="variable"/> + <style:font-face style:name="Times New Roman3" svg:font-family="'Times New Roman'" style:font-adornments="Bold" style:font-family-generic="roman" style:font-pitch="variable"/> <style:font-face style:name="Times New Roman1" svg:font-family="'Times New Roman'" style:font-adornments="Regular" style:font-family-generic="roman" style:font-pitch="variable"/> <style:font-face style:name="Calibri" svg:font-family="Calibri" style:font-family-generic="swiss" style:font-pitch="variable"/> <style:font-face style:name="Arial Unicode MS" svg:font-family="'Arial Unicode MS'" style:font-family-generic="system" style:font-pitch="variable"/> @@ -172,7 +172,7 @@ <draw:marker draw:name="Rounded_20_large_20_Arrow" draw:display-name="Rounded large Arrow" svg:viewBox="0 0 1131 2256" svg:d="M1127 2120l-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 2006v13l-4 9 9 42 25 38 38 25 42 9h903l42-9 38-25 26-38 8-42v-9z"/> <style:default-style style:family="graphic"> <style:graphic-properties svg:stroke-color="#808080" draw:fill-color="#cfe7f5" fo:wrap-option="no-wrap" draw:shadow-offset-x="3mm" draw:shadow-offset-y="3mm" draw:start-line-spacing-horizontal="2.83mm" draw:start-line-spacing-vertical="2.83mm" draw:end-line-spacing-horizontal="2.83mm" draw:end-line-spacing-vertical="2.83mm" style:flow-with-text="false"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false"> <style:tab-stops/> </style:paragraph-properties> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="Arial Unicode MS" style:font-size-asian="12pt" style:language-asian="zxx" style:country-asian="none" style:font-name-complex="Tahoma" style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none"/> @@ -251,10 +251,10 @@ <style:style style:name="Contents_20_Heading" style:display-name="Contents Heading" style:family="paragraph" style:parent-style-name="Heading" style:class="index"> <loext:graphic-properties draw:fill="none" draw:fill-color="#cfe7f5"/> <style:paragraph-properties fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="0mm" fo:margin-bottom="0mm" style:contextual-spacing="false" fo:text-indent="0mm" style:auto-text-indent="false" fo:background-color="transparent" text:number-lines="false" text:line-number="0"/> - <style:text-properties style:font-name="Times New Roman4" fo:font-family="'Times New Roman'" style:font-style-name="Bold" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Times New Roman3" fo:font-family="'Times New Roman'" style:font-style-name="Bold" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="1" style:class="text"> - <style:text-properties style:font-name="Times New Roman4" fo:font-family="'Times New Roman'" style:font-style-name="Bold" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="115%" style:font-weight-asian="bold" style:font-size-complex="115%" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Times New Roman3" fo:font-family="'Times New Roman'" style:font-style-name="Bold" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="115%" style:font-weight-asian="bold" style:font-size-complex="115%" style:font-weight-complex="bold"/> </style:style> <style:style style:name="Contents_20_1" style:display-name="Contents 1" style:family="paragraph" style:parent-style-name="Index" style:class="index" style:master-page-name=""> <loext:graphic-properties draw:fill="none" draw:fill-color="#cfe7f5"/> @@ -289,7 +289,7 @@ <style:tab-stop style:position="173.16mm" style:type="right" style:leader-style="dotted" style:leader-text="."/> </style:tab-stops> </style:paragraph-properties> - <style:text-properties style:font-name="Times New Roman3" fo:font-family="'Times New Roman'" style:font-style-name="Regular" style:font-family-generic="roman" fo:font-size="10.5pt"/> + <style:text-properties style:font-name="Times New Roman2" fo:font-family="'Times New Roman'" style:font-style-name="Regular" style:font-family-generic="roman" fo:font-size="10.5pt"/> </style:style> <style:style style:name="Default_20_Paragraph_20_Font" style:display-name="Default Paragraph Font" style:family="text"/> <style:style style:name="Bullet_20_Symbols" style:display-name="Bullet Symbols" style:family="text"> @@ -460,182 +460,190 @@ <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:text-properties officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51"/> </style:style> - <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Contents_20_Heading"> + <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:text-properties fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Contents_20_Heading"> <style:text-properties style:text-position="-4% 100%" style:font-name="Times New Roman" fo:letter-spacing="-0.53mm" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" style:text-scale="99%"/> </style:style> - <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Caption"> + <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Caption"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> </style:style> - <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"/> </style:style> - <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> <style:text-properties style:use-window-font-color="true" loext:opacity="0%"/> </style:style> - <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Standard"> <loext:graphic-properties draw:fill="solid" draw:fill-color="#f5f5a0"/> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:background-color="#f5f5a0"/> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard"> <style:text-properties fo:color="#dcffdc" loext:opacity="100%"/> </style:style> - <style:style style:name="P32" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Standard"> <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> <style:paragraph-properties fo:background-color="transparent"/> <style:text-properties fo:color="#dcffdc" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> </style:style> - <style:style style:name="P34" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:margin-top="0mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="justify" style:justify-single-word="false"/> </style:style> - <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:margin-top="0mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="end" style:justify-single-word="false"/> <style:text-properties style:text-position="-4% 100%" style:font-name="Times New Roman" fo:font-size="12pt" fo:letter-spacing="normal" fo:font-weight="bold" style:font-size-asian="12pt" style:font-weight-asian="bold" style:font-size-complex="12pt" style:font-weight-complex="bold" style:text-scale="99%"/> </style:style> - <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:margin-top="0mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="start" style:justify-single-word="false"/> <style:text-properties style:text-position="-4% 100%" style:font-name="Times New Roman" fo:font-size="12pt" fo:letter-spacing="normal" fo:font-weight="bold" style:font-size-asian="12pt" style:font-weight-asian="bold" style:font-size-complex="12pt" style:font-weight-complex="bold" style:text-scale="99%"/> </style:style> - <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="0mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> </style:style> - <style:style style:name="P38" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="0mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="justify" style:justify-single-word="false"/> </style:style> - <style:style style:name="P39" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:margin-left="113.77mm" fo:margin-right="0mm" fo:margin-top="0mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0mm" style:auto-text-indent="false"/> <style:text-properties style:text-position="-4% 100%" style:font-name="Times New Roman" fo:font-size="14pt" fo:letter-spacing="normal" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold" style:text-scale="99%"/> </style:style> - <style:style style:name="P40" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Standard"> <style:paragraph-properties fo:margin-left="113.77mm" fo:margin-right="0mm" fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0mm" style:auto-text-indent="false"/> </style:style> - <style:style style:name="P41" style:family="paragraph" style:parent-style-name="Text_20_body" style:master-page-name=""> + <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Text_20_body" style:master-page-name=""> <style:paragraph-properties style:page-number="auto"/> <style:text-properties style:text-position="-4% 100%" style:font-name="Times New Roman" fo:font-size="14pt" fo:letter-spacing="-0.53mm" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold" style:text-scale="99%"/> </style:style> - <style:style style:name="P42" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> + <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name=""> <style:paragraph-properties style:page-number="auto" fo:break-before="page"/> </style:style> - <style:style style:name="P43" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false"/> </style:style> - <style:style style:name="P44" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:line-height="100%"/> </style:style> - <style:style style:name="P45" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:line-height="100%"/> - <style:text-properties style:font-name="Symbol1" style:font-name-asian="Times New Roman" style:font-name-complex="Calibri"/> + <style:text-properties style:font-name="Symbol" style:font-name-asian="Times New Roman" style:font-name-complex="Calibri"/> </style:style> - <style:style style:name="P46" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> <style:text-properties fo:font-size="15pt" fo:font-weight="bold" style:font-size-asian="15pt" style:font-weight-asian="bold" style:font-size-complex="15pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P47" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P48" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="1.01mm" fo:margin-bottom="1.01mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> - <style:text-properties style:font-name="Symbol1" fo:font-size="15pt" fo:font-weight="bold" style:font-name-asian="Times New Roman" style:font-size-asian="15pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="15pt" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Symbol" fo:font-size="15pt" fo:font-weight="bold" style:font-name-asian="Times New Roman" style:font-size-asian="15pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="15pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P49" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P50" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="0.51mm" fo:margin-bottom="0.51mm" style:contextual-spacing="false"/> <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P50" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P51" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="0.51mm" fo:margin-bottom="0.51mm" style:contextual-spacing="false" fo:line-height="100%"/> <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P51" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="0.51mm" fo:margin-bottom="0.51mm" style:contextual-spacing="false" fo:line-height="100%" fo:text-align="center" style:justify-single-word="false"/> <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P52" style:family="paragraph" style:parent-style-name="Table_20_Heading"> + <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Table_20_Heading"> <style:paragraph-properties fo:margin-top="0.51mm" fo:margin-bottom="0.51mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P53" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="0.51mm" fo:margin-bottom="0.51mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> </style:style> - <style:style style:name="P54" style:family="paragraph" style:parent-style-name="Contents_20_Heading"> + <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Contents_20_Heading"> <style:paragraph-properties fo:break-before="page"/> </style:style> - <style:style style:name="P55" style:family="paragraph" style:parent-style-name="Heading_20_1"> + <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Heading_20_1"> <style:paragraph-properties fo:break-before="page"/> </style:style> - <style:style style:name="P56" style:family="paragraph" style:parent-style-name="Heading_20_1"> + <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Heading_20_1"> <style:paragraph-properties fo:break-before="page"/> <style:text-properties officeooo:paragraph-rsid="0019b65a"/> </style:style> - <style:style style:name="P57" style:family="paragraph" style:parent-style-name="Heading_20_1"> + <style:style style:name="P58" style:family="paragraph" style:parent-style-name="Heading_20_1"> <style:paragraph-properties fo:break-before="page"/> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman4" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman3" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P58" style:family="paragraph" style:parent-style-name="Contents_20_1"> + <style:style style:name="P59" style:family="paragraph" style:parent-style-name="Contents_20_1"> <style:paragraph-properties> <style:tab-stops> <style:tab-stop style:position="178.15mm" style:type="right" style:leader-style="dotted" style:leader-text="."/> </style:tab-stops> </style:paragraph-properties> </style:style> - <style:style style:name="P59" style:family="paragraph" style:parent-style-name="Contents_20_2"> + <style:style style:name="P60" style:family="paragraph" style:parent-style-name="Contents_20_2"> <style:paragraph-properties> <style:tab-stops> <style:tab-stop style:position="178.15mm" style:type="right" style:leader-style="dotted" style:leader-text="."/> </style:tab-stops> </style:paragraph-properties> </style:style> - <style:style style:name="P60" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P61" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:paragraph-properties fo:margin-top="0.49mm" fo:margin-bottom="0.49mm" style:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/> </style:style> - <style:style style:name="P61" style:family="paragraph" style:parent-style-name="Heading_20_1"> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman4" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> + <style:style style:name="P62" style:family="paragraph" style:parent-style-name="Heading_20_1"> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman3" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P62" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:style style:name="P63" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:margin-top="0mm" fo:margin-bottom="0mm" style:contextual-spacing="false"/> <style:text-properties officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51"/> </style:style> - <style:style style:name="P63" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P64" style:family="paragraph" style:parent-style-name="Standard"> <loext:graphic-properties draw:fill="solid" draw:fill-color="#f5f5a0"/> <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" fo:background-color="#f5f5a0" style:writing-mode="lr-tb"/> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P64" style:family="paragraph" style:parent-style-name="Standard"> + <style:style style:name="P65" style:family="paragraph" style:parent-style-name="Standard"> <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> <style:paragraph-properties fo:background-color="transparent" style:writing-mode="lr-tb"/> <style:text-properties fo:color="#dcffdc" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P65" style:family="paragraph" style:parent-style-name="Text_20_body" style:master-page-name="Standard"> + <style:style style:name="P66" style:family="paragraph" style:parent-style-name="Text_20_body" style:master-page-name="Standard"> <style:paragraph-properties style:page-number="auto"/> <style:text-properties style:text-position="-4% 100%" style:font-name="Times New Roman" fo:font-size="14pt" fo:letter-spacing="-0.53mm" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold" style:text-scale="99%"/> </style:style> - <style:style style:name="P66" style:family="paragraph" style:parent-style-name="Text_20_body"> - <style:text-properties fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-weight-asian="bold" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="P67" style:family="paragraph" style:parent-style-name="Heading_20_1"> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman4" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> + <style:style style:name="P67" style:family="paragraph" style:parent-style-name="Text_20_body"> + <style:text-properties officeooo:rsid="001acc51" officeooo:paragraph-rsid="001b9683"/> </style:style> <style:style style:name="P68" style:family="paragraph" style:parent-style-name="Heading_20_1"> - <style:paragraph-properties fo:break-before="page"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman3" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> <style:style style:name="P69" style:family="paragraph" style:parent-style-name="Heading_20_1"> <style:paragraph-properties fo:break-before="page"/> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman4" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P70" style:family="paragraph"> - <style:paragraph-properties fo:text-align="center"/> + <style:style style:name="P70" style:family="paragraph" style:parent-style-name="Heading_20_1"> + <style:paragraph-properties fo:break-before="page"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman3" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" officeooo:paragraph-rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> <style:style style:name="P71" style:family="paragraph"> + <style:paragraph-properties fo:text-align="center"/> + </style:style> + <style:style style:name="P72" style:family="paragraph"> + <loext:graphic-properties draw:fill="solid" draw:fill-color="#dcffdc"/> + <style:paragraph-properties fo:text-align="center" style:writing-mode="lr-tb"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="P73" style:family="paragraph"> <loext:graphic-properties draw:fill="solid" draw:fill-color="#f5f5a0"/> <style:paragraph-properties fo:text-align="center" style:writing-mode="lr-tb"/> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="P72" style:family="paragraph"> + <style:style style:name="P74" style:family="paragraph"> <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> <style:paragraph-properties style:writing-mode="lr-tb"/> <style:text-properties fo:color="#dcffdc" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> @@ -776,22 +784,22 @@ <style:text-properties style:text-position="sub 58%"/> </style:style> <style:style style:name="T46" style:family="text"> - <style:text-properties style:font-name="Symbol" style:font-name-asian="Times New Roman" style:font-name-complex="Calibri"/> + <style:text-properties style:font-name="Symbol1" style:font-name-asian="Times New Roman" style:font-name-complex="Calibri"/> </style:style> <style:style style:name="T47" style:family="text"> - <style:text-properties style:font-name="Symbol1" style:font-name-asian="Times New Roman" style:font-name-complex="Calibri"/> + <style:text-properties style:font-name="Symbol" style:font-name-asian="Times New Roman" style:font-name-complex="Calibri"/> </style:style> <style:style style:name="T48" style:family="text"> - <style:text-properties style:font-name="Symbol1" fo:font-size="14pt" style:font-name-asian="Times New Roman" style:font-size-asian="14pt" style:font-name-complex="Calibri" style:font-size-complex="14pt"/> + <style:text-properties style:font-name="Symbol" fo:font-size="14pt" style:font-name-asian="Times New Roman" style:font-size-asian="14pt" style:font-name-complex="Calibri" style:font-size-complex="14pt"/> </style:style> <style:style style:name="T49" style:family="text"> - <style:text-properties style:font-name="Times New Roman2" fo:font-size="12pt" fo:letter-spacing="-0.53mm" fo:language="it" fo:country="IT" style:font-size-asian="12pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Times New Roman4" fo:font-size="12pt" fo:letter-spacing="-0.53mm" fo:language="it" fo:country="IT" style:font-size-asian="12pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="T50" style:family="text"> - <style:text-properties style:font-name="Times New Roman2" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Times New Roman4" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T51" style:family="text"> - <style:text-properties style:font-name="Times New Roman2" fo:language="it" fo:country="IT" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + <style:text-properties style:font-name="Times New Roman4" fo:language="it" fo:country="IT" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T52" style:family="text"> <style:text-properties officeooo:rsid="00197468"/> @@ -803,23 +811,29 @@ <style:text-properties style:use-window-font-color="true" loext:opacity="0%" fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T55" style:family="text"> - <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman4" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman3" fo:font-size="14pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001acc51" style:font-name-asian="MS Mincho" style:font-size-asian="16.1000003814697pt" style:font-weight-asian="bold" style:font-name-complex="Tahoma" style:font-size-complex="16.1000003814697pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T56" style:family="text"> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman1" fo:font-size="12pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-name-asian="Times New Roman" style:font-size-asian="11pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T57" style:family="text"> - <style:text-properties fo:color="#dcffdc" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Times New Roman1" fo:font-size="12pt" fo:language="en" fo:country="US" fo:font-weight="bold" officeooo:rsid="001babdc" style:font-name-asian="Times New Roman" style:font-size-asian="11pt" style:font-weight-asian="bold" style:font-name-complex="Calibri" style:font-size-complex="11pt" style:language-complex="ar" style:country-complex="SA" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T58" style:family="text"> - <style:text-properties officeooo:rsid="001acc51"/> + <style:text-properties fo:color="#dcffdc" loext:opacity="100%" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="T59" style:family="text"> - <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + <style:text-properties officeooo:rsid="001acc51"/> </style:style> <style:style style:name="T60" style:family="text"> + <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="T61" style:family="text"> <style:text-properties officeooo:rsid="001b4f0b"/> </style:style> + <style:style style:name="T62" style:family="text"> + <style:text-properties officeooo:rsid="001b9683"/> + </style:style> <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics"> <style:graphic-properties fo:margin-left="0mm" fo:margin-right="0mm" style:wrap="right" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:padding-left="2.8mm" fo:padding-right="2.8mm" fo:padding-top="1.53mm" fo:padding-bottom="1.53mm" fo:border="none" style:mirror="none" fo:clip="rect(0mm, 0mm, 0mm, 0mm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/> </style:style> @@ -844,14 +858,18 @@ </style:section-properties> </style:style> <style:style style:name="gr1" style:family="graphic"> - <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" draw:fill="solid" draw:fill-color="#f5f5a0" fo:min-height="7.41mm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false"/> + <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" draw:fill="solid" draw:fill-color="#dcffdc" fo:min-height="7.41mm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false"/> <style:paragraph-properties style:writing-mode="lr-tb"/> </style:style> <style:style style:name="gr2" style:family="graphic"> - <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" draw:fill="none" draw:fill-color="#ffffff" fo:min-height="9.75mm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false"/> + <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" draw:fill="solid" draw:fill-color="#f5f5a0" fo:min-height="7.41mm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false"/> <style:paragraph-properties style:writing-mode="lr-tb"/> </style:style> <style:style style:name="gr3" style:family="graphic"> + <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" draw:fill="none" draw:fill-color="#ffffff" fo:min-height="9.75mm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false"/> + <style:paragraph-properties style:writing-mode="lr-tb"/> + </style:style> + <style:style style:name="gr4" style:family="graphic"> <style:graphic-properties svg:stroke-width="1.01mm" svg:stroke-color="#23b8dc" draw:marker-start-width="5.03mm" draw:marker-end="Rounded_20_large_20_Arrow" draw:marker-end-width="5.03mm" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" fo:padding-top="0.49mm" fo:padding-bottom="0.49mm" fo:padding-left="0.49mm" fo:padding-right="0.49mm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false"/> </style:style> <style:page-layout style:name="pm1"> @@ -7452,7 +7470,7 @@ </draw:frame></text:p> </draw:text-box> </draw:frame> - <text:p text:style-name="P65"/> + <text:p text:style-name="P66"/> <text:p text:style-name="P21"><text:span text:style-name="T52">EPUFG</text:span> <text:s/></text:p> <text:p text:style-name="P22"/> <text:p text:style-name="P20"/> @@ -7473,8 +7491,8 @@ <text:p text:style-name="P18"/> <text:p text:style-name="P18"/> <text:p text:style-name="P18"/> - <text:p text:style-name="P35"/> - <text:p text:style-name="P36"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>Doc. <text:s/><text:span text:style-name="T52">epufg.fodt</text:span> <text:s text:c="3"/></text:p> + <text:p text:style-name="P36"/> + <text:p text:style-name="P37"><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/><text:tab/>Doc. <text:s/><text:span text:style-name="T52">epufg.fodt</text:span> <text:s text:c="3"/></text:p> <text:p text:style-name="P18"/> <text:p text:style-name="P18"/> <text:table-of-content text:style-name="Sect1" text:protected="true" text:name="Table of Contents1"> @@ -7545,18 +7563,18 @@ </text:table-of-content-source> <text:index-body> <text:index-title text:style-name="Sect1" text:name="Table of Contents1_Head"> - <text:p text:style-name="P54">INDICE</text:p> + <text:p text:style-name="P55">INDICE</text:p> </text:index-title> - <text:p text:style-name="P58">1 <text:s text:c="3"/>Descrizione<text:tab/>3</text:p> - <text:p text:style-name="P58">2 <text:s text:c="3"/>Configurazione delle motorizzazioni<text:tab/>4</text:p> - <text:p text:style-name="P58">3 <text:s text:c="3"/>Calcolo delle fasi<text:tab/>5</text:p> - <text:p text:style-name="P58">4 <text:s text:c="3"/>Server Tango epufg-srv<text:tab/>5</text:p> + <text:p text:style-name="P59">1 <text:s text:c="3"/>Descrizione<text:tab/>3</text:p> + <text:p text:style-name="P59">2 <text:s text:c="3"/>Configurazione delle motorizzazioni<text:tab/>4</text:p> + <text:p text:style-name="P59">3 <text:s text:c="3"/>Calcolo delle fasi<text:tab/>5</text:p> + <text:p text:style-name="P59">4 <text:s text:c="3"/>Server Tango epufg-srv<text:tab/>5</text:p> </text:index-body> </text:table-of-content> - <text:p text:style-name="P26"/> - <text:h text:style-name="P55" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2161_3377787625"/>Descrizione<text:bookmark-end text:name="__RefHeading___Toc2161_3377787625"/></text:h> - <text:p text:style-name="P24">Il server Tango epufg-srv si incarica di trasformare le posizioni dei tre motori costituenti l'insertion device epu-fg nelle corrispettive "fasi": R<text:span text:style-name="T60">o</text:span>w, Jaw e Pair.</text:p> - <text:h text:style-name="P55" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2163_3377787625"/>Configur<text:span text:style-name="T53">azione delle motorizzazioni</text:span><text:bookmark-end text:name="__RefHeading___Toc2163_3377787625"/></text:h> + <text:p text:style-name="P27"/> + <text:h text:style-name="P56" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2161_3377787625"/>Descrizione<text:bookmark-end text:name="__RefHeading___Toc2161_3377787625"/></text:h> + <text:p text:style-name="P24">Il server Tango epufg-srv si incarica di trasformare le posizioni dei tre motori costituenti l'insertion device epu-fg nelle corrispettive "fasi": R<text:span text:style-name="T61">o</text:span>w, Jaw e Pair.</text:p> + <text:h text:style-name="P56" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2163_3377787625"/>Configur<text:span text:style-name="T53">azione delle motorizzazioni</text:span><text:bookmark-end text:name="__RefHeading___Toc2163_3377787625"/></text:h> <text:p text:style-name="Text_20_body"><draw:frame draw:style-name="fr3" draw:name="Frame2" text:anchor-type="char" svg:x="12.33mm" svg:y="2.86mm" svg:width="157.74mm" draw:z-index="14"> <draw:text-box fo:min-height="134.92mm"> <text:p text:style-name="Caption"><draw:frame draw:style-name="fr5" draw:name="Image2" text:anchor-type="paragraph" svg:width="114.72mm" style:rel-width="100%" svg:height="96.17mm" style:rel-height="scale" draw:z-index="15"><draw:image draw:mime-type="image/jpeg"> @@ -13574,23 +13592,35 @@ z+jkdY6wfAQ+RC5Fwhj4z5ZPK4WP/9k= </office:binary-data> </draw:image> - </draw:frame><draw:line text:anchor-type="paragraph" draw:z-index="16" draw:name="Shape1" draw:style-name="gr3" draw:text-style-name="P70" svg:x1="84.46mm" svg:y1="69.02mm" svg:x2="146.64mm" svg:y2="110.56mm"> + </draw:frame><draw:line text:anchor-type="paragraph" draw:z-index="16" draw:name="Shape1" draw:style-name="gr4" draw:text-style-name="P71" svg:x1="84.46mm" svg:y1="69.02mm" svg:x2="146.64mm" svg:y2="110.56mm"> <text:p/> - </draw:line><draw:frame text:anchor-type="paragraph" draw:z-index="17" draw:name="Shape2" draw:style-name="gr2" draw:text-style-name="P72" svg:width="24.35mm" svg:height="9.76mm" svg:x="131.82mm" svg:y="110.56mm"> + </draw:line><draw:frame text:anchor-type="paragraph" draw:z-index="17" draw:name="Shape2" draw:style-name="gr3" draw:text-style-name="P74" svg:width="24.35mm" svg:height="9.76mm" svg:x="131.82mm" svg:y="110.56mm"> + <draw:text-box> + <text:p><text:span text:style-name="T58">posit</text:span><text:span text:style-name="T58">ions </text:span><text:span text:style-name="T58">(+)</text:span></text:p> + </draw:text-box> + </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="18" draw:name="Shape3" draw:style-name="gr2" draw:text-style-name="P73" svg:width="8.74mm" svg:height="7.42mm" svg:x="86.57mm" svg:y="76.69mm"> + <draw:text-box> + <text:p text:style-name="P71"><text:span text:style-name="T54">M3</text:span></text:p> + </draw:text-box> + </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="19" draw:name="Shape3_0" draw:style-name="gr2" draw:text-style-name="P73" svg:width="8.74mm" svg:height="7.42mm" svg:x="69.11mm" svg:y="76.16mm"> + <draw:text-box> + <text:p text:style-name="P71"><text:span text:style-name="T54">M2</text:span></text:p> + </draw:text-box> + </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="20" draw:name="Shape3_1" draw:style-name="gr2" draw:text-style-name="P73" svg:width="8.74mm" svg:height="7.42mm" svg:x="70.17mm" svg:y="56.32mm"> <draw:text-box> - <text:p><text:span text:style-name="T57">positions (+)</text:span></text:p> + <text:p text:style-name="P71"><text:span text:style-name="T54">M1</text:span></text:p> </draw:text-box> - </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="18" draw:name="Shape3" draw:style-name="gr1" draw:text-style-name="P71" svg:width="8.74mm" svg:height="7.42mm" svg:x="86.57mm" svg:y="76.69mm"> + </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="21" draw:name="Shape3_2" draw:style-name="gr1" draw:text-style-name="P72" svg:width="8.74mm" svg:height="7.42mm" svg:x="60.11mm" svg:y="47.06mm"> <draw:text-box> - <text:p text:style-name="P70"><text:span text:style-name="T54">M3</text:span></text:p> + <text:p text:style-name="P71"><text:span text:style-name="T54">Q2</text:span></text:p> </draw:text-box> - </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="19" draw:name="Shape3_0" draw:style-name="gr1" draw:text-style-name="P71" svg:width="8.74mm" svg:height="7.42mm" svg:x="69.11mm" svg:y="76.16mm"> + </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="22" draw:name="Shape3_3" draw:style-name="gr1" draw:text-style-name="P72" svg:width="8.74mm" svg:height="7.42mm" svg:x="58.53mm" svg:y="85.95mm"> <draw:text-box> - <text:p text:style-name="P70"><text:span text:style-name="T54">M2</text:span></text:p> + <text:p text:style-name="P71"><text:span text:style-name="T54">Q3</text:span></text:p> </draw:text-box> - </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="20" draw:name="Shape3_1" draw:style-name="gr1" draw:text-style-name="P71" svg:width="8.74mm" svg:height="7.42mm" svg:x="70.17mm" svg:y="56.32mm"> + </draw:frame><draw:frame text:anchor-type="paragraph" draw:z-index="23" draw:name="Shape3_4" draw:style-name="gr1" draw:text-style-name="P72" svg:width="8.74mm" svg:height="7.42mm" svg:x="98.74mm" svg:y="81.46mm"> <draw:text-box> - <text:p text:style-name="P70"><text:span text:style-name="T54">M1</text:span></text:p> + <text:p text:style-name="P71"><text:span text:style-name="T54">Q4</text:span></text:p> </draw:text-box> </draw:frame></text:p> </draw:text-box> @@ -13614,42 +13644,42 @@ <text:p text:style-name="Text_20_body"/> <text:p text:style-name="Text_20_body"/> <text:p text:style-name="Text_20_body"/> - <text:p text:style-name="P25">Il motore M1 e' anche chiamato q2, il motore M2 anche q3 ed il motore M3 anche q4.</text:p> - <text:h text:style-name="P57" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2165_3377787625"/>Calcolo delle fasi<text:bookmark-end text:name="__RefHeading___Toc2165_3377787625"/></text:h> + <text:p text:style-name="P25">Il motore M1 e' anche chiamato <text:span text:style-name="T62">Q</text:span>2, il motore M2 anche <text:span text:style-name="T62">Q</text:span>3 ed il motore M3 anche <text:span text:style-name="T62">Q</text:span>4.</text:p> + <text:h text:style-name="P58" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2165_3377787625"/>Calcolo delle fasi<text:bookmark-end text:name="__RefHeading___Toc2165_3377787625"/></text:h> <text:p text:style-name="P25">Sia R il valore della fase "ROW", J il valore della fase "JAW", P il valore della fase "PAIR", e P1, P2 e P3 i valori delle posizioni dei motori M1, M2 ed M3, allora la relazione tra di essi e' la seguente:</text:p> <text:p text:style-name="P25"/> - <text:p text:style-name="P25">P1 = R + J</text:p> - <text:p text:style-name="P25">P2 = J + P</text:p> - <text:p text:style-name="P25">P3 = R + P</text:p> + <text:p text:style-name="P25"><text:span text:style-name="T62">Q2 = </text:span>P1 = R + <text:span text:style-name="T62">P</text:span></text:p> + <text:p text:style-name="P25"><text:span text:style-name="T62">Q3 = </text:span>P2 = J + P</text:p> + <text:p text:style-name="P25"><text:span text:style-name="T62">Q4 = </text:span>P3 = R + <text:span text:style-name="T62">J</text:span></text:p> <text:p text:style-name="P25"/> <text:p text:style-name="P25">pertanto:</text:p> <text:p text:style-name="P25"/> - <text:p text:style-name="P25">J = ( P1 + P2 + P3) / 2</text:p> - <text:p text:style-name="P25">R = (P1 - P2 + P3) / 2</text:p> - <text:p text:style-name="P25">P = ( -P1 + P2 + P3) / 2</text:p> + <text:p text:style-name="P67">J = ( <text:span text:style-name="T62">-</text:span>P1 + P2 + P3) / 2<text:span text:style-name="T62"><text:tab/>= </text:span>( <text:span text:style-name="T62">-Q2</text:span> + <text:span text:style-name="T62">Q3</text:span> + <text:span text:style-name="T62">Q4</text:span>) / 2</text:p> + <text:p text:style-name="P67">R = (<text:span text:style-name="T62"> </text:span>P1 - P2 + P3) / 2<text:span text:style-name="T62"><text:tab/><text:tab/>= </text:span>(<text:span text:style-name="T62"> Q2</text:span> - <text:span text:style-name="T62">Q3</text:span> + <text:span text:style-name="T62">Q4</text:span>) / 2</text:p> + <text:p text:style-name="P67">P = ( P1 + P2 <text:span text:style-name="T62">-</text:span> P3) / 2<text:span text:style-name="T62"><text:tab/><text:tab/>= </text:span>( <text:span text:style-name="T62">Q2</text:span> + <text:span text:style-name="T62">Q3</text:span> <text:span text:style-name="T62">-</text:span> <text:span text:style-name="T62">Q4</text:span>) / 2<text:span text:style-name="T62"><text:tab/></text:span></text:p> <text:p text:style-name="Text_20_body"/> - <text:h text:style-name="P61" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2167_3377787625"/><text:span text:style-name="T58">S</text:span>erver Tango epufg-srv<text:bookmark-end text:name="__RefHeading___Toc2167_3377787625"/></text:h> - <text:p text:style-name="P25">Si possono controllare le fasi attraverso l'attributo (vettore o, con terminologia Tango, spectrum): <text:span text:style-name="T59">Phases</text:span></text:p> + <text:h text:style-name="P62" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc2167_3377787625"/><text:span text:style-name="T59">S</text:span>erver Tango epufg-srv<text:bookmark-end text:name="__RefHeading___Toc2167_3377787625"/></text:h> + <text:p text:style-name="P25">Si possono controllare le fasi attraverso l'attributo (vettore o, con terminologia Tango, spectrum): <text:span text:style-name="T60">Phases</text:span></text:p> <text:p text:style-name="P25"/> - <text:p text:style-name="P62">Attribute: diviacco/id/ape-tx.q234/Phases</text:p> - <text:p text:style-name="P62">Duration: 19 msec</text:p> - <text:p text:style-name="P62">measure date: 09/08/2024 11:14:10 + 569ms</text:p> - <text:p text:style-name="P62">quality: VALID</text:p> - <text:p text:style-name="P62">dim x: 3</text:p> - <text:p text:style-name="P62">Read length: 3</text:p> - <text:p text:style-name="P62">Read [0]<text:tab/>0.0012000000000078614</text:p> - <text:p text:style-name="P62">Read [1]<text:tab/>-10.002400000000005</text:p> - <text:p text:style-name="P62">Read [2]<text:tab/>1.9999999999598117E-4</text:p> - <text:p text:style-name="P62">Write length: 3</text:p> - <text:p text:style-name="P62">Set [0]<text:tab/>0.0</text:p> - <text:p text:style-name="P62">Set [1]<text:tab/>-10.0</text:p> - <text:p text:style-name="P62">Set [2]<text:tab/>0.0</text:p> + <text:p text:style-name="P63">Attribute: diviacco/id/ape-tx.q234/Phases</text:p> + <text:p text:style-name="P63">Duration: 19 msec</text:p> + <text:p text:style-name="P63">measure date: 09/08/2024 11:14:10 + 569ms</text:p> + <text:p text:style-name="P63">quality: VALID</text:p> + <text:p text:style-name="P63">dim x: 3</text:p> + <text:p text:style-name="P63">Read length: 3</text:p> + <text:p text:style-name="P63">Read [0]<text:tab/>0.0012000000000078614</text:p> + <text:p text:style-name="P63">Read [1]<text:tab/>-10.002400000000005</text:p> + <text:p text:style-name="P63">Read [2]<text:tab/>1.9999999999598117E-4</text:p> + <text:p text:style-name="P63">Write length: 3</text:p> + <text:p text:style-name="P63">Set [0]<text:tab/>0.0</text:p> + <text:p text:style-name="P63">Set [1]<text:tab/>-10.0</text:p> + <text:p text:style-name="P63">Set [2]<text:tab/>0.0</text:p> <text:p text:style-name="Text_20_body"/> <text:p text:style-name="Text_20_body"/> <text:p text:style-name="P25"><text:soft-page-break/>dove </text:p> - <text:p text:style-name="P66">Phases[0] = ROW </text:p> - <text:p text:style-name="P25"><text:span text:style-name="T59">Phases[1] = </text:span><text:span text:style-name="T56">JAW</text:span></text:p> - <text:p text:style-name="P25"><text:span text:style-name="T59">Phases[2] = </text:span><text:span text:style-name="T56">PAIR</text:span></text:p> + <text:p text:style-name="P26">Phases[0] = ROW </text:p> + <text:p text:style-name="P25"><text:span text:style-name="T60">Phases[1] = </text:span><text:span text:style-name="T57">PAIR</text:span></text:p> + <text:p text:style-name="P25"><text:span text:style-name="T60">Phases[2] = </text:span><text:span text:style-name="T57">JAW</text:span></text:p> <text:p text:style-name="Text_20_body"/> <text:p text:style-name="Text_20_body"/> <text:p text:style-name="Text_20_body"/> diff --git a/src/EpuFG.cpp b/src/EpuFG.cpp index 1933304f6e9c43fbaa32d3138dee242444167389..331afb0e81f290430bda0cd85951674d517d5460 100644 --- a/src/EpuFG.cpp +++ b/src/EpuFG.cpp @@ -499,16 +499,16 @@ void EpuFG::read_Positions(Tango::Attribute &attr) // 0 - ROW attr_Phases_read[0] = (attr_Positions_read[0] - attr_Positions_read[1] + attr_Positions_read[2])/2; - // 1 - JAW + // 1 - PAIR attr_Phases_read[1] = (attr_Positions_read[0] + attr_Positions_read[1] - attr_Positions_read[2])/2; - // 2 - PAIR + // 2 - JAW attr_Phases_read[2] = ( -attr_Positions_read[0] + attr_Positions_read[1] + attr_Positions_read[2])/2; #ifdef _DBG_PHASES cout << "read_Positions(): 0 - ROW : " << attr_Phases_read[0] << endl; - cout << "read_Positions(): 1 - JAW : " << attr_Phases_read[1] << endl; - cout << "read_Positions(): 2 - PAIR : " << attr_Phases_read[2] << endl; + cout << "read_Positions(): 1 - PAIR : " << attr_Phases_read[1] << endl; + cout << "read_Positions(): 2 - JAW : " << attr_Phases_read[2] << endl; #endif /* _DBG_PHASES */ @@ -615,9 +615,8 @@ void EpuFG::write_Positions(Tango::WAttribute &attr) /** * Read attribute Phases related method * Description: 0 - ROW - * 1 - JAW - * 2 - PAIR - * + * 1 - PAIR + * 2 - JAW * * Data type: Tango::DevDouble * Attr type: Spectrum max = 3 @@ -630,8 +629,8 @@ void EpuFG::read_Phases(Tango::Attribute &attr) #ifdef _DBG_PHASES cout << "read_Phases: 0 - ROW : " << attr_Phases_read[0] << endl; - cout << "read_Phases: 1 - JAW : " << attr_Phases_read[1] << endl; - cout << "read_Phases: 2 - PAIR : " << attr_Phases_read[2] << endl; + cout << "read_Phases: 1 - PAIR : " << attr_Phases_read[1] << endl; + cout << "read_Phases: 2 - JAW : " << attr_Phases_read[2] << endl; #endif /* _DBG_PHASES */ // Set the attribute value @@ -643,9 +642,8 @@ void EpuFG::read_Phases(Tango::Attribute &attr) /** * Write attribute Phases related method * Description: 0 - ROW - * 1 - JAW - * 2 - PAIR - * + * 1 - PAIR + * 2 - JAW * * Data type: Tango::DevDouble * Attr type: Spectrum max = 3 @@ -675,8 +673,8 @@ void EpuFG::write_Phases(Tango::WAttribute &attr) vector<string> ph(3); ph[0] = "ROW"; - ph[1] = "JAW"; - ph[2] = "PAIR"; + ph[1] = "PAIR"; + ph[2] = "JAW"; for (unsigned int k=0; k<epufgaxis.size(); k++) { if ( (pos[k] < epufgaxis[k].min) || (pos[k]>epufgaxis[k].max) ) { diff --git a/src/EpuFG.h b/src/EpuFG.h index e0c1cf942e8ec5bebc6fb604d407e8d9abc95331..a9dc5043c1920bb7b581694cc757d778d28a0a2f 100644 --- a/src/EpuFG.h +++ b/src/EpuFG.h @@ -192,9 +192,8 @@ public: /** * Attribute Phases related methods * Description: 0 - ROW - * 1 - JAW - * 2 - PAIR - * + * 1 - PAIR + * 2 - JAW * * Data type: Tango::DevDouble * Attr type: Spectrum max = 3 diff --git a/src/EpuFG.xmi b/src/EpuFG.xmi index f0142509ab6ab553d6e4364403e2ef77a23650fd..82c99d68febde552d2e7f28ef7f4224a3ca68fbd 100644 --- a/src/EpuFG.xmi +++ b/src/EpuFG.xmi @@ -64,7 +64,7 @@ <archiveEvent fire="false" libCheckCriteria="false"/> <dataReadyEvent fire="false" libCheckCriteria="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> - <properties description="0 - ROW
1 - JAW
2 - PAIR
" label="" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/> + <properties description="0 - ROW
1 - PAIR
2 - JAW" label="" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/> </attributes> <preferences docHome="./doc_html" makefileHome="/usr/local/tango-9.3.4/share/pogo/preferences"/> </classes> diff --git a/src/EpuFGClass.cpp b/src/EpuFGClass.cpp index f62668cabf04ec3565558a8008f9cd7f13bb0d5d..278b0690bde381cb00fbcfb5ce8b2f350614f849 100644 --- a/src/EpuFGClass.cpp +++ b/src/EpuFGClass.cpp @@ -425,7 +425,7 @@ void EpuFGClass::attribute_factory(vector<Tango::Attr *> &att_list) // Attribute : Phases PhasesAttrib *phases = new PhasesAttrib(); Tango::UserDefaultAttrProp phases_prop; - phases_prop.set_description("0 - ROW\n1 - JAW\n2 - PAIR\n"); + phases_prop.set_description("0 - ROW\n1 - PAIR\n2 - JAW"); // label not set for Phases // unit not set for Phases // standard_unit not set for Phases