Print

Print


Commit in www-lcsim/schemas/lcdd/1.0 on MAIN
lcdd_sensitive_detectors.xsd+8-51.1 -> 1.2
lcdd_sensitive_detectors.xsd.html+17-81.1 -> 1.2
+25-13
2 modified files


www-lcsim/schemas/lcdd/1.0
lcdd_sensitive_detectors.xsd 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_sensitive_detectors.xsd	31 Aug 2005 19:24:32 -0000	1.1
+++ lcdd_sensitive_detectors.xsd	16 Dec 2005 21:53:27 -0000	1.2
@@ -65,6 +65,14 @@
 	<xs:sequence>
 	  <xs:element minOccurs="0" maxOccurs="1" ref="segmentation"/>
 	</xs:sequence>
+	<xs:attribute name="hit_aggregation" default="id">
+	  <xs:simpleType>
+	    <xs:restriction base="xs:string">
+	      <xs:enumeration value="id" />
+	      <xs:enumeration value="position" />
+	    </xs:restriction>
+	  </xs:simpleType>
+	</xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -113,13 +121,8 @@
 	    This type of SD ignore the ecut attribute, because this will often be 0 in a vacuum.
 	  </xs:documentation>
 	</xs:annotation>
-	<!--
-	    <xs:attribute name="kill_tracks" type="xs:boolean" default="false" />
-	-->
       </xs:extension>
     </xs:complexContent>
-    <!--
-    -->
   </xs:complexType>
 
   <xs:element name="scorer" substitutionGroup="sd" type="ScorerType">

www-lcsim/schemas/lcdd/1.0
lcdd_sensitive_detectors.xsd.html 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lcdd_sensitive_detectors.xsd.html	31 Aug 2005 19:24:32 -0000	1.1
+++ lcdd_sensitive_detectors.xsd.html	16 Dec 2005 21:53:27 -0000	1.2
@@ -957,7 +957,11 @@
 <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"> verbose="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:int</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:int</span> <span class="occurs">[0..1]</span>"</span>
+<br />
+<span style="margin-left: 0.5em"> hit_aggregation="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> (<em>value</em> comes from list: {'id'|'position'})</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />
 <span style="margin-left: 1.5em" class="group">Start <a href="#term_Choice" title="Look up 'Choice' in glossary">Choice</a> <span class="occurs">[1]</span>
 </span>
 <br />
@@ -1922,7 +1926,11 @@
 <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" class="inherited"> verbose="<span class="type">
-<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:int</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:int</span> <span class="occurs">[0..1]</span>"</span>
+<br />
+<span style="margin-left: 0.5em" class="newFields"> hit_aggregation="<span class="constraint">
+<span class="type">
+<a title="Find out namespace of 'xs' prefix" href="#ns_xs">xs</a>:string</span> (<em>value</em> comes from list: {'id'|'position'})</span> <span class="occurs">[0..1]</span>"</span>&gt; <br />
 <span style="margin-left: 1.5em" class="group">Start <a href="#term_Choice" title="Look up 'Choice' in glossary">Choice</a> <span class="occurs">[1]</span>
 </span>
 <br />
@@ -1952,7 +1960,12 @@
 </span>
 </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="#element_segmentation" title="Jump to &quot;segmentation&quot; element declaration.">segmentation</a>
-</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>&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>" <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">hit_aggregation</span>" <span class="scTag">default</span>="<span class="scContent">id</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>:string</span>
+</span>"&gt;<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">id</span>"/&gt;</div>
+<div style="margin-left: 1.5em">&lt;<span class="scTag">xs:enumeration</span> <span class="scTag">value</span>="<span class="scContent">position</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">
 <!--
@@ -2383,11 +2396,7 @@
 <span class="type">
 <a href="#type_SensitiveDetectorType" title="Jump to &quot;SensitiveDetectorType&quot; type definition.">SensitiveDetectorType</a>
 </span>
-</span>"&gt;<div style="margin-left: 1.5em" class="comment">&lt;--
-	    &lt;xs:attribute name="kill_tracks" type="xs:boolean" default="false" /&gt;
-	--&gt;</div>&lt;/<span class="scTag">xs:extension</span>&gt;</div>&lt;/<span class="scTag">xs:complexContent</span>&gt;</div>
-<div style="margin-left: 1.5em" class="comment">&lt;--
-    --&gt;</div>&lt;/<span class="scTag">xs:complexType</span>&gt;</div>
+</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">
 <!--
CVSspam 0.2.8