Skip to content

Commit

Permalink
Update for AT/CC/MTCamera for XML 22
Browse files Browse the repository at this point in the history
  • Loading branch information
Tony Johnson committed Jul 10, 2024
1 parent 1cd1167 commit dde8d17
Show file tree
Hide file tree
Showing 7 changed files with 2,708 additions and 1,149 deletions.
1 change: 1 addition & 0 deletions doc/news/CAP-1047.atcamera.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update ATCamera xml for XML 22
1 change: 1 addition & 0 deletions doc/news/CAP-1047.cccamera.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update CCCamera xml for XML 22
1 change: 1 addition & 0 deletions doc/news/CAP-1047.mtcamera.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update MTCamera xml for XML 22
88 changes: 87 additions & 1 deletion python/lsst/ts/xml/data/sal_interfaces/ATCamera/ATCamera_Events.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,36 @@
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem ATCamera class ATCamera_logevent_focal_plane_Reb_GeneralConfiguration using level 1 for category General-->
<!--===========================================================================================================================================-->
<SALEvent>
<Subsystem>ATCamera</Subsystem>
<EFDB_Topic>ATCamera_logevent_focal_plane_Reb_GeneralConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 808911443L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>location</EFDB_Name>
<Description>reb location</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<!--CCSMETA: Array tempavg_temperatureNames indexed by location-->
<item>
<EFDB_Name>tempavg_temperatureNames</EFDB_Name>
<Description>List of sibling temperature channels to average</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
<IsJavaArray>yes</IsJavaArray>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem ATCamera class ATCamera_logevent_focal_plane_Reb_HardwareIdConfiguration using level 1 for category HardwareId-->
<!--=================================================================================================================================================-->
<SALEvent>
Expand Down Expand Up @@ -5245,6 +5275,34 @@
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem ATCamera class ATCamera_logevent_ats_power_GeneralConfiguration using level 1 for category General-->
<!--=====================================================================================================================================-->
<SALEvent>
<Subsystem>ATCamera</Subsystem>
<EFDB_Topic>ATCamera_logevent_ats_power_GeneralConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 1448442192L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>tempDeadZone</EFDB_Name>
<Description>Temperature limit dead zone</Description>
<IDL_Type>double</IDL_Type>
<Units>C</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>tempLimit</EFDB_Name>
<Description>Temperature limit</Description>
<IDL_Type>double</IDL_Type>
<Units>C</Units>
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem ATCamera class ATCamera_logevent_ats_power_HVBias_I_LimitsConfiguration using level 1 for category Limits-->
<!--============================================================================================================================================-->
<SALEvent>
Expand Down Expand Up @@ -6048,7 +6106,7 @@
<SALEvent>
<Subsystem>ATCamera</Subsystem>
<EFDB_Topic>ATCamera_logevent_ats_power_PeriodicTasks_timersConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 785864288L -->
<!--CCS: Dictionary_Checksum: 3856424617L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
Expand All @@ -6063,6 +6121,13 @@
<Units>ms</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>fan_control_taskPeriodMillis</EFDB_Name>
<Description>period for task fan-control</Description>
<IDL_Type>long long</IDL_Type>
<Units>ms</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>heartbeat_taskPeriodMillis</EFDB_Name>
<Description>period for task heartbeat</Description>
Expand Down Expand Up @@ -6106,6 +6171,27 @@
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem ATCamera class ATCamera_logevent_ats_power_StatusAggregator_GeneralConfiguration using level 1 for category General-->
<!--======================================================================================================================================================-->
<SALEvent>
<Subsystem>ATCamera</Subsystem>
<EFDB_Topic>ATCamera_logevent_ats_power_StatusAggregator_GeneralConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 1864836358L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>patternConfigList</EFDB_Name>
<Description>List of patterns that describe which data is to be aggregated and how. (colon delimited array)</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem ATCamera class ATCamera_logevent_ats_CryoCon_DeviceConfiguration using level 1 for category Device-->
<!--=====================================================================================================================================-->
<SALEvent>
Expand Down
90 changes: 63 additions & 27 deletions python/lsst/ts/xml/data/sal_interfaces/CCCamera/CCCamera_Events.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4946,7 +4946,7 @@
<SALEvent>
<Subsystem>CCCamera</Subsystem>
<EFDB_Topic>CCCamera_logevent_vacuum_PeriodicTasks_timersConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 3610869269L -->
<!--CCS: Dictionary_Checksum: 2166055173L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
Expand Down Expand Up @@ -4989,6 +4989,13 @@
<Units>ms</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>rtds_check_status_taskPeriodMillis</EFDB_Name>
<Description>period for task rtds-check-status</Description>
<IDL_Type>long long</IDL_Type>
<Units>ms</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>runtimeinfo_taskPeriodMillis</EFDB_Name>
<Description>period for task runtimeInfo</Description>
Expand Down Expand Up @@ -5177,7 +5184,7 @@
<SALEvent>
<Subsystem>CCCamera</Subsystem>
<EFDB_Topic>CCCamera_logevent_vacuum_Turbo_GeneralConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 2761092564L -->
<!--CCS: Dictionary_Checksum: 3955323662L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
Expand All @@ -5199,13 +5206,6 @@
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>interlockType</EFDB_Name>
<Description>true/false for continuous/impulse</Description>
<IDL_Type>boolean</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>lowSpeedMode</EFDB_Name>
<Description>true/false for low/normal speed</Description>
Expand All @@ -5214,10 +5214,10 @@
<Count>1</Count>
</item>
<item>
<EFDB_Name>model304</EFDB_Name>
<Description>true/false for model 304/84 pump</Description>
<IDL_Type>boolean</IDL_Type>
<Units>unitless</Units>
<EFDB_Name>setpointValue</EFDB_Name>
<Description>Setpoint value for digital outout</Description>
<IDL_Type>long</IDL_Type>
<Units>Hz</Units>
<Count>1</Count>
</item>
<item>
Expand All @@ -5227,20 +5227,6 @@
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>ventValveByCmnd</EFDB_Name>
<Description>true/false for manual/auto</Description>
<IDL_Type>boolean</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>waterCooling</EFDB_Name>
<Description>true/false for water/air cooling</Description>
<IDL_Type>boolean</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem CCCamera class CCCamera_logevent_vacuum_Turbo_LimitsConfiguration using level 1 for category Limits-->
<!--======================================================================================================================================-->
Expand Down Expand Up @@ -5382,6 +5368,27 @@
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem CCCamera class CCCamera_logevent_vacuum_Turbo_buildConfiguration using level 1 for category build-->
<!--====================================================================================================================================-->
<SALEvent>
<Subsystem>CCCamera</Subsystem>
<EFDB_Topic>CCCamera_logevent_vacuum_Turbo_buildConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 1257163577L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>model</EFDB_Name>
<Description>enumerated pump model</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem CCCamera class CCCamera_logevent_vacuum_VQMonitor_CryoConfiguration using level 1 for category Cryo-->
<!--======================================================================================================================================-->
<SALEvent>
Expand Down Expand Up @@ -8361,6 +8368,35 @@
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem CCCamera class CCCamera_logevent_focal_plane_Reb_GeneralConfiguration using level 1 for category General-->
<!--===========================================================================================================================================-->
<SALEvent>
<Subsystem>CCCamera</Subsystem>
<EFDB_Topic>CCCamera_logevent_focal_plane_Reb_GeneralConfiguration</EFDB_Topic>
<!--CCS: Dictionary_Checksum: 2781647658L -->
<item>
<EFDB_Name>version</EFDB_Name>
<Description>Version of the settings, formatted using CCS conventions</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>location</EFDB_Name>
<Description>reb location</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
<!--CCSMETA: Array tempavg_temperatureNames indexed by location-->
<item>
<EFDB_Name>tempavg_temperatureNames</EFDB_Name>
<Description>List of sibling temperature channels to average (colon delimited array)</Description>
<IDL_Type>string</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
</SALEvent>
<!--Created by xmlmaker2 for subsystem CCCamera class CCCamera_logevent_focal_plane_Reb_HardwareIdConfiguration using level 1 for category HardwareId-->
<!--=================================================================================================================================================-->
<SALEvent>
Expand Down
Loading

0 comments on commit dde8d17

Please sign in to comment.