Print

Print
Commit in www-lcsim/schemas/lcdd/1.0 on MAIN
lcdd.xsd+8-91.1 -> 1.2
lcdd.xsd.html+14-161.1 -> 1.2
lcdd_fields.xsd+5-51.1 -> 1.2
lcdd_fields.xsd.html+23-201.1 -> 1.2
lcdd_header.xsd+12-121.1 -> 1.2
lcdd_header.xsd.html+18-181.1 -> 1.2
lcdd_regions.xsd+51.1 -> 1.2
lcdd_regions.xsd.html+31-41.1 -> 1.2
+116-84
8 modified files
Current lcdd schemas and docs
www-lcsim/schemas/lcdd/1.0
lcdd.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd.xsd	31 Aug 2005 19:24:30 -0000	1.1
+++ lcdd.xsd	22 Sep 2005 23:18:11 -0000	1.2
@@ -30,7 +30,6 @@

 	  <xs:sequence>
 	    <xs:element minOccurs="0" maxOccurs="1" name="sdref" type="ReferenceType"/>
 	    <xs:element minOccurs="0" maxOccurs="1" name="regionref" type="ReferenceType"/>

-<!--	    <xs:element minOccurs="0" maxOccurs="1" name="limitref" type="ReferenceType"/> -->

 	    <xs:element minOccurs="0" maxOccurs="1" name="limitsetref" type="ReferenceType"/>
 	    <xs:element minOccurs="0" maxOccurs="1" name="visref" type="ReferenceType" />
 	  </xs:sequence>

@@ -69,14 +68,14 @@

     </xs:annotation>
     <xs:complexType>
       <xs:sequence>

-	<xs:element ref="header"></xs:element>
-	<xs:element ref="iddict"></xs:element>
-	<xs:element ref="sensitive_detectors"></xs:element>
-	<xs:element ref="limits"></xs:element>
-	<xs:element ref="regions"></xs:element>
-	<xs:element ref="display"></xs:element>
-	<xs:element ref="gdml" ></xs:element>
-	<xs:element ref="fields"></xs:element>

+	<xs:element ref="header" minOccurs="1"></xs:element>
+	<xs:element ref="iddict" minOccurs="0"></xs:element>
+	<xs:element ref="sensitive_detectors" minOccurs="0"></xs:element>
+	<xs:element ref="limits" minOccurs="0"></xs:element>
+	<xs:element ref="regions" minOccurs="0"></xs:element>
+	<xs:element ref="display" minOccurs="0"></xs:element>
+	<xs:element ref="gdml" minOccurs="1"></xs:element>
+	<xs:element ref="fields" minOccurs="0"></xs:element>

       </xs:sequence>
     </xs:complexType>
   </xs:element>
www-lcsim/schemas/lcdd/1.0
lcdd.xsd.html 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd.xsd.html	31 Aug 2005 19:24:30 -0000	1.1
+++ lcdd.xsd.html	22 Sep 2005 23:18:11 -0000	1.2
@@ -866,7 +866,6 @@

 <a href="gdml_core.xsd.html#type_ReferenceType" title="Jump to &quot;ReferenceType&quot; type definition(located in external schema documentation)." class="externalLink">ReferenceType</a>
 </span>
 </span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

-<div style="margin-left: 1.5em" class="comment">&lt;--	    &lt;xs:element minOccurs="0" maxOccurs="1" name="limitref" type="ReferenceType"/&gt; --&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">limitsetref</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a href="gdml_core.xsd.html#type_ReferenceType" title="Jump to &quot;ReferenceType&quot; type definition(located in external schema documentation)." class="externalLink">ReferenceType</a>

@@ -973,7 +972,6 @@

 <a href="gdml_core.xsd.html#type_ReferenceType" title="Jump to &quot;ReferenceType&quot; type definition(located in external schema documentation)." class="externalLink">ReferenceType</a>
 </span>
 </span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

-<div style="margin-left: 1.5em" class="comment">&lt;--	    &lt;xs:element minOccurs="0" maxOccurs="1" name="limitref" type="ReferenceType"/&gt; --&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">limitsetref</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a href="gdml_core.xsd.html#type_ReferenceType" title="Jump to &quot;ReferenceType&quot; type definition(located in external schema documentation)." class="externalLink">ReferenceType</a>

@@ -1104,19 +1102,19 @@

 <div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;lcdd&gt; <br />
 <div style="margin-left: 1.5em">&lt;<a href="lcdd_header.xsd.html#element_header" title="Jump to &quot;header&quot; element declaration(located in external schema documentation)." class="externalLink">header</a>&gt; ... &lt;/<a href="lcdd_header.xsd.html#element_header" title="Jump to &quot;header&quot; element declaration(located in external schema documentation)." class="externalLink">header</a>&gt; <span class="occurs">[1]</span>
 </div>

-<div style="margin-left: 1.5em">&lt;<a href="lcdd_iddict.xsd.html#element_iddict" title="Jump to &quot;iddict&quot; element declaration(located in external schema documentation)." class="externalLink">iddict</a>&gt; ... &lt;/<a href="lcdd_iddict.xsd.html#element_iddict" title="Jump to &quot;iddict&quot; element declaration(located in external schema documentation)." class="externalLink">iddict</a>&gt; <span class="occurs">[1]</span>

+<div style="margin-left: 1.5em">&lt;<a href="lcdd_iddict.xsd.html#element_iddict" title="Jump to &quot;iddict&quot; element declaration(located in external schema documentation)." class="externalLink">iddict</a>&gt; ... &lt;/<a href="lcdd_iddict.xsd.html#element_iddict" title="Jump to &quot;iddict&quot; element declaration(located in external schema documentation)." class="externalLink">iddict</a>&gt; <span class="occurs">[0..1]</span>

 </div>

-<div style="margin-left: 1.5em">&lt;<a href="lcdd_sensitive_detectors.xsd.html#element_sensitive_detectors" title="Jump to &quot;sensitive_detectors&quot; element declaration(located in external schema documentation)." class="externalLink">sensitive_detectors</a>&gt; ... &lt;/<a href="lcdd_sensitive_detectors.xsd.html#element_sensitive_detectors" title="Jump to &quot;sensitive_detectors&quot; element declaration(located in external schema documentation)." class="externalLink">sensitive_detectors</a>&gt; <span class="occurs">[1]</span>

+<div style="margin-left: 1.5em">&lt;<a href="lcdd_sensitive_detectors.xsd.html#element_sensitive_detectors" title="Jump to &quot;sensitive_detectors&quot; element declaration(located in external schema documentation)." class="externalLink">sensitive_detectors</a>&gt; ... &lt;/<a href="lcdd_sensitive_detectors.xsd.html#element_sensitive_detectors" title="Jump to &quot;sensitive_detectors&quot; element declaration(located in external schema documentation)." class="externalLink">sensitive_detectors</a>&gt; <span class="occurs">[0..1]</span>

 </div>

-<div style="margin-left: 1.5em">&lt;<a href="lcdd_limits.xsd.html#element_limits" title="Jump to &quot;limits&quot; element declaration(located in external schema documentation)." class="externalLink">limits</a>&gt; ... &lt;/<a href="lcdd_limits.xsd.html#element_limits" title="Jump to &quot;limits&quot; element declaration(located in external schema documentation)." class="externalLink">limits</a>&gt; <span class="occurs">[1]</span>

+<div style="margin-left: 1.5em">&lt;<a href="lcdd_limits.xsd.html#element_limits" title="Jump to &quot;limits&quot; element declaration(located in external schema documentation)." class="externalLink">limits</a>&gt; ... &lt;/<a href="lcdd_limits.xsd.html#element_limits" title="Jump to &quot;limits&quot; element declaration(located in external schema documentation)." class="externalLink">limits</a>&gt; <span class="occurs">[0..1]</span>

 </div>

-<div style="margin-left: 1.5em">&lt;<a href="lcdd_regions.xsd.html#element_regions" title="Jump to &quot;regions&quot; element declaration(located in external schema documentation)." class="externalLink">regions</a>&gt; ... &lt;/<a href="lcdd_regions.xsd.html#element_regions" title="Jump to &quot;regions&quot; element declaration(located in external schema documentation)." class="externalLink">regions</a>&gt; <span class="occurs">[1]</span>

+<div style="margin-left: 1.5em">&lt;<a href="lcdd_regions.xsd.html#element_regions" title="Jump to &quot;regions&quot; element declaration(located in external schema documentation)." class="externalLink">regions</a>&gt; ... &lt;/<a href="lcdd_regions.xsd.html#element_regions" title="Jump to &quot;regions&quot; element declaration(located in external schema documentation)." class="externalLink">regions</a>&gt; <span class="occurs">[0..1]</span>

 </div>

-<div style="margin-left: 1.5em">&lt;<a href="lcdd_display.xsd.html#element_display" title="Jump to &quot;display&quot; element declaration(located in external schema documentation)." class="externalLink">display</a>&gt; ... &lt;/<a href="lcdd_display.xsd.html#element_display" title="Jump to &quot;display&quot; element declaration(located in external schema documentation)." class="externalLink">display</a>&gt; <span class="occurs">[1]</span>

+<div style="margin-left: 1.5em">&lt;<a href="lcdd_display.xsd.html#element_display" title="Jump to &quot;display&quot; element declaration(located in external schema documentation)." class="externalLink">display</a>&gt; ... &lt;/<a href="lcdd_display.xsd.html#element_display" title="Jump to &quot;display&quot; element declaration(located in external schema documentation)." class="externalLink">display</a>&gt; <span class="occurs">[0..1]</span>

 </div>
 <div style="margin-left: 1.5em">&lt;<a href="#element_gdml" title="Jump to &quot;gdml&quot; element declaration.">gdml</a>&gt; ... &lt;/<a href="#element_gdml" title="Jump to &quot;gdml&quot; element declaration.">gdml</a>&gt; <span class="occurs">[1]</span>
 </div>

-<div style="margin-left: 1.5em">&lt;<a href="lcdd_fields.xsd.html#element_fields" title="Jump to &quot;fields&quot; element declaration(located in external schema documentation)." class="externalLink">fields</a>&gt; ... &lt;/<a href="lcdd_fields.xsd.html#element_fields" title="Jump to &quot;fields&quot; element declaration(located in external schema documentation)." class="externalLink">fields</a>&gt; <span class="occurs">[1]</span>

+<div style="margin-left: 1.5em">&lt;<a href="lcdd_fields.xsd.html#element_fields" title="Jump to &quot;fields&quot; element declaration(located in external schema documentation)." class="externalLink">fields</a>&gt; ... &lt;/<a href="lcdd_fields.xsd.html#element_fields" title="Jump to &quot;fields&quot; element declaration(located in external schema documentation)." class="externalLink">fields</a>&gt; <span class="occurs">[0..1]</span>

 </div>&lt;/lcdd&gt;</div>
 </div>
 <script type="text/javascript">

@@ -1132,28 +1130,28 @@

 <div class="contents" id="element_lcdd_scbox">
 <div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">lcdd</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:complexType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:sequence</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_header.xsd.html#element_header" title="Jump to &quot;header&quot; element declaration(located in external schema documentation)." ="">header</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_iddict.xsd.html#element_iddict" title="Jump to &quot;iddict&quot; element declaration(located in external schema documentation)." class="externalLink">iddict</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_sensitive_detectors.xsd.html#element_sensitive_detectors" title="Jump to &quot;sensitive_detectors&quot; element declaration(located in external schema documentation)." class="externalLink">sensitive_detectors</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_limits.xsd.html#element_limits" title="Jump to &quot;limits&quot; element declaration(located in external schema documentation)." class="externalLink">limits</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_regions.xsd.html#element_regions" title="Jump to &quot;regions&quot; element declaration(located in external schema documentation)." class="externalLink">regions</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_display.xsd.html#element_display" title="Jump to &quot;display&quot; element declaration(located in external schema documentation)." class="externalLink">display</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="#element_gdml" title="Jump to &quot;gdml&quot; element declaration.">gdml</a>

-</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">ref</span>="<span class="scContent">
 <a href="lcdd_fields.xsd.html#element_fields" title="Jump to &quot;fields&quot; element declaration(located in external schema documentation)." class="externalLink">fields</a>

-</span>"/&gt;</div>&lt;/<span class="scTag">xs:sequence</span>&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>&lt;/<span class="scTag">xs:element</span>&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>"/&gt;</div>&lt;/<span class="scTag">xs:sequence</span>&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>&lt;/<span class="scTag">xs:element</span>&gt;</div>

 </div>
 <script type="text/javascript">
 <!--
www-lcsim/schemas/lcdd/1.0
lcdd_fields.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_fields.xsd	31 Aug 2005 19:24:31 -0000	1.1
+++ lcdd_fields.xsd	22 Sep 2005 23:18:11 -0000	1.2
@@ -111,7 +111,7 @@

 	  </xs:simpleType>
 	</xs:attribute>
 

-	<xs:attribute name="num_bins_z" type="xs:integer">

+	<xs:attribute name="num_bins_z">

 	  <xs:simpleType>
 	    <xs:restriction base="xs:integer">
 	      <xs:minInclusive value="2"/>

@@ -119,17 +119,17 @@

 	  </xs:simpleType>
 	</xs:attribute>
 

-	<xs:attribute name="grid_size_r" type="xs:double">

+	<xs:attribute name="grid_size_r">

 	  <xs:simpleType>

-	    <xs:restriction>

+	    <xs:restriction base="xs:double">

 	      <xs:minExclusive value="0"/>
 	    </xs:restriction>
 	  </xs:simpleType>
 	</xs:attribute>
 

-	<xs:attribute name="grid_size_z" type="xs:double">

+	<xs:attribute name="grid_size_z">

 	  <xs:simpleType>

-	    <xs:restriction>

+	    <xs:restriction base="xs:double">

 	      <xs:minExclusive value="0"/>
 	    </xs:restriction>
 	  </xs:simpleType>
www-lcsim/schemas/lcdd/1.0
lcdd_fields.xsd.html 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_fields.xsd.html	31 Aug 2005 19:24:31 -0000	1.1
+++ lcdd_fields.xsd.html	22 Sep 2005 23:18:11 -0000	1.2
@@ -1079,14 +1079,17 @@

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span> (<em>value</em> &gt;= 2)</span> <span class="occurs">[0..1]</span>"</span>
 <br />

-<span style="margin-left: 0.5em"> num_bins_z="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span> <span class="occurs">[0..1]</span>"</span>

+<span style="margin-left: 0.5em"> num_bins_z="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span> (<em>value</em> &gt;= 2)</span> <span class="occurs">[0..1]</span>"</span>

 <br />

-<span style="margin-left: 0.5em"> grid_size_r="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> <span class="occurs">[0..1]</span>"</span>

+<span style="margin-left: 0.5em"> grid_size_r="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> (<em>value</em> &gt; 0)</span> <span class="occurs">[0..1]</span>"</span>

 <br />

-<span style="margin-left: 0.5em"> grid_size_z="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />

+<span style="margin-left: 0.5em"> grid_size_z="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> (<em>value</em> &gt; 0)</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />

 <div style="margin-left: 1.5em">&lt;rzB&gt; <span class="type">
 <a href="#type_RZBType" title="Jump to &quot;RZBType&quot; type definition.">RZBType</a>
 </span> &lt;/rzB&gt; <span class="occurs">[2..*]</span>

@@ -1681,14 +1684,17 @@

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span> (<em>value</em> &gt;= 2)</span> <span class="occurs">[0..1]</span>"</span>
 <br />

-<span style="margin-left: 0.5em" class="newFields"> num_bins_z="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span> <span class="occurs">[0..1]</span>"</span>

+<span style="margin-left: 0.5em" class="newFields"> num_bins_z="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span> (<em>value</em> &gt;= 2)</span> <span class="occurs">[0..1]</span>"</span>

 <br />

-<span style="margin-left: 0.5em" class="newFields"> grid_size_r="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> <span class="occurs">[0..1]</span>"</span>

+<span style="margin-left: 0.5em" class="newFields"> grid_size_r="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> (<em>value</em> &gt; 0)</span> <span class="occurs">[0..1]</span>"</span>

 <br />

-<span style="margin-left: 0.5em" class="newFields"> grid_size_z="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />

+<span style="margin-left: 0.5em" class="newFields"> grid_size_z="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> (<em>value</em> &gt; 0)</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />

 <div style="margin-left: 1.5em" class="newFields">&lt;rzB&gt; <span class="type">
 <a href="#type_RZBType" title="Jump to &quot;RZBType&quot; type definition.">RZBType</a>
 </span> &lt;/rzB&gt; <span class="occurs">[2..*]</span>

@@ -1718,21 +1724,18 @@

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span>
 </span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:minInclusive</span> <span class="scTag">value</span>="<span class="scContent">2</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>&lt;/<span class="scTag">xs:attribute</span>&gt;</div>

-<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">num_bins_z</span>" <span class="scTag">type</span>="<span class="scContent">
-<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span>
-</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:simpleType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span> <span class="scTag">base</span>="<span class="scContent">

+<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">num_bins_z</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:simpleType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span> <span class="scTag">base</span>="<span class="scContent">

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:integer</span>
 </span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:minInclusive</span> <span class="scTag">value</span>="<span class="scContent">2</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>&lt;/<span class="scTag">xs:attribute</span>&gt;</div>

-<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">grid_size_r</span>" <span class="scTag">type</span>="<span class="scContent">

+<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">grid_size_r</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:simpleType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span> <span class="scTag">base</span>="<span class="scContent">

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span>

-</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:simpleType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:minExclusive</span> <span class="scTag">value</span>="<span class="scContent">0</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>&lt;/<span class="scTag">xs:attribute</span>&gt;</div>
-<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">grid_size_z</span>" <span class="scTag">type</span>="<span class="scContent">

+</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:minExclusive</span> <span class="scTag">value</span>="<span class="scContent">0</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>&lt;/<span class="scTag">xs:attribute</span>&gt;</div>
+<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">grid_size_z</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:simpleType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span> <span class="scTag">base</span>="<span class="scContent">

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span>

-</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:simpleType</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:restriction</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:minExclusive</span> <span class="scTag">value</span>="<span class="scContent">0</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>&lt;/<span class="scTag">xs:attribute</span>&gt;</div>&lt;/<span class="scTag">xs:extension</span>&gt;</div>&lt;/<span class="scTag">xs:complexContent</span>&gt;</div>&lt;/<span class="scTag">!
 ;xs:complexType</span>&gt;</div>

+</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:minExclusive</span> <span class="scTag">value</span>="<span class="scContent">0</span>"/&gt;</div>&lt;/<span class="scTag">xs:restriction</span>&gt;</div>&lt;/<span class="scTag">xs:simpleType</span>&gt;</div>&lt;/<span class="scTag">xs:attribute</span>&gt;</div>&lt;/<span class="scTag">xs:extension</span>&gt;</div>&lt;/<span class="scTag">xs:complexContent</span>&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

 </div>
 <script type="text/javascript">
 <!--
www-lcsim/schemas/lcdd/1.0
lcdd_header.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_header.xsd	31 Aug 2005 19:24:31 -0000	1.1
+++ lcdd_header.xsd	22 Sep 2005 23:18:11 -0000	1.2
@@ -16,12 +16,12 @@

     </xs:annotation>
 
     <xs:all>

-      <xs:element name="detector" type="DetectorType" maxOccurs="1" />
-      <xs:element name="author" type="AuthorType" maxOccurs="1" />    
-      <xs:element name="generator" type="GeneratorType" maxOccurs="1" />
-      <xs:element name="comment" type="xs:string" maxOccurs="1" />

+      <xs:element name="detector" type="DetectorType" minOccurs="1" maxOccurs="1" />
+      <xs:element name="author" type="AuthorType" minOccurs="0" maxOccurs="1" />
+      <xs:element name="generator" type="GeneratorType" minOccurs="0" maxOccurs="1" />
+      <xs:element name="comment" type="xs:string" minOccurs="0" maxOccurs="1" />

     </xs:all>

-   

+

   </xs:complexType>
 
   <xs:complexType name="DetectorType">

@@ -31,8 +31,8 @@

       </xs:documentation>
     </xs:annotation>
     <xs:attribute name="name" type="xs:string" />

-    <xs:attribute name="version" type="xs:string" />
-    <xs:attribute name="url" type="xs:string" />

+    <xs:attribute name="version" type="xs:string" default="1.0" />
+    <xs:attribute name="url" type="xs:anyURI" default="http://www.example.com"/>

   </xs:complexType>
 
   <xs:complexType name="AuthorType">

@@ -51,12 +51,12 @@

         Info on script or compact generator of this file.
       </xs:documentation>
     </xs:annotation>

-    <xs:attribute name="name" type="xs:string" />
-    <xs:attribute name="version" type="xs:string" />
-    <xs:attribute name="file" type="xs:string" />
-    <xs:attribute name="checksum" type="xs:unsignedInt" />

+    <xs:attribute name="name" type="xs:string" default="NONE" />
+    <xs:attribute name="version" type="xs:string" default="1.0" />
+    <xs:attribute name="file" type="xs:string" default="NONE" />
+    <xs:attribute name="checksum" type="xs:unsignedInt" default="0" />

   </xs:complexType>
 
   <xs:element name="header" type="HeaderType" />

-  

+

 </xs:schema>

\ No newline at end of file
www-lcsim/schemas/lcdd/1.0
lcdd_header.xsd.html 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_header.xsd.html	31 Aug 2005 19:24:31 -0000	1.1
+++ lcdd_header.xsd.html	22 Sep 2005 23:18:12 -0000	1.2
@@ -868,14 +868,14 @@

 </div>
 <div style="margin-left: 3em">&lt;author&gt; <span class="type">
 <a href="#type_AuthorType" title="Jump to &quot;AuthorType&quot; type definition.">AuthorType</a>

-</span> &lt;/author&gt; <span class="occurs">[1]</span>

+</span> &lt;/author&gt; <span class="occurs">[0..1]</span>

 </div>
 <div style="margin-left: 3em">&lt;generator&gt; <span class="type">
 <a href="#type_GeneratorType" title="Jump to &quot;GeneratorType&quot; type definition.">GeneratorType</a>

-</span> &lt;/generator&gt; <span class="occurs">[1]</span>

+</span> &lt;/generator&gt; <span class="occurs">[0..1]</span>

 </div>
 <div style="margin-left: 3em">&lt;comment&gt; <span class="type">

-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> &lt;/comment&gt; <span class="occurs">[1]</span>

+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> &lt;/comment&gt; <span class="occurs">[0..1]</span>

 </div>
 <span style="margin-left: 1.5em" class="group">End All</span>
 <br />&lt;/header&gt;</div>

@@ -1025,7 +1025,7 @@

 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> <span class="occurs">[0..1]</span>"</span>
 <br />
 <span style="margin-left: 0.5em"> url="<span class="type">

-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> <span class="occurs">[0..1]</span>"</span>/&gt; </div>

+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:anyURI</span> <span class="occurs">[0..1]</span>"</span>/&gt; </div>

 </div>
 <script type="text/javascript">
 <!--

@@ -1045,11 +1045,11 @@

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">version</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span>

-</span>"/&gt;</div>

+</span>" <span class="scTag">default</span>="<span class="scContent">1.0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">url</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">

-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span>
-</span>"/&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:anyURI</span>
+</span>" <span class="scTag">default</span>="<span class="scContent">http://www.example.com</span>"/&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

 </div>
 <script type="text/javascript">
 <!--

@@ -1123,19 +1123,19 @@

 <div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;<span class="scTag">xs:complexType</span> <span class="scTag">name</span>="<span class="scContent">GeneratorType</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">name</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span>

-</span>"/&gt;</div>

+</span>" <span class="scTag">default</span>="<span class="scContent">NONE</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">version</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span>

-</span>"/&gt;</div>

+</span>" <span class="scTag">default</span>="<span class="scContent">1.0</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">file</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span>

-</span>"/&gt;</div>

+</span>" <span class="scTag">default</span>="<span class="scContent">NONE</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">checksum</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:unsignedInt</span>

-</span>"/&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

+</span>" <span class="scTag">default</span>="<span class="scContent">0</span>"/&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

 </div>
 <script type="text/javascript">
 <!--

@@ -1192,14 +1192,14 @@

 </div>
 <div style="margin-left: 3em">&lt;author&gt; <span class="type">
 <a href="#type_AuthorType" title="Jump to &quot;AuthorType&quot; type definition.">AuthorType</a>

-</span> &lt;/author&gt; <span class="occurs">[1]</span>

+</span> &lt;/author&gt; <span class="occurs">[0..1]</span>

 </div>
 <div style="margin-left: 3em">&lt;generator&gt; <span class="type">
 <a href="#type_GeneratorType" title="Jump to &quot;GeneratorType&quot; type definition.">GeneratorType</a>

-</span> &lt;/generator&gt; <span class="occurs">[1]</span>

+</span> &lt;/generator&gt; <span class="occurs">[0..1]</span>

 </div>
 <div style="margin-left: 3em">&lt;comment&gt; <span class="type">

-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> &lt;/comment&gt; <span class="occurs">[1]</span>

+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> &lt;/comment&gt; <span class="occurs">[0..1]</span>

 </div>
 <span style="margin-left: 1.5em" class="group">End All</span>
 <br />&lt;/...&gt;</div>

@@ -1219,21 +1219,21 @@

 <span class="type">
 <a href="#type_DetectorType" title="Jump to &quot;DetectorType&quot; type definition.">DetectorType</a>
 </span>

-</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">1</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">author</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a href="#type_AuthorType" title="Jump to &quot;AuthorType&quot; type definition.">AuthorType</a>
 </span>

-</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">generator</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a href="#type_GeneratorType" title="Jump to &quot;GeneratorType&quot; type definition.">GeneratorType</a>
 </span>

-</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>

 <div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">comment</span>" <span class="scTag">type</span>="<span class="scContent">
 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span>

-</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>&lt;/<span class="scTag">xs:all</span>&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>&lt;/<span class="scTag">xs:all</span>&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>

 </div>
 <script type="text/javascript">
 <!--
www-lcsim/schemas/lcdd/1.0
lcdd_regions.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_regions.xsd	31 Aug 2005 19:24:32 -0000	1.1
+++ lcdd_regions.xsd	22 Sep 2005 23:18:12 -0000	1.2
@@ -6,6 +6,8 @@

 	   xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	   xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0/">
 

+  <xs:include schemaLocation="lcdd_limits.xsd" />
+

   <xs:complexType name="RegionsType">
     <xs:annotation>
       <xs:documentation>

@@ -20,6 +22,9 @@

   </xs:element>
 
   <xs:complexType name="RegionType">

+    <xs:sequence>
+      <xs:element minOccurs="0" maxOccurs="1" name="limitsetref" type="ReferenceType" />
+    </xs:sequence>

     <xs:attribute name="name" type="xs:ID" use="required"/>
     <xs:attribute name="store_secondaries" default="false" type="xs:boolean" />
     <xs:attribute name="cut" default="1.0" type="xs:double"/>
www-lcsim/schemas/lcdd/1.0
lcdd_regions.xsd.html 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_regions.xsd.html	31 Aug 2005 19:24:32 -0000	1.1
+++ lcdd_regions.xsd.html	22 Sep 2005 23:18:12 -0000	1.2
@@ -775,6 +775,19 @@

 </ul>
 </td>
 </tr>

+<tr>
+<th>Schema Composition</th>
+<td>
+<ul>
+<li>This schema includes components from the following schema document(s):<ul>
+<li>
+<a href="lcdd_limits.xsd.html" title="Jump to schema documentation for 'lcdd_limits.xsd'.">lcdd_limits.xsd</a>
+</li>
+</ul>
+</li>
+</ul>
+</td>
+</tr>

 </table>
 <h3>Declared Namespaces</h3>
 <table class="namespaces">

@@ -806,7 +819,8 @@

 <input style="display: none" onclick="switchState('schema_scbox'); return false;" class="control" id="schema_scbox_button" type="button" /> <span class="caption">Schema Component Representation</span>
 </div>
 <div class="contents" id="schema_scbox">

-<div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;<span class="scTag">xs:schema</span> <span class="scTag">attributeFormDefault</span>="<span class="scContent">unqualified</span>" <span class="scTag">elementFormDefault</span>="<span class="scContent">unqualified</span>"&gt;<div style="margin-left: 1.5em" class="scContent">...</div>&lt;/<span class="scTag">xs:schema</span>&gt;</div>

+<div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;<span class="scTag">xs:schema</span> <span class="scTag">attributeFormDefault</span>="<span class="scContent">unqualified</span>" <span class="scTag">elementFormDefault</span>="<span class="scContent">unqualified</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:include</span> <span class="scTag">schemaLocation</span>="<span class="scContent">lcdd_limits.xsd</span>"/&gt;</div>
+<div style="margin-left: 1.5em" class="scContent">...</div>&lt;/<span class="scTag">xs:schema</span>&gt;</div>

 </div>
 <script type="text/javascript">
 <!--

@@ -871,7 +885,11 @@

 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> <span class="occurs">[0..1]</span>"</span>
 <br />
 <span style="margin-left: 0.5em"> eunit="<span class="type">

-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> <span class="occurs">[0..1]</span>"</span>/&gt; </div>

+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />
+<div style="margin-left: 1.5em">&lt;limitsetref&gt; <span class="type">
+<a href="javascript:void(0)" title="&quot;ReferenceType&quot; type definition could not be found." onclick="alert('&quot;ReferenceType&quot; type definition could not be found.');">ReferenceType</a>
+</span> &lt;/limitsetref&gt; <span class="occurs">[0..1]</span>
+</div>&lt;/region&gt;</div>

 </div>
 <script type="text/javascript">
 <!--

@@ -1082,7 +1100,11 @@

 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:double</span> <span class="occurs">[0..1]</span>"</span>
 <br />
 <span style="margin-left: 0.5em"> eunit="<span class="type">

-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> <span class="occurs">[0..1]</span>"</span>/&gt; </div>

+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />
+<div style="margin-left: 1.5em">&lt;limitsetref&gt; <span class="type">
+<a href="javascript:void(0)" title="&quot;ReferenceType&quot; type definition could not be found." onclick="alert('&quot;ReferenceType&quot; type definition could not be found.');">ReferenceType</a>
+</span> &lt;/limitsetref&gt; <span class="occurs">[0..1]</span>
+</div>&lt;/...&gt;</div>

 </div>
 <script type="text/javascript">
 <!--

@@ -1095,7 +1117,12 @@

 <input style="display: none" onclick="switchState('type_RegionType_scbox'); return false;" class="control" id="type_RegionType_scbox_button" type="button" /> <span class="caption">Schema Component Representation</span>
 </div>
 <div class="contents" id="type_RegionType_scbox">

-<div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;<span class="scTag">xs:complexType</span> <span class="scTag">name</span>="<span class="scContent">RegionType</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">name</span>" <span class="scTag">type</span>="<span class="scContent">

+<div style="margin-left: 0em" xmlns="http://www.w3.org/1999/xhtml">&lt;<span class="scTag">xs:complexType</span> <span class="scTag">name</span>="<span class="scContent">RegionType</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:sequence</span>&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:element</span> <span class="scTag">name</span>="<span class="scContent">limitsetref</span>" <span class="scTag">type</span>="<span class="scContent">
+<span class="type">
+<a href="javascript:void(0)" title="&quot;ReferenceType&quot; type definition could not be found." onclick="alert('&quot;ReferenceType&quot; type definition could not be found.');">ReferenceType</a>
+</span>
+</span>" <span class="scTag">minOccurs</span>="<span class="scContent">0</span>" <span class="scTag">maxOccurs</span>="<span class="scContent">1</span>"/&gt;</div>&lt;/<span class="scTag">xs:sequence</span>&gt;</div>
+<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:attribute</span> <span class="scTag">name</span>="<span class="scContent">name</span>" <span class="scTag">type</span>="<span class="scContent">

 <span class="type">
 <a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:ID</span>
 </span>" <span class="scTag">use</span>="<span class="scContent">required</span>"/&gt;</div>
CVSspam 0.2.8