Skip to content

GitLab

Commit f29c3544 authored by Holger Brand's avatar Holger Brand
Browse files

Performance issues and Histogram alarm coloring fixed. Ready to go for test cycle.

parent df6e961f
Expand all Hide whitespace changes
Inline Side-by-side
CSPP_Core @ 84573b27
Compare ae335bbd...84573b27
Subproject commit ae335bbd414f23fb6ccc20648e38fb80bc93bfab
Subproject commit 84573b274b99e56c3337c9a137fa55b4d66528c9
Packages/UHV_HeatControl/SV.lib/UHVHC-depc456.lvlib
View file @ f29c3544
......@@ -2,11 +2,11 @@
<Library LVVersion="17008000">
<Property Name="Alarm Database Computer" Type="Str">DEPC456</Property>
<Property Name="Alarm Database Name" Type="Str">UHVHC-depc456</Property>
<Property Name="Alarm Database Path" Type="Str">D:\DSC\UHVHV-depc456</Property>
<Property Name="Alarm Database Path" Type="Str">d:\dsc\UHVHC-depc456</Property>
<Property Name="Data Lifespan" Type="UInt">30</Property>
<Property Name="Database Computer" Type="Str">DEPC456</Property>
<Property Name="Database Name" Type="Str">UHVHC-depc456</Property>
<Property Name="Database Path" Type="Str">D:\DSC\UHVHV-depc456</Property>
<Property Name="Database Path" Type="Str">d:\dsc\UHVHC-depc456</Property>
<Property Name="Enable Alarms Logging" Type="Bool">true</Property>
<Property Name="Enable Data Logging" Type="Bool">true</Property>
<Property Name="NI.Lib.Description" Type="Str">Shared variable library bount to //dveert04//myDAQ</Property>
......@@ -32,7 +32,7 @@
<Property Name="OdbcReconnectTimeUnit" Type="Int">0</Property>
<Property Name="OdbcStringLoggingTableName" Type="Str">NI_VARIABLE_STRING</Property>
<Property Name="OdbcUsername" Type="Str"></Property>
<Property Name="SaveStatePeriod" Type="UInt">5</Property>
<Property Name="SaveStatePeriod" Type="UInt">1</Property>
<Property Name="Serialized ACL" Type="Bin">&amp;Q#!!!!!!!)!"1!&amp;!!!A1%!!!@````]!!".V&lt;H.J:WZF:#"C?82F)'&amp;S=G&amp;Z!!%!!1!!!!A)!!!!#!!!!!!!!!!</Property>
<Property Name="Use Data Logging Database" Type="Bool">true</Property>
<Item Name="ControlMode" Type="Variable">
......
Packages/UHV_HeatControl/SV.lib/UHVHC-dveert04.lvlib
View file @ f29c3544
......@@ -2,11 +2,11 @@
<Library LVVersion="17008000">
<Property Name="Alarm Database Computer" Type="Str">DEPC456</Property>
<Property Name="Alarm Database Name" Type="Str">UHVHC-dveert04</Property>
<Property Name="Alarm Database Path" Type="Str">D:\DSC\UHVHV-dveert04</Property>
<Property Name="Alarm Database Path" Type="Str">d:\dsc\UHVHC-dveert04</Property>
<Property Name="Data Lifespan" Type="UInt">30</Property>
<Property Name="Database Computer" Type="Str">DEPC456</Property>
<Property Name="Database Name" Type="Str">UHVHC-dveert04</Property>
<Property Name="Database Path" Type="Str">D:\DSC\UHVHV-dveert04</Property>
<Property Name="Database Path" Type="Str">d:\dsc\UHVHC-dveert04</Property>
<Property Name="Enable Alarms Logging" Type="Bool">true</Property>
<Property Name="Enable Data Logging" Type="Bool">true</Property>
<Property Name="NI.Lib.Description" Type="Str">Shared variable library bount to //dveert04//myDAQ</Property>
......@@ -32,7 +32,7 @@
<Property Name="OdbcReconnectTimeUnit" Type="Int">0</Property>
<Property Name="OdbcStringLoggingTableName" Type="Str">NI_VARIABLE_STRING</Property>
<Property Name="OdbcUsername" Type="Str"></Property>
<Property Name="SaveStatePeriod" Type="UInt">5</Property>
<Property Name="SaveStatePeriod" Type="UInt">1</Property>
<Property Name="Serialized ACL" Type="Bin">&amp;Q#!!!!!!!)!"1!&amp;!!!A1%!!!@````]!!".V&lt;H.J:WZF:#"C?82F)'&amp;S=G&amp;Z!!%!!1!!!!A)!!!!#!!!!!!!!!!</Property>
<Property Name="Use Data Logging Database" Type="Bool">true</Property>
<Item Name="ControlMode" Type="Variable">
......
Packages/UHV_HeatControl/SV.lib/UHVHC-uhvpxi003.lvlib
View file @ f29c3544
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="17008000">
<Property Name="Alarm Database Computer" Type="Str">DEPC456</Property>
<Property Name="Alarm Database Name" Type="Str">UHVHV_uhvpxi003</Property>
<Property Name="Alarm Database Path" Type="Str">D:\DSC\UHVHV-uhvpxi003</Property>
<Property Name="Alarm Database Name" Type="Str">UHVHC-uhvpxi003</Property>
<Property Name="Alarm Database Path" Type="Str">D:\DSC\UHVHC-uhvpxi003</Property>
<Property Name="Data Lifespan" Type="UInt">30</Property>
<Property Name="Database Computer" Type="Str">DEPC456</Property>
<Property Name="Database Name" Type="Str">UHVHV_uhvpxi003</Property>
<Property Name="Database Path" Type="Str">D:\DSC\UHVHV-uhvpxi003</Property>
<Property Name="Database Name" Type="Str">UHVHC-uhvpxi003</Property>
<Property Name="Database Path" Type="Str">D:\DSC\UHVHC-uhvpxi003</Property>
<Property Name="Enable Alarms Logging" Type="Bool">true</Property>
<Property Name="Enable Data Logging" Type="Bool">true</Property>
<Property Name="NI.Lib.Icon" Type="Bin">&amp;Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5X&lt;A91P&lt;!FNA#^M#5Y6M96NA"R[WM#WQ"&lt;9A0ZYR'E?G!WPM1$AN&gt;@S(!ZZQG&amp;0%VLZ'@)H8:_X\&lt;^P(^7@8H\4Y;"`NX\;8JZPUX@@MJXC]C.3I6K5S(F/^DHTE)R`ZS%@?]J;XP/5N&lt;XH*3V\SEJ?]Z#F0?=J4HP+5&lt;Y=]Z#%0/&gt;+9@%QU"BU$D-YI-4[':XC':XB]D?%:HO%:HO(2*9:H?):H?)&lt;(&lt;4%]QT-]QT-]BNIEMRVSHO%R@$20]T20]T30+;.Z'K".VA:OAW"%O^B/GK&gt;ZGM&gt;J.%`T.%`T.)`,U4T.UTT.UTROW6;F.]XDE0-9*IKH?)KH?)L(U&amp;%]R6-]R6-]JIPC+:[#+"/7Q2'CX&amp;1[F#`&amp;5TR_2@%54`%54`'YN$WBWF&lt;GI8E==J\E3:\E3:\E-51E4`)E4`)EDW%D?:)H?:)H?5Q6S:-]S:-A;6,42RIMX:A[J3"Z`'S\*&lt;?HV*MENS.C&lt;&gt;Z9GT,7:IOVC7*NDFA00&gt;&lt;$D0719CV_L%7.N6CR&amp;C(7(R=,(1M4;Z*9.T][RNXH46X62:X632X61?X6\H(L8_ZYP^`D&gt;LP&amp;^8K.S_53Z`-Z4K&gt;4()`(/"Q/M&gt;`P9\@&lt;P&lt;U'PDH?8AA`XUMPTP_EXOF`[8`Q&lt;IT0]?OYVOA(5/(_Z!!!!!!</Property>
......@@ -27,7 +27,7 @@
<Property Name="OdbcReconnectTimeUnit" Type="Int">0</Property>
<Property Name="OdbcStringLoggingTableName" Type="Str">NI_VARIABLE_STRING</Property>
<Property Name="OdbcUsername" Type="Str"></Property>
<Property Name="SaveStatePeriod" Type="UInt">0</Property>
<Property Name="SaveStatePeriod" Type="UInt">1</Property>
<Property Name="Serialized ACL" Type="Bin">&amp;Q#!!!!!!!)!"1!&amp;!!!A1%!!!@````]!!".V&lt;H.J:WZF:#"C?82F)'&amp;S=G&amp;Z!!%!!1!!!!A)!!!!#!!!!!!!!!!</Property>
<Property Name="Use Data Logging Database" Type="Bool">true</Property>
<Item Name="ControlMode" Type="Variable">
Packages/UHV_HeatControl/UHVHC_Main/Actor/UHVHC_Main.lvclass
View file @ f29c3544
This source diff could not be displayed because it is too large. You can view the blob instead.
UHV-HeatControl-Host.lvproj
View file @ f29c3544
......@@ -7698,7 +7698,7 @@ http://zeitstempel.dfn.de/</Property>
<Property Name="Bld_supportedLanguage[0]" Type="Str">English</Property>
<Property Name="Bld_supportedLanguageCount" Type="Int">1</Property>
<Property Name="Bld_userLogFile" Type="Path">/D/builds/UHVHC/Host/UHVHC/UHV-HeatControl-Host_UHVHC_log.txt</Property>
<Property Name="Bld_version.build" Type="Int">25</Property>
<Property Name="Bld_version.build" Type="Int">28</Property>
<Property Name="Destination[0].destName" Type="Str">UHVHC.exe</Property>
<Property Name="Destination[0].path" Type="Path">/D/builds/UHVHC-Signed/Host/UHVHC/UHVHC.exe</Property>
<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
UHV-HeatControl-RT.ini
View file @ f29c3544
......@@ -27,8 +27,8 @@ ni.var.psp_e=SVMonitor
[SVMonitor]
LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass"
[UHVHCRT]
#UHVHC_Main="UHVHC-dveert04"
UHVHC_Main="UHVHC-uhvpxi003"
UHVHC_Main="UHVHC-dveert04"
#UHVHC_Main="UHVHC-uhvpxi003"
[UHVHC-dveert04]
LVClassPath="UHVHC_Main.lvlib:UHVHC_Main.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_GUIActor.lvlib:CSPP_GUIActor.lvclass"
......
UHV-HeatControl-RT.lvproj
View file @ f29c3544
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT-HPC | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy