lcdd/schemas/lcdd/1.0

diff -u -r1.1 -r1.2
--- lcdd_fields.xsd	29 Aug 2005 17:26:14 -0000	1.1
+++ lcdd_fields.xsd	29 Aug 2005 23:22:35 -0000	1.2
@@ -5,7 +5,7 @@

 	   elementFormDefault="unqualified"
 	   version="1.0"
 	   xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0/"

-	   xmlns:xs="http://www.w3.org/2001/XMLSchema">	  

+	   xmlns:xs="http://www.w3.org/2001/XMLSchema">

 
   <xs:complexType name="FieldsType">
     <xs:annotation>

@@ -18,12 +18,12 @@

       <xs:element name="global_field" minOccurs="0" maxOccurs="1" type="GlobalFieldType" />
     </xs:sequence>
   </xs:complexType>

-  

+

   <xs:complexType name="GlobalFieldType">
     <xs:annotation>
       <xs:documentation>
       </xs:documentation>

-    </xs:annotation>    

+    </xs:annotation>

     <xs:sequence>
       <xs:element name="fieldref" minOccurs="1" maxOccurs="1" type="ReferenceType" />
     </xs:sequence>

@@ -34,7 +34,9 @@

 
   <xs:complexType name="FieldType">
     <xs:attribute name="name" type="xs:ID"/>

-  </xs:complexType>  

+    <xs:attribute default="tesla" name="funit" type="xs:string"/>
+    <xs:attribute default="mm" name="lunit" type="xs:string" />
+  </xs:complexType>

 
   <xs:element name="field" type="FieldType">
   </xs:element>

@@ -54,9 +56,7 @@

 	<xs:attribute name="zmin" type="xs:string" />
 	<xs:attribute name="zmax" type="xs:string" />
 	<xs:attribute name="inner_radius" type="xs:string" />

-	<xs:attribute name="outer_radius" type="xs:string" />      
-	<xs:attribute default="tesla" name="funit" type="xs:string"/>
-	<xs:attribute default="mm" name="lunit" type="xs:string" />

+	<xs:attribute name="outer_radius" type="xs:string" />

       </xs:extension>
     </xs:complexContent>
   </xs:complexType>

@@ -64,7 +64,51 @@

   <xs:element name="solenoid" substitutionGroup="field" type="SolenoidType">
     <xs:annotation>
       <xs:documentation>

-	Solenoidal field element 

+	Solenoidal field element
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:complexType name="FieldMapType">
+    <xs:annotation>
+      <xs:documentation>
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="FieldType">
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="RZBType">
+    <xs:annotation>
+      <xs:documentation>
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="r" type="xs:double"/>
+    <xs:attribute name="z" type="xs:double"/>
+    <xs:attribute name="Br" type="xs:double"/>
+    <xs:attribute name="Bz" type="xs:double"/>
+  </xs:complexType>
+
+  <xs:complexType name="RZFieldMapType">
+    <xs:annotation>
+      <xs:documentation>
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="FieldMapType">
+	<xs:sequence>
+	  <xs:element name="rzB" type="RZBType" minOccurs="2" maxOccurs="unbounded" />
+	</xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="rz_field_map" substitutionGroup="field" type="RZFieldMapType">
+    <xs:annotation>
+      <xs:documentation>
+	Solenoidal field element

       </xs:documentation>
     </xs:annotation>
   </xs:element>