Skip to content

Commit

Permalink
PR updates
Browse files Browse the repository at this point in the history
  • Loading branch information
gmegh committed Sep 16, 2024
1 parent fa1593c commit c66e8a5
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 46 deletions.
24 changes: 0 additions & 24 deletions python/lsst/ts/xml/data/sal_interfaces/MOSS/MOSS_Commands.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,6 @@
<EFDB_Topic>MOSS_command_removeFlipAttenuator</EFDB_Topic>
<Description>Remove the flip attenuator.</Description>
</SALCommand>
<SALCommand>
<Subsystem>MOSS</Subsystem>
<EFDB_Topic>MOSS_command_moveMountToAltAz</EFDB_Topic>
<Description>Move the mount to the given position.</Description>
<item>
<EFDB_Name>azimuth</EFDB_Name>
<Description>Azimuth angle in degrees</Description>
<IDL_Type>float</IDL_Type>
<Units>degree</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>altitude</EFDB_Name>
<Description>Altitude angle in degrees</Description>
<IDL_Type>float</IDL_Type>
<Units>degree</Units>
<Count>1</Count>
</item>
</SALCommand>
<SALCommand>
<Subsystem>MOSS</Subsystem>
<EFDB_Topic>MOSS_command_moveMountToHomePosition</EFDB_Topic>
<Description>Move the mount to the home position.</Description>
</SALCommand>
<SALCommand>
<Subsystem>MOSS</Subsystem>
<EFDB_Topic>MOSS_command_powerOff</EFDB_Topic>
Expand Down
25 changes: 4 additions & 21 deletions python/lsst/ts/xml/data/sal_interfaces/MOSS/MOSS_Events.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="http://lsst-sal.tuc.noao.edu/schema/SALEventSet.xsl"?>
<SALEventSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://lsst-sal.tuc.noao.edu/schema/SALEventSet.xsd">
<Enumeration>AttenuatorState_inPlace,AttenuatorState_removed</Enumeration>
<Enumeration>BeamStatus_ON,BeamStatus_OFF</Enumeration>
<SALEvent>
<Subsystem>MOSS</Subsystem>
<EFDB_Topic>MOSS_logevent_beamIntensity</EFDB_Topic>
Expand Down Expand Up @@ -43,7 +45,7 @@
<Description>Report the state of the beam</Description>
<item>
<EFDB_Name>state</EFDB_Name>
<Description>Frequency of the pulse (number of pulses per second)</Description>
<Description>BeamStatus enumeration.</Description>
<IDL_Type>long</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
Expand All @@ -55,29 +57,10 @@
<Description>Report the state of the flip attenuator</Description>
<item>
<EFDB_Name>state</EFDB_Name>
<Description>State of the flip attenuator, it can either be in place or removed</Description>
<Description>AttenuatorState enumeration.</Description>
<IDL_Type>long</IDL_Type>
<Units>unitless</Units>
<Count>1</Count>
</item>
</SALEvent>
<SALEvent>
<Subsystem>MOSS</Subsystem>
<EFDB_Topic>MOSS_logevent_mountPosition</EFDB_Topic>
<Description>Report the position of the mount</Description>
<item>
<EFDB_Name>azimuth</EFDB_Name>
<Description>Azimuth angle in degrees</Description>
<IDL_Type>float</IDL_Type>
<Units>degree</Units>
<Count>1</Count>
</item>
<item>
<EFDB_Name>altitude</EFDB_Name>
<Description>Altitude angle in degrees</Description>
<IDL_Type>float</IDL_Type>
<Units>degree</Units>
<Count>1</Count>
</item>
</SALEvent>
</SALEventSet>
2 changes: 1 addition & 1 deletion python/lsst/ts/xml/data/sal_interfaces/SALSubsystems.xml
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@
<ActiveDevelopers>Guillem Megias</ActiveDevelopers>
<Github>https://github.com/lsst-ts/ts_moss</Github>
<JenkinsTestResults>https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_moss/</JenkinsTestResults>
<RubinObsContact>Sandrine Thomas</RubinObsContact>
<RubinObsContact>Christopher Stubbs</RubinObsContact>
<CSCDocs>https://ts-moss.lsst.io</CSCDocs>
<ProductOwner>Sandrine Thomas</ProductOwner>
<RelatedDocuments/>
Expand Down
33 changes: 33 additions & 0 deletions python/lsst/ts/xml/enums/MOSS.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This file is part of ts_xml.
#
# Developed for Vera Rubin Observatory.
# This product includes software developed by the LSST Project
# (https://www.lsst.org).
# See the COPYRIGHT file at the top-level directory of this distribution
# for details of code ownership.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License

__all__ = ["BeamStatus", "AttenuatorState"]

import enum


class BeamStatus(enum.IntEnum):
OFF = enum.auto()
ON = enum.auto()


class AttenuatorState(enum.IntEnum):
inPlace = 1
removed = enum.auto()

0 comments on commit c66e8a5

Please sign in to comment.