Removing the uid stuff, already done by other scripts

diff --git a/xml-db/schema/TrbNetSetup.xsd b/xml-db/schema/TrbNetSetup.xsd
index c947792a064c19cd37d6124ac050e7c69b2b7b56..46e76d6ad568cfae74b42284e504d05583acc096 100644 (file)
--- a/xml-db/schema/TrbNetSetup.xsd
+++ b/xml-db/schema/TrbNetSetup.xsd
@@ -5,16 +5,8 @@
   <xs:element name="TrbNetSetup">
     <xs:complexType>
       <xs:sequence>
-        <!-- must contain either a uid map to setup the network
-             initially, or a trb directive. otherwise it's useless :)
-             -->
         <xs:element   ref="description" />
-        <xs:choice>
-          <xs:element   ref="uidMap"/>
-          <xs:element   ref="trb"/>
-        </xs:choice>
-        <!-- may contain even more trb directives -->
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:choice maxOccurs="unbounded">
           <xs:element   ref="trb"      />
         </xs:choice>
       </xs:sequence>
@@ -59,38 +51,5 @@
   </xs:complexType>
 
   
-  <xs:attribute name="endpoint">
-    <xs:simpleType>
-      <xs:restriction base="xs:integer">
-        <xs:pattern value="[0-3]|5"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-
-  <xs:simpleType name="uidcontent">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[0-9a-fA-F]{16}"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="uidtype">
-    <xs:simpleContent>
-      <xs:extension base="uidcontent">
-        <xs:attribute ref="address" />
-        <xs:attribute ref="endpoint" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="uid" type="uidtype" />
-
-  <xs:element name="uidMap">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element ref="uid" />
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-
 
 </xs:schema>

diff --git a/xml-db/setup/trb-setup-default.xml b/xml-db/setup/trb-setup-default.xml
index 30c2ed7cc5632726007c0d3c65392ead533758f6..7aaa11948bb0fffa9c937c010a97a3f487cca1e2 100644 (file)
--- a/xml-db/setup/trb-setup-default.xml
+++ b/xml-db/setup/trb-setup-default.xml
@@ -8,26 +8,11 @@
   
 <description>A hypothetic TRB set-up that due to some strange coincidence exists in Mainz.</description>
 
-  <!-- The order of the trb elements is respected and their content is
-       evaluated after each one (if they specify a value). This is important if the resulting
-       changes to the TrbNet must happen in a certain way. -->
-
   <!-- also note the different uses of the address attribute:
        sometimes it's a register address, sometimes a trbnet endpoint
        address, or sometimes it specifies the chain number of the
        external PaDiWa frontend -->
 
-                
-  <!-- this specifies the trbaddress from uid's, it can be omitted if
-       the TrbNet is already set-up -->
-  <uidMap>
-    <uid address="0200" endpoint="0">5900000337e29728</uid>
-    <uid address="0201" endpoint="1">cf00000337e29e28</uid>
-    <uid address="0202" endpoint="2">ad00000338175028</uid>
-    <uid address="0203" endpoint="3">0e00000338174b28</uid>
-    <uid address="8000" endpoint="5">4400000338174628</uid>
-  </uidMap>
-
   <!-- we configure the trb endpoint with address 0x8000 -->
   <trb address="8000">
     <broadcast address="fffe" />
@@ -53,9 +38,6 @@
   <trb address="0200">
     <broadcast address="fe48" />
 
-    <!-- Standard TrbNet enpoint with standard 65ch TDC... -->
-    <entity ref="TrbNet" />
-    <entity ref="TDC" />
     <!-- ...but also some "external" PaDiWa frontends connected at
          chain 0 and 2. The fronend has some more registers which can
          be accessed via SPI. The idea is that there's also a