Uploaded image for project: 'Data Management'
  1. Data Management
  2. DM-34567

The new type attribute of Enumeration does not work for ATWhiteLight

    XMLWordPrintable

Details

    • Story
    • Status: Done
    • Resolution: Done
    • None
    • ts_middleware
    • 0.5
    • TSSW Sprint - Apr 25 - May 09
    • Telescope and Site
    • No

    Description

      The fix in DM-34005 does not work for me, in the one case I tried (the case that lead to filing that ticket).

      If you look at DM-34557 and https://github.com/lsst-ts/ts_xml/pull/576 you can see that I used

        <Enumeration type="unsigned int">
          ChillerL22Alarms_EXTERNAL_RTD_SENSOR_OPEN = 0x1,
          ...
          ChillerL22Alarms_FRONT_LEFT_FAN_OPEN = 0x40000000,
          ChillerL22Alarms_FRONT_RIGHT_FAN_OPEN = 0x80000000
        </Enumeration>
      

      in ATWhiteLight_Events.xml. ts_sal builds this, but the resulting IDL file uses type "long" for all of the values for that enumeration, rather than "unsigned int". This is using ts_sal develop 5bd54f8b dated April 6, 2002.

      Attachments

        Issue Links

          Activity

            rowen Russell Owen added a comment - - edited

            We talked at standup and agreed that the simplest solution is to change all enum value types to "long long" and remove the "type" attribute from Enumeration.

            This means bitmasks can be up to 63 bits. We have not even come close to needing that. Our largest current bitmask is 32 bits – the one that triggered DM-34005 and this ticket.

            rowen Russell Owen added a comment - - edited We talked at standup and agreed that the simplest solution is to change all enum value types to "long long" and remove the "type" attribute from Enumeration. This means bitmasks can be up to 63 bits. We have not even come close to needing that. Our largest current bitmask is 32 bits – the one that triggered DM-34005 and this ticket.
            rowen Russell Owen added a comment -

            I tested the change in ts_sal ffd5a8f2 and it all works. Thank you for the improvement.

            Specifically here is what I did:

            • Uncommented the ATWhiteLight enum that did not fit in "long" (DM-34557).
            • Used ts_sal to build the IDL file, which worked.
            • Examined the IDL file and found that indeed all enumeration values have type "long long".
            • Ran ts_atwhitelight unit tests, which all pass.
            rowen Russell Owen added a comment - I tested the change in ts_sal ffd5a8f2 and it all works. Thank you for the improvement. Specifically here is what I did: Uncommented the ATWhiteLight enum that did not fit in "long" ( DM-34557 ). Used ts_sal to build the IDL file, which worked. Examined the IDL file and found that indeed all enumeration values have type "long long". Ran ts_atwhitelight unit tests, which all pass.
            dmills Dave Mills added a comment -

            SAL Enum = long long mod

            dmills Dave Mills added a comment - SAL Enum = long long mod
            rowen Russell Owen added a comment -

            The changes look reasonable and it works.

            rowen Russell Owen added a comment - The changes look reasonable and it works.

            People

              dmills Dave Mills
              rowen Russell Owen
              Rob Bovill
              Dave Mills, Rob Bovill, Russell Owen
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Jenkins

                  No builds found.