disagreement in SAScollimation definition

[prjemian]

The definition of SAScollimation has some disagreement between the XSD, the block diagrams, and the various XML example and template files.

Exactly where is distance?

SAScollimation
  distance    <-- XML Schema says
  aperture
    size
      x
      y
      z
    distance  <-- other things say

[prjemian]

As we last left this one month ago, we decided to have this substructure:

    SAScollimation
        distance
        aperture
            size
                x
                y
                z
            distance
        aperture (more of these are allowed)

This was made consistent today with changeset [26]

For a clearer view, see :

​http://www.smallangles.net/wgwiki/index.php/cansas1d_SAScollimation

Things are clearly defined on this page.

The problem is that a few things have been out of synch between the block diagrams,
the XML Schema, the definition of terms, the template and other items.

Proposal

Propose a change in the name of the "distance" immediately after SAScollimation. By Steve's message on 2008-03-25, SAScollimation/distance describes the "amount/length of collimation inserted on a reactor SANS instrument." I suggest that we change
SAScollimation/distance
to
SAScollimation/length
and that will make this distinction very clear.
That is to say:

    SAScollimation
        length
        aperture
            size
                x
                y
                z
            distance
        aperture (more of these are allowed)

[prjemian]

proposed change implemented as part of [27]