Commit d8d4b64b authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Fix #866, focus offsets are now applied when not tracking the elev. 

Also, fixed an issue with the Python customlogger
parent ebeaefc4

Common/Libraries/IRALibrary/src/IRAPy/customlogging.py

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
This module is intended to extend the ACS Logging module in our python code.

"""

import logging

logging._srcfile = None

import sys

from Acspy.Common import Log

from ACSLog import ACS_LOG_CRITICAL

SRT/CDB/alma/MINORSERVO/GFR/GFR.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    <virtual_offsets description="Sequence, sum of user and system virtual axis offsets" />

    <virtual_user_offsets description="Sequence, virtual user axes offsets" />

    <virtual_system_offsets description="Sequence, virtual system axes offsets" />

    <commanded_virtual_positions description="Sequence, latest commanded (via preset) virtual positions" />

    <in_use description="Boolean indicating whether the servo is in use in the current configuration" />

    <current_setup description="The name of the current configuration" />

SRT/CDB/alma/MINORSERVO/M3R/M3R.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    <virtual_offsets description="Sequence, sum of user and system virtual axis offsets" />

    <virtual_user_offsets description="Sequence, virtual user axes offsets" />

    <virtual_system_offsets description="Sequence, virtual system axes offsets" />

    <commanded_virtual_positions description="Sequence, latest commanded (via preset) virtual positions" />

    <in_use description="Boolean indicating whether the servo is in use in the current configuration" />

    <current_setup description="The name of the current configuration" />

SRT/CDB/alma/MINORSERVO/PFP/PFP.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <virtual_offsets description="Sequence, sum of user and system virtual axis offsets" />

    <virtual_user_offsets description="Sequence, virtual user axes offsets" />

    <virtual_system_offsets description="Sequence, virtual system axes offsets" />

    <commanded_virtual_positions description="Sequence, latest commanded (via preset) virtual positions" />

    <in_use description="Boolean indicating whether the servo is in use in the current configuration" />

    <current_setup description="The name of the current configuration" />

    <tracking description="Boolean indicating whether the servo is tracking the given coordinates" />

SRT/CDB/alma/MINORSERVO/SRP/SRP.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <virtual_offsets description="Sequence, sum of user and system virtual axis offsets" />

    <virtual_user_offsets description="Sequence, virtual user axes offsets" />

    <virtual_system_offsets description="Sequence, virtual system axes offsets" />

    <commanded_virtual_positions description="Sequence, latest commanded (via preset) virtual positions" />

    <in_use description="Boolean indicating whether the servo is in use in the current configuration" />

    <current_setup description="The name of the current configuration" />

    <tracking description="Boolean indicating whether the servo is tracking the given coordinates" />