corrections...

v1.0/analysis/analysis.xml

@@ -1,165 +1,167 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-<!-- ********************************************************* -->
-<!--                     Analysis section                       -->
-<!-- ********************************************************* -->
-	<section>
-			<type>analysis</type>
-			<name>Analysis</name>
-			<definition>Sections of the Analysis type can be used to describe analyses.</definition>
-     
-	   
-	   <property>
-         <name>Author</name>
-	      <value>
-			<type>person</type>
-	      </value>
-         <definition>The name of the person who did the analysis, e.g. 'John Doe' or 'Doe, John'</definition>
-      </property>
-      
-      <property>
-         <name>Date</name>
-	      <value>
-			<type>date</type>
-	      </value>
-         <definition>The date of analysis.</definition>
-      </property>
-      
-      <property>
-         <name>Description</name>
-	      <value>
-			<type>text</type>
-	      </value>
-         <definition>A general description of the analysis.</definition>
-      </property>
-      
-      <property>
-         <name>Method</name>
-	      <value>
-			<type>string</type>
-	      </value>
-         <definition>The name of a method used in this analysis. E.g. "power spectrum".</definition>
-      </property>
-      
-      <property>
-         <name>CommandlineCall</name>
-	      <value>
-			<type>string</type>
-	      </value>
-         <definition>The command used to execute the analysis including the command line parameter.</definition>
-      </property> 
-      
-      <property>
-         <name>Comment</name>
-	      <value>
-			<type>text</type>
-	      </value>
-         <definition>Specific comments on this analysis.</definition>
-      </property>
-      
-      <property>
-         <name>CodeFile</name>
-	      <value>
-			<type>binary</type>
-	      </value>
-         <definition> The program code to analyse the data can be transferred using this property. 
-         Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying code file.</definition>
-      </property> 
-      
-      <property>
-         <name>CodeFileURL</name>
-	      <value>
-			<type>URL</type>
-	      </value>
-         <definition>The URL of the applied piece of program code to actually do the analysis.</definition>
-      </property> 
-       
-      <property>
-         <name>CodeRevision</name>
-	      <value>
-			<type>string</type>
-	      </value>
-         <definition> If the analysis code is under version control the revision number can be specified using this property.</definition>
-      </property> 
-       
-       
-      <property>
-         <name>ConfigFile</name>
-	      <value>
-			<type>binary</type>
-	      </value>
-         <definition> The configurations used to analyse the data can be transferred using this property. 
-         Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying configuration file.</definition>
-      </property> 
-      
-      <property>
-         <name>ConfigFileURL</name>
-	      <value>
-			<type>URL</type>
-	      </value>
-         <definition>The URL of the used configuration file used to run the analysis.</definition>
-      </property>  
-      
-      <property>
-         <name>DatasetFile</name>
-	      <value>
-			<type>binary</type>
-	      </value>
-         <definition> The data analysed ion the described way can be transferred using this property. 
-         Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying dataset file.</definition>
-      </property> 
-      
-      <property>
-         <name>DatasetFileURL</name>
-	      <value>
-			<type>URL</type>
-	      </value>
-         <definition>The URL of a analysed datasetFile.</definition>
-      </property>
-
-      <property>
-         <name>ResultFile</name>
-	      <value>
-			<type>binary</type>
-	      </value>
-         <definition> The results of this analysis can be transferred using this property. 
-         Using it willblow up the the size of the metadatafile and we recommend to rather define the URL of the results file.</definition>
-      </property> 
-      
-      <property>
-         <name>ResultFileURL</name>
-	      <value>
-			<type>URL</type>
-	      </value>
-         <definition>The URL of a results file.</definition>
-      </property>  
-      
-      <property>
-         <name>ResultFigure</name>
-	      <value>
-			<type>binary</type>
-	      </value>
-         <definition>A figure showing the results. This property is meant to strore the real figure content. 
-         This will blow up the the size of the metadatafile and we recommend to rather define the URL of the figure.</definition>
-      </property> 
-      
-      <property>
-         <name>PaperDOI</name>
-	      <value>
-			<type>text</type>
-	      </value>
-         <definition>If the results of this analysis have been published one can store the doi of the paper.</definition>
-      </property> 
-      
-      <property>
-         <name>PaperURL</name>
-	      <value>
-			<type>URL</type>
-	      </value>
-         <definition>If the results of this analysis have been published the URL of the document can be given here</definition>
-      </property> 
-   
-   </section> 
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+<!-- ********************************************************* -->
+<!--                     Analysis section                       -->
+<!-- ********************************************************* -->
+	<section>
+			<type>analysis</type>
+			<name>Analysis</name>
+			<definition>Sections of the Analysis type can be used to describe analyses.</definition>
+     
+	   
+	   <property>
+         <name>Author</name>
+	      <value>
+			<type>person</type>
+	      </value>
+         <definition>The name of the person who did the analysis, e.g. 'John Doe' or 'Doe, John'</definition>
+      </property>
+      
+      <property>
+         <name>Date</name>
+	      <value>
+			<type>date</type>
+	      </value>
+         <definition>The date of analysis.</definition>
+      </property>
+      
+      <property>
+         <name>Description</name>
+	      <value>
+			<type>text</type>
+	      </value>
+         <definition>A general description of the analysis.</definition>
+      </property>
+      
+      <property>
+         <name>Method</name>
+	      <value>
+			<type>string</type>
+	      </value>
+         <definition>The name of a method used in this analysis. E.g. "power spectrum".</definition>
+      </property>
+      
+      <property>
+         <name>CommandlineCall</name>
+	      <value>
+			<type>string</type>
+	      </value>
+         <definition>The command used to execute the analysis including the command line parameter.</definition>
+      </property> 
+      
+      <property>
+         <name>Comment</name>
+	      <value>
+			<type>text</type>
+	      </value>
+         <definition>Specific comments on this analysis.</definition>
+      </property>
+      
+      <property>
+         <name>CodeFile</name>
+	      <value>
+			<type>binary</type>
+	      </value>
+         <definition> The program code to analyse the data can be transferred using this property. 
+         Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying code file.</definition>
+      </property> 
+      
+      <property>
+         <name>CodeFileURL</name>
+	      <value>
+			<type>URL</type>
+	      </value>
+         <definition>The URL of the applied piece of program code to actually do the analysis.</definition>
+      </property> 
+       
+      <property>
+         <name>CodeRevision</name>
+	      <value>
+			<type>string</type>
+	      </value>
+         <definition> If the analysis code is under version control the revision number can be specified using this property.</definition>
+      </property> 
+       
+       
+      <property>
+         <name>ConfigFile</name>
+	      <value>
+			<type>binary</type>
+	      </value>
+         <definition> The configurations used to analyse the data can be transferred using this property. 
+         Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying configuration file.</definition>
+      </property> 
+      
+      <property>
+         <name>ConfigFileURL</name>
+	      <value>
+			<type>URL</type>
+	      </value>
+         <definition>The URL of the used configuration file used to run the analysis.</definition>
+      </property>  
+      
+      <property>
+         <name>DatasetFile</name>
+	      <value>
+			<type>binary</type>
+	      </value>
+         <definition> The data analysed ion the described way can be transferred using this property. 
+         Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying dataset file.</definition>
+      </property> 
+      
+      <property>
+         <name>DatasetFileURL</name>
+	      <value>
+			<type>URL</type>
+	      </value>
+         <definition>The URL of a analysed datasetFile.</definition>
+      </property>
+
+      <property>
+         <name>ResultFile</name>
+	      <value>
+			<type>binary</type>
+	      </value>
+         <definition> The results of this analysis can be transferred using this property. 
+         Using it willblow up the the size of the metadatafile and we recommend to rather define the URL of the results file.</definition>
+      </property> 
+      
+      <property>
+         <name>ResultFileURL</name>
+	      <value>
+			<type>URL</type>
+	      </value>
+         <definition>The URL of a results file.</definition>
+      </property>  
+      
+      <property>
+         <name>ResultFigure</name>
+	      <value>
+			<type>binary</type>
+	      </value>
+         <definition>A figure showing the results. This property is meant to strore the real figure content. 
+         This will blow up the the size of the metadatafile and we recommend to rather define the URL of the figure.</definition>
+      </property> 
+      
+      <property>
+         <name>PaperDOI</name>
+	      <value>
+			<type>text</type>
+	      </value>
+         <definition>If the results of this analysis have been published one can store the doi of the paper.</definition>
+      </property> 
+      
+      <property>
+         <name>PaperURL</name>
+	      <value>
+			<type>URL</type>
+	      </value>
+         <definition>If the results of this analysis have been published the URL of the document can be given here</definition>
+      </property> 
+   
+   </section> 
+</odML>

v1.0/analysis/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/analysis/power_spectrum.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                     Analysis section                       -->
 <!-- ********************************************************* -->

v1.0/analysis/psth.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                     PSTH section                       -->
 <!-- ********************************************************* -->
@@ -40,17 +42,17 @@
 	      <value>
 	         instantaneous spike rate
 			   <type>string</type>
-			   <valueComment>Estimation of the firing rate by using the inverse of the interspike interval.</valueComment>
+			   <definition>Estimation of the firing rate by using the inverse of the interspike interval.</definition>
 	      </value>
 	      <value>
 	         sliding window
 			   <type>string</type>
-			   <valueComment>The window function was slid over the data at recording resolution.</valueComment>
+			   <definition>The window function was slid over the data at recording resolution.</definition>
 	      </value>
 	      <value>
 	         discrete window
 			   <type>string</type>
-			   <valueComment>Spikes were averaged within the window, window discretely displaced by the window width.</valueComment>
+			   <definition>Spikes were averaged within the window, window discretely displaced by the window width.</definition>
 	      </value>
 	      <definition>The method used for creating the PSTH.</definition>
       </property>
@@ -60,17 +62,17 @@
 	      <value>
 	         rectangular
 			   <type>string</type>
-			   <valueComment>A recangular kernel was used.</valueComment>
+			   <definition>A recangular kernel was used.</definition>
 	      </value>
 	      <value>
 	         gaussian
 			   <type>string</type>
-			   <valueComment>A gaussian kernel was used.</valueComment>
+			   <definition>A gaussian kernel was used.</definition>
 	      </value>
 	      <value>
 	         alpha
 			   <type>string</type>
-			   <valueComment>A alpha function was used as window function.</valueComment>
+			   <definition>A alpha function was used as window function.</definition>
 	      </value>
 	      <definition>The kind of windowing function used to cerate the PSTH.</definition>
       </property> 

v1.0/carmenMini/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/cell/cell.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<!-- ********************************************************* -->
 	<!--                      Cell  section                        -->
 	<!-- ********************************************************* -->
@@ -16,7 +18,7 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>The type of the recorded cell. E.g. pyramidal cell.</nameDefinition>
+         <definition>The type of the recorded cell. E.g. pyramidal cell.</definition>
       </property>
       
       <property>
@@ -24,8 +26,8 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>The region the cell is located in. For example
-         Retina, Cortex, Cerebellum etc.</nameDefinition>
+         <definition>The region the cell is located in. For example
+         Retina, Cortex, Cerebellum etc.</definition>
       </property> 
       
       <property>
@@ -33,9 +35,9 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>More detailed specification of the region the
+         <definition>More detailed specification of the region the
          cell is located in. For example, if BrainRegion is
-         "hippocampus", then the BrainSubRegion may be "CA1".</nameDefinition>
+         "hippocampus", then the BrainSubRegion may be "CA1".</definition>
       </property> 
       
       <property>
@@ -43,7 +45,7 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>The name of the layer. For example, layer 4 in CA1.</nameDefinition>
+         <definition>The name of the layer. For example, layer 4 in CA1.</definition>
       </property> 
       
       <property>
@@ -51,8 +53,8 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>Like the pro-, meta- and mesothoracal ganglion
-         in invertebrates.</nameDefinition>
+         <definition>Like the pro-, meta- and mesothoracal ganglion
+         in invertebrates.</definition>
       </property>
       
       <property>
@@ -60,8 +62,8 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>The structure of the organism the cell is
-         located in e.g. Eye, Spinal cord...</nameDefinition>
+         <definition>The structure of the organism the cell is
+         located in e.g. Eye, Spinal cord...</definition>
       </property>
       
       <property>
@@ -69,8 +71,8 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>The recording location in the cell. E.g. axonal, dendritic,
-         somatic, ...</nameDefinition>
+         <definition>The recording location in the cell. E.g. axonal, dendritic,
+         somatic, ...</definition>
       </property> 
       
       <property>
@@ -78,7 +80,7 @@
 	      <value>
 			<type>string</type>
 	      </value>
-         <nameDefinition>How was the cell identified?</nameDefinition>
+         <definition>How was the cell identified?</definition>
       </property>
       
       <property>
@@ -87,8 +89,8 @@
 			<type>float</type>
 			<unit>mV</unit>
 		 </value>
-         <nameDefinition>What is the cells resting potential of the
-         cell. An indiator for the recording quality.</nameDefinition>
+         <definition>What is the cells resting potential of the
+         cell. An indiator for the recording quality.</definition>
       </property> 
       
       <property>
@@ -97,9 +99,9 @@
 			<type>float</type>
 			<unit>Hz</unit>
 		  </value>
-         <nameDefinition>For spiking cells, the spontaneous activity
+         <definition>For spiking cells, the spontaneous activity
          which might be an indicator for the cell's health status and
-         thus recording quality.</nameDefinition>
+         thus recording quality.</definition>
       </property>
       
       <property>
@@ -107,8 +109,8 @@
 	      <value>
 			<type>float</type>
 	      </value>
-         <nameDefinition>The standard deviation of the baseline
-         membrane potential.</nameDefinition>
+         <definition>The standard deviation of the baseline
+         membrane potential.</definition>
       </property> 
       
       <property>
@@ -117,8 +119,8 @@
 			<type>float</type>
 			<unit>nA</unit>
 		  </value>
-         <nameDefinition>The minimum current required to make the cell
-         fire action potentials.</nameDefinition>
+         <definition>The minimum current required to make the cell
+         fire action potentials.</definition>
       </property> 
       
       <property>
@@ -127,7 +129,7 @@
 			<type>float</type>
 			<unit>pF</unit>
 		  </value>
-         <nameDefinition>The capacity of the cell.</nameDefinition>
+         <definition>The capacity of the cell.</definition>
       </property>
       
       <property>
@@ -136,8 +138,8 @@
 			<type>float</type>
 			<unit>MOhm</unit>
 		  </value>
-         <nameDefinition>The input resistance of the recorded
-         cell.</nameDefinition>
+         <definition>The input resistance of the recorded
+         cell.</definition>
       </property>   
       
       <property>
@@ -146,7 +148,7 @@
 			<type>float</type>
 			<unit>ms</unit>
 		  </value>
-         <nameDefinition>The mebrane time-constant.</nameDefinition>
+         <definition>The mebrane time-constant.</definition>
       </property>  
       
       <property>
@@ -154,7 +156,7 @@
 	      <value>
 			<type>text</type>
 	      </value>
-         <nameDefinition>A comment on the cell.</nameDefinition>
+         <definition>A comment on the cell.</definition>
       </property>
    </section> 
 </odML>

v1.0/cell/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/collection/event_list.xml

@@ -1,31 +1,33 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-<!-- ********************************************************* -->
-<!--                   EventList Section                        -->
-<!-- ********************************************************* -->
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	<section>
-		<type>collection/event_list</type>
-		<name>EventList</name>
-		<definition>Section for grouping short annotations that are taken during
-     an experiment, preparation etc..</definition>
-      
-		<property>
-			<name>Timestamp</name>
-			<value>
-				<type>datetime</type> 
-			</value>
-			<definition>The local datetime entry of the moment the event was
-         taken (YYYY-MM-DD hh:mm:ss format).</definition>
-		</property> 
-     
-		<property>
-			<name>Description</name>
-			<value>
-				<type>text</type> 
-			</value>
-			<definition>A description of the event.</definition>
-		</property> 
-	</section> 
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+  <version>1.0</version>
+        <date>2011-01-21</date>
+<!-- ********************************************************* -->
+<!--                   EventList Section                        -->
+<!-- ********************************************************* -->
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	<section>
+		<type>collection/event_list</type>
+		<name>EventList</name>
+		<definition>Section for grouping short annotations that are taken during
+     an experiment, preparation etc..</definition>
+      
+		<property>
+			<name>Timestamp</name>
+			<value>
+				<type>datetime</type> 
+			</value>
+			<definition>The local datetime entry of the moment the event was
+         taken (YYYY-MM-DD hh:mm:ss format).</definition>
+		</property> 
+     
+		<property>
+			<name>Description</name>
+			<value>
+				<type>text</type> 
+			</value>
+			<definition>A description of the event.</definition>
+		</property> 
+	</section> 
+</odML>

v1.0/collection/hardware_properties.xml

@@ -1,25 +1,27 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-<!-- ********************************************************* -->
-<!--                       hardware properties                 -->
-<!-- ********************************************************* -->
-   <section>
-	<type>collection/hardware_properties</type>
-	<name>HardwareProperties</name>
-      <definition>Fixed properties of hardware components used in the
-      experimental setup. There are two sections for describing
-      hardware components: the "HardwareProperties" and the
-      "HardwareSettings" section. While the HardwareProperties
-      describe the fixed properties of the hardware that can not be
-      changed, the HardwareSettings section describes the actual,
-      adjustable, parameters of the hardware that may change with each
-      recording or dataset. For example, the sample rate of an
-      data-acquisition board or the settings of a filter. In each of
-      these two sections there are subsections for each device that
-      correspond to the class of the device like data-acquisition,
-      amplifier, etc. Some properties are common for any
-      type. </definition>
-     </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+<!-- ********************************************************* -->
+<!--                       hardware properties                 -->
+<!-- ********************************************************* -->
+   <section>
+	<type>collection/hardware_properties</type>
+	<name>HardwareProperties</name>
+      <definition>Fixed properties of hardware components used in the
+      experimental setup. There are two sections for describing
+      hardware components: the "HardwareProperties" and the
+      "HardwareSettings" section. While the HardwareProperties
+      describe the fixed properties of the hardware that can not be
+      changed, the HardwareSettings section describes the actual,
+      adjustable, parameters of the hardware that may change with each
+      recording or dataset. For example, the sample rate of an
+      data-acquisition board or the settings of a filter. In each of
+      these two sections there are subsections for each device that
+      correspond to the class of the device like data-acquisition,
+      amplifier, etc. Some properties are common for any
+      type. </definition>
+     </section>
+</odML>

v1.0/collection/hardware_settings.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                       hardware settings                   -->
 <!-- ********************************************************* -->

v1.0/collection/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/dataset/dataset.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
   <!-- ********************************************************* -->
   <!--                      Dataset section                      -->
   <!-- ********************************************************* -->

v1.0/dataset/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/electrode/electrode.xml

@@ -1,149 +1,151 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--        Recording Electrodes        -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-    <section>
-		<type>electrode</type>
-        <name>Electrode</name>   
-	    <definition>Properties to describe an electrode.</definition>
-
-         <property>
-            <name>Type</name>
-	         <value>sharp
-				<type>string</type>
-	         </value>
-            <value>patch
-				<type>string</type>
-            </value>
-            <value>injection
-   				<type>string</type>
-            </value>
-            <value>extracellular
-            	<type>string</type>
-            </value>
-            <value>multibarrel
-            	<type>string</type>
-            </value>
-            <value>multi-electrode-array
-            	<type>string</type>
-            </value>
-            <value>tetrode
-            	<type>string</type>
-            </value>
-            <definition>The type of electrode.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Material</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Material the electrodes are made of e.g. glass. tungsten, steel ...</definition>
-	      </property>  
-	      
-	      <property>
-            <name>GlassType</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Type of Glass used to pull these electrodes. (e.g. Quartz, Borosilicate)</definition>
-            <dependency>Material</dependency>
-            <dependencyValue>Glass</dependencyValue>
-	      </property>  
-	      
-	       <property>
-            <name>GlassSpecification</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>Inner and outer diameter, with or without filament.</definition>
-            <dependency>Material</dependency>
-            <dependencyValue>Glass</dependencyValue>
-	      </property>  
-	   
-	       <property>
-            <name>FirePolish</name>
-	         <value>
-				<type>boolean</type>
-	         </value>
-            <definition>Specifies whether or not the electrodes were fire polished.</definition>
-            <dependency>Material</dependency>
-            <dependencyValue>Glass</dependencyValue>
-	      </property>  
-	      
-	       <property>
-            <name>Puller</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Puller used to make the electrodes.</definition>
-            <dependency>Material</dependency>
-            <dependencyValue>Glass</dependencyValue>
-	      </property>  
-	      
-	      <property>
-            <name>PullParameter</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The specific pull parameters like heat, trip velocity, heat and cooling duration etc..</definition>
-            <dependency>Material</dependency>
-            <dependencyValue>Glass</dependencyValue>
-	      </property>  
-	      
-	      <property>
-            <name>ShapeParameters</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The shape parameters of the electrode.</definition>
-	      </property>  
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The manufacturer of the electrodes if e.g. ordered from a company.</definition>
-	      </property>  
-	      
-	      <property>
-            <name>TipSize</name>
-	         <value>
-				<type>float</type>
-				<unit>&#956;m</unit>
-	         </value>
-            <definition>The tip size.</definition>
-	      </property>  
-	      
-	      <property>
-            <name>Coating</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The coating used to insulate the electrodes.</definition>
-	      </property>  
-	        
-         <property>
-            <name>Impedance</name>
-	         <value>
-				<type>float</type>
-				<unit>M&#937;</unit>
-	         </value>
-            <definition>Electrode impedance.</definition>
-	      </property>  
-       
-         <property>
-            <name>ElectrodeCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>Number of electrodes in a multi-electrode-array.</definition>
-	      </property>  
-	     
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--        Recording Electrodes        -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+    <section>
+		<type>electrode</type>
+        <name>Electrode</name>   
+	    <definition>Properties to describe an electrode.</definition>
+
+         <property>
+            <name>Type</name>
+	         <value>sharp
+				<type>string</type>
+	         </value>
+            <value>patch
+				<type>string</type>
+            </value>
+            <value>injection
+   				<type>string</type>
+            </value>
+            <value>extracellular
+            	<type>string</type>
+            </value>
+            <value>multibarrel
+            	<type>string</type>
+            </value>
+            <value>multi-electrode-array
+            	<type>string</type>
+            </value>
+            <value>tetrode
+            	<type>string</type>
+            </value>
+            <definition>The type of electrode.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Material</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Material the electrodes are made of e.g. glass. tungsten, steel ...</definition>
+	      </property>  
+	      
+	      <property>
+            <name>GlassType</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Type of Glass used to pull these electrodes. (e.g. Quartz, Borosilicate)</definition>
+            <dependency>Material</dependency>
+            <dependencyValue>Glass</dependencyValue>
+	      </property>  
+	      
+	       <property>
+            <name>GlassSpecification</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>Inner and outer diameter, with or without filament.</definition>
+            <dependency>Material</dependency>
+            <dependencyValue>Glass</dependencyValue>
+	      </property>  
+	   
+	       <property>
+            <name>FirePolish</name>
+	         <value>
+				<type>boolean</type>
+	         </value>
+            <definition>Specifies whether or not the electrodes were fire polished.</definition>
+            <dependency>Material</dependency>
+            <dependencyValue>Glass</dependencyValue>
+	      </property>  
+	      
+	       <property>
+            <name>Puller</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Puller used to make the electrodes.</definition>
+            <dependency>Material</dependency>
+            <dependencyValue>Glass</dependencyValue>
+	      </property>  
+	      
+	      <property>
+            <name>PullParameter</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The specific pull parameters like heat, trip velocity, heat and cooling duration etc..</definition>
+            <dependency>Material</dependency>
+            <dependencyValue>Glass</dependencyValue>
+	      </property>  
+	      
+	      <property>
+            <name>ShapeParameters</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The shape parameters of the electrode.</definition>
+	      </property>  
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The manufacturer of the electrodes if e.g. ordered from a company.</definition>
+	      </property>  
+	      
+	      <property>
+            <name>TipSize</name>
+	         <value>
+				<type>float</type>
+				<unit>&#956;m</unit>
+	         </value>
+            <definition>The tip size.</definition>
+	      </property>  
+	      
+	      <property>
+            <name>Coating</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The coating used to insulate the electrodes.</definition>
+	      </property>  
+	        
+         <property>
+            <name>Impedance</name>
+	         <value>
+				<type>float</type>
+				<unit>M&#937;</unit>
+	         </value>
+            <definition>Electrode impedance.</definition>
+	      </property>  
+       
+         <property>
+            <name>ElectrodeCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>Number of electrodes in a multi-electrode-array.</definition>
+	      </property>  
+	     
+      </section>
+
+</odML>

v1.0/electrode/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/event/event.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                   Event Section                        -->
 <!-- ********************************************************* -->

v1.0/event/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/experiment/behavior.xml

@@ -1,55 +1,56 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************************************* -->
-<!--                     Behavioral experiment			                       -->
-<!-- ********************************************************* -->  
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-	<section>
-		<type>experiment/bahavior</type>
-		<name>Behavior</name>
-		<definition>Properties for describing an behavioural experiment.</definition>
-			         
-		 <property>
-        	<name>Paradigm</name>
-	      <value>
-			<type>string</type> 
-	      </value>
-         <definition>The paradigm used in the experiment, e.g. Learning, navigation, etc... </definition>
-      </property>
-         
-      <property>
-         <name>Environment</name>
-	      <value>
-			<type>string</type> 
-	      </value>
-         <definition>The environment in which the experiments were conducted. Classical environments are e.g. the Y-maze or T-maze. Some environments are called enriched also reduced or even natural.</definition>
-      </property>
-         
-      <property>
-         <name>IndividualCount</name>
-         <value>
-			<type>int</type> 
-         </value>
-         <definition>The number of individuals that are observed/investigated at the same time.</definition>
-      </property>
-         
-      <property>
-         <name>definition</name>
-         <value>
-			<type>text</type> 
-         </value>
-         <definition>A definition of the conducted experiment.</definition>
-      </property>
-	  
-	           
-      <property>
-         <name>Protocol</name>
-         <value>
-			<type>text</type> 
-         </value>
-         <definition>A description of the task protocol undertaken by the subject.</definition>
-      </property>
-   </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--                     Behavioral experiment			                       -->
+<!-- ********************************************************* -->  
+<odML version="1">
+  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+  <version>1.0</version>
+  <date>2011-01-21</date>	
+  
+  <section>
+    <type>experiment/bahavior</type>
+    <name>Behavior</name>
+    <definition>Properties for describing an behavioural experiment.</definition>
+    
+    <property>
+      <name>Paradigm</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The paradigm used in the experiment, e.g. Learning, navigation, etc... </definition>
+    </property>
+    
+    <property>
+      <name>Environment</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The environment in which the experiments were conducted. Classical environments are e.g. the Y-maze or T-maze. Some environments are called enriched also reduced or even natural.</definition>
+    </property>
+    
+    <property>
+      <name>IndividualCount</name>
+      <value>
+        <type>int</type> 
+      </value>
+      <definition>The number of individuals that are observed/investigated at the same time.</definition>
+    </property>
+    
+    <property>
+      <name>definition</name>
+      <value>
+        <type>text</type> 
+      </value>
+      <definition>A definition of the conducted experiment.</definition>
+    </property>
+    
+    <property>
+      <name>Protocol</name>
+      <value>
+        <type>text</type> 
+      </value>
+      <definition>A description of the task protocol undertaken by the subject.</definition>
+    </property>
+  </section>
+</odML>

v1.0/experiment/electrophysiology.xml

@@ -1,61 +1,62 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************************************* -->
-<!--                    	 Electrophysiology                   			   -->
-<!-- ********************************************************* -->  
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-	<section>
-		<type>experiment/electrophysiology</type>
-		<name>Electrophysiology</name>
-		<definition>Properties for describing an electrophysiological experiment.</definition>
-			      
-		<property>
-			<name>Type</name>
-			<value>intracellular recording
-				<type>string</type> 
-			</value>
-			<value>extracellular recording
-				<type>string</type> 
-			</value>
-			<value>patch clamp
-				<type>string</type> 
-			</value>
-			<value>whole cell patch
-				<type>string</type> 
-			</value>
-			<value>loose patch
-				<type>string</type> 
-			</value>
-			<value>ERG
-				<type>string</type> 
-			</value>
-			<value>EEG
-				<type>string</type> 
-			</value>
-			<value>EKG
-				<type>string</type> 
-			</value>
-			<value>EMG
-				<type>string</type> 
-			</value>
-			<definition>Intracellular recording of single cell responses with sharp microelectrodes.</definition>
-		</property>
-      			
-		<property>
-			<name>Subtype</name>
-			<value>single electrode recording
-				<type>string</type> 
-			</value>
-			<value>dual electrode recording
-				<type>string</type> 
-			</value>
-			<value>multi electrode recording
-				<type>string</type> 
-			</value>
-			<definition>Subtype of this electrophysiological experiment.</definition>
-		</property>
-      
-	</section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--                    	 Electrophysiology                   			   -->
+<!-- ********************************************************* -->  
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>	
+	<section>
+		<type>experiment/electrophysiology</type>
+		<name>Electrophysiology</name>
+		<definition>Properties for describing an electrophysiological experiment.</definition>
+			      
+		<property>
+			<name>Type</name>
+			<value>intracellular recording
+				<type>string</type> 
+			</value>
+			<value>extracellular recording
+				<type>string</type> 
+			</value>
+			<value>patch clamp
+				<type>string</type> 
+			</value>
+			<value>whole cell patch
+				<type>string</type> 
+			</value>
+			<value>loose patch
+				<type>string</type> 
+			</value>
+			<value>ERG
+				<type>string</type> 
+			</value>
+			<value>EEG
+				<type>string</type> 
+			</value>
+			<value>EKG
+				<type>string</type> 
+			</value>
+			<value>EMG
+				<type>string</type> 
+			</value>
+			<definition>Intracellular recording of single cell responses with sharp microelectrodes.</definition>
+		</property>
+      			
+		<property>
+			<name>Subtype</name>
+			<value>single electrode recording
+				<type>string</type> 
+			</value>
+			<value>dual electrode recording
+				<type>string</type> 
+			</value>
+			<value>multi electrode recording
+				<type>string</type> 
+			</value>
+			<definition>Subtype of this electrophysiological experiment.</definition>
+		</property>
+      
+	</section>
+</odML>

v1.0/experiment/experiment.xml

@@ -5,6 +5,8 @@
 <!-- ********************************************************* -->  
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<section>
 		<type>experiment</type>
 		<name>Experiment</name>

v1.0/experiment/imaging.xml

@@ -1,36 +1,37 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************************************* -->
-<!--                     Imaging experiment			                       -->
-<!-- ********************************************************* --> 
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-	<section>
-		<type>experiment/imaging</type>
-		<name>Imaging</name>
-	   <definition>Properties for describing an imaging experiment ranging from conventional light microscpoy to fMRI.</definition>
-	   
-	            
-	   <property>
-         <name>Type</name>
-	      <value>REM
-			<type>string</type> 
-	      </value>
-	      <value>light microscopy
-	        <type>string</type> 
-	      </value>
-	      <value>confocal
-	        <type>string</type> 
-	      </value>
-	      <value>two-photon
-	        <type>string</type> 
-	      </value>
-	      <value>fMRI
-	        <type>string</type> 
-	      </value>
-         <definition>The type of imaging like two-photon, confocal, REM, light microscopy, fMRI, etc..</definition>
-      </property>
-      
-      </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--                     Imaging experiment			                       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>	
+	<section>
+		<type>experiment/imaging</type>
+		<name>Imaging</name>
+	   <definition>Properties for describing an imaging experiment ranging from conventional light microscpoy to fMRI.</definition>
+	   
+	            
+	   <property>
+         <name>Type</name>
+	      <value>REM
+			<type>string</type> 
+	      </value>
+	      <value>light microscopy
+	        <type>string</type> 
+	      </value>
+	      <value>confocal
+	        <type>string</type> 
+	      </value>
+	      <value>two-photon
+	        <type>string</type> 
+	      </value>
+	      <value>fMRI
+	        <type>string</type> 
+	      </value>
+         <definition>The type of imaging like two-photon, confocal, REM, light microscopy, fMRI, etc..</definition>
+      </property>
+      
+      </section>
+</odML>

v1.0/experiment/modeling.xml

@@ -1,22 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************************************* -->
-<!--                     		Simulation	  	 			                       -->
-<!-- ********************************************************* --> 
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-		<section>
-		<type>experiment/modeling</type>
-		<name>Modeling</name>
-	   <definition>Properties for describing a modeling experiment.</definition>
-	   
-	 	     
-      <property>
-         <name>SimulationType</name>
-	      <value>
-			<type>string</type> 
-	      </value>
-         <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
-      </property>
-   </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--                     		Simulation	  	 			                       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	<section>
+		<type>experiment/modeling</type>
+		<name>Modeling</name>
+	   <definition>Properties for describing a modeling experiment.</definition>
+	   
+	 	     
+          <property>
+            <name>SimulationType</name>
+	      <value>
+			<type>string</type> 
+	      </value>
+         <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
+      </property>
+   </section>
+</odML>

v1.0/experiment/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/experiment/psychophysics.xml

@@ -1,71 +1,73 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************************************* -->
-<!--                     Psychophysics Experiment	                       -->
-<!-- ********************************************************* --> 
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-	<section>
-		<type>experiment/psychophysics</type>
-		<name>Psychophysics</name>
-		<definition>Properties for describing an psychophysical experiment.</definition>
-	      
-		<property>
-            <name>Task</name>
-	         <value>
-				<type>string</type> 
-	         </value>
-            <definition>The task the subjects have to do like "discrimination" between different stimuli, "detection" of a stimulus etc... </definition>
-		</property>
-      
-         <property>
-            <name>Paradigm</name>
-	         <value>
-				<type>string</type> 
-	         </value>
-            <definition>The experimental paradigm e.g. Two-alternative-forced-choice, Three-alternative-forced-choice.</definition>
-         </property> 
-         
-         <property>
-            <name>SubjectKnowledge</name>
-	         <value>
-				<type>string</type> 
-	         </value>
-            <definition>Was the subject "naive", "trained", or "instructed"?</definition>
-         </property> 
-         
-         <property>
-            <name>TrainingTrials</name>
-	         <value>
-				<type>int</type> 
-	         </value>
-            <definition>The number of trials used for training of the experimental subject.</definition>
-         </property> 
-         
-         <property>
-            <name>TrainingDuration</name>
-	         <value>
-				<type>float</type> 
-				<unit>h</unit> 
-			 </value>
-            <definition>The training duration.</definition>
-         </property> 
-      
-         <property>
-            <name>SubjectInstruction</name>
-	         <value>
-				<type>text</type> 
-	         </value>
-            <definition>The instructions given to the subjects.</definition>
-         </property> 
-      
-         <property>
-            <name>definition</name>
-	         <value>
-				<type>text</type> 
-	         </value>
-	         <definition>A definition of the conducted experiment.</definition>
-         </property>
-      </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--                     Psychophysics Experiment	                       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	
+	<section>
+		<type>experiment/psychophysics</type>
+		<name>Psychophysics</name>
+		<definition>Properties for describing an psychophysical experiment.</definition>
+	      
+		<property>
+            <name>Task</name>
+	         <value>
+				<type>string</type> 
+	         </value>
+            <definition>The task the subjects have to do like "discrimination" between different stimuli, "detection" of a stimulus etc... </definition>
+		</property>
+      
+         <property>
+            <name>Paradigm</name>
+	         <value>
+				<type>string</type> 
+	         </value>
+            <definition>The experimental paradigm e.g. Two-alternative-forced-choice, Three-alternative-forced-choice.</definition>
+         </property> 
+         
+         <property>
+            <name>SubjectKnowledge</name>
+	         <value>
+				<type>string</type> 
+	         </value>
+            <definition>Was the subject "naive", "trained", or "instructed"?</definition>
+         </property> 
+         
+         <property>
+            <name>TrainingTrials</name>
+	         <value>
+				<type>int</type> 
+	         </value>
+            <definition>The number of trials used for training of the experimental subject.</definition>
+         </property> 
+         
+         <property>
+            <name>TrainingDuration</name>
+	         <value>
+				<type>float</type> 
+				<unit>h</unit> 
+			 </value>
+            <definition>The training duration.</definition>
+         </property> 
+      
+         <property>
+            <name>SubjectInstruction</name>
+	         <value>
+				<type>text</type> 
+	         </value>
+            <definition>The instructions given to the subjects.</definition>
+         </property> 
+      
+         <property>
+            <name>definition</name>
+	         <value>
+				<type>text</type> 
+	         </value>
+	         <definition>A definition of the conducted experiment.</definition>
+         </property>
+      </section>
+</odML>

v1.0/hardware/amplifier.xml

@@ -1,156 +1,157 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--        Amplifier         		 -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	     
-     <section>
-		<type>hardware/amplifier</type>	
-        <name>Amplifier</name>
-        <definition>The amplifier section defines elements that can be used to describe amplifier properties and settings.</definition>
-        
-          <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-         
-         <property>
-	         <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>person</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Type</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The type of amplifier. E.g. extracellular, intracellular amplifier etc.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      	      
-	      <property>
-            <name>MeasurementType</name>
-            <value>Bridge
-				<type>string</type>
-				<valueComment>Passive measurement in Bridge -Mode.</valueComment>
-            </value>
-            <value>CC
-				<type>string</type>
-				<valueComment>Current Clamp measurement.</valueComment>
-            </value>
-            <value>VC
-				<type>string</type>
-	            <valueComment>Voltage Clamp measurement.</valueComment>
-			</value>
-	         <value>VCcCC
-				<type>string</type>
-	            <valueComment>Voltage Clamp controlled Current Clamp measurement.</valueComment>
-	         </value>
-            <value>Dynamic Clamp
-				<type>string</type>
-	            <valueComment>Dynamic Clamp measurement.</valueComment>
-            </value>
-            <definition>The amplifier mode. Measurement in Voltage clamp controlled current clamp -mode.</definition>
-         </property> 
-         
-	      <property>
-            <name>OperationMode</name>
-	         <value>Bridged
-				<type>string</type>
-	            <valueComment>Passive measurement in Bridge -Mode.</valueComment>
-	         </value>
-	         <value>Discontinuous
-				<type>string</type>
-	            <valueComment>Measurement in Discontinuous (switched) -Mode.</valueComment>
-	         </value>
-            <definition>The amplifier mode.</definition>
-	      </property>
-
-	      <property>
-            <name>SwitchingFrequency</name>
-	         <value>
-				<type>float</type>
-				<unit>Hz</unit>
-			 </value>
-	         <dependency>OperationMode</dependency>
-	         <dependencyValue>Discontiuous</dependencyValue>
-            <definition>The amplifier switching frequency. This property is only meaningful in Discontinuos operation modes.</definition>
-	      </property>
-	  
-	      <property>
-            <name>DutyCycle</name>
-	         <value>
-				<type>float</type>
-			 </value>
-	         <dependency>OperationMode</dependency>
-	         <dependencyValue>Discontinuous</dependencyValue>
-            <definition>The amplifier duty cylce if in disconinuous mode (e.g. 0.25, 0.5).</definition>
-	      </property>  
-	  
-	      <property>
-            <name>Gain</name>
-	         <value>
-				<type>float</type>
-			 </value>
-            <definition>The amplifier gain.</definition>
-	      </property>
-	      
-	      <property>
-            <name>HighpassCutoff</name>
-            <value>
-				<type>float</type>
-				<unit>Hz</unit>
-			 </value>
-            <definition>The cutoff frequency of the amplifier's highpass filter.</definition>
-	      </property>
-	      
-	      <property>
-            <name>LowpassCutoff</name>
-	         <value>
-				<type>float</type>
-				<unit>Hz</unit>
-			 </value>
-            <definition>The cutoff frequency of the amplifier's lowpass filter.</definition>
-	      </property>	      
-	      
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-         </property>   
-
-      </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--        Amplifier         		 -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date> 
+     <section>
+		<type>hardware/amplifier</type>	
+        <name>Amplifier</name>
+        <definition>The amplifier section defines elements that can be used to describe amplifier properties and settings.</definition>
+        
+          <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+         
+         <property>
+	         <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>person</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Type</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The type of amplifier. E.g. extracellular, intracellular amplifier etc.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      	      
+	      <property>
+            <name>MeasurementType</name>
+            <value>Bridge
+				<type>string</type>
+				<definition>Passive measurement in Bridge -Mode.</definition>
+            </value>
+            <value>CC
+				<type>string</type>
+				<definition>Current Clamp measurement.</definition>
+            </value>
+            <value>VC
+				<type>string</type>
+	            <definition>Voltage Clamp measurement.</definition>
+			</value>
+	         <value>VCcCC
+				<type>string</type>
+	            <definition>Voltage Clamp controlled Current Clamp measurement.</definition>
+	         </value>
+            <value>Dynamic Clamp
+				<type>string</type>
+	            <definition>Dynamic Clamp measurement.</definition>
+            </value>
+            <definition>The amplifier mode. Measurement in Voltage clamp controlled current clamp -mode.</definition>
+         </property> 
+         
+	      <property>
+            <name>OperationMode</name>
+	         <value>Bridged
+				<type>string</type>
+	            <definition>Passive measurement in Bridge -Mode.</definition>
+	         </value>
+	         <value>Discontinuous
+				<type>string</type>
+	            <definition>Measurement in Discontinuous (switched) -Mode.</definition>
+	         </value>
+            <definition>The amplifier mode.</definition>
+	      </property>
+
+	      <property>
+            <name>SwitchingFrequency</name>
+	         <value>
+				<type>float</type>
+				<unit>Hz</unit>
+			 </value>
+	         <dependency>OperationMode</dependency>
+	         <dependencyValue>Discontiuous</dependencyValue>
+            <definition>The amplifier switching frequency. This property is only meaningful in Discontinuos operation modes.</definition>
+	      </property>
+	  
+	      <property>
+            <name>DutyCycle</name>
+	         <value>
+				<type>float</type>
+			 </value>
+	         <dependency>OperationMode</dependency>
+	         <dependencyValue>Discontinuous</dependencyValue>
+            <definition>The amplifier duty cylce if in disconinuous mode (e.g. 0.25, 0.5).</definition>
+	      </property>  
+	  
+	      <property>
+            <name>Gain</name>
+	         <value>
+				<type>float</type>
+			 </value>
+            <definition>The amplifier gain.</definition>
+	      </property>
+	      
+	      <property>
+            <name>HighpassCutoff</name>
+            <value>
+				<type>float</type>
+				<unit>Hz</unit>
+			 </value>
+            <definition>The cutoff frequency of the amplifier's highpass filter.</definition>
+	      </property>
+	      
+	      <property>
+            <name>LowpassCutoff</name>
+	         <value>
+				<type>float</type>
+				<unit>Hz</unit>
+			 </value>
+            <definition>The cutoff frequency of the amplifier's lowpass filter.</definition>
+	      </property>	 
+	      
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+            
+      </section>
+</odML>

v1.0/hardware/attenuator.xml

@@ -1,102 +1,104 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
- <!-- ********************************** -->
-      <!--        Attenuator properties       -->
-      <!-- ********************************** -->
-     <section>
-		<type>hardware/attenuator</type>
-        <name>Attenuator</name>
-	      <definition>Settings of the data acquisition system. most settings refer to individual channels the channel number should be given after the property name like DAQ.AISampleRate0 for the sampling rate of the analog input	channel 0.</definition>
-         
-        <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property>  
-         
-         <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-      	</property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-           <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      
-	     <property>
-            <name>LineCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-           <definition>The number of indepoendent lines.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>MaxAttenuation</name>
-	         <value>
-				<type>float</type>
-	         </value>
-           <definition>The maximum attenuation.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>MinAttenuation</name>
-	         <value>
-				<type>float</type>
-	         </value>
-           <definition>The minimum attenuation.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>StepSize</name>
-	         <value>
-				<type>float</type>
-	         </value>
-           <definition>The size of the attenuation steps between minimum and maximum attenuation.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Attenuation</name>
-	         <value>
-				<type>float</type>
-	         </value>
-           <definition>The actual attenuation setting.</definition>
-	      </property> 
-	     
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-          </property>   
-
-      </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+ <!-- ********************************** -->
+      <!--        Attenuator properties       -->
+      <!-- ********************************** -->
+     <section>
+		<type>hardware/attenuator</type>
+        <name>Attenuator</name>
+	      <definition>Settings of the data acquisition system. most settings refer to individual channels the channel number should be given after the property name like DAQ.AISampleRate0 for the sampling rate of the analog input	channel 0.</definition>
+         
+        <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property>  
+         
+         <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+      	</property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+           <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      
+	     <property>
+            <name>LineCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+           <definition>The number of indepoendent lines.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>MaxAttenuation</name>
+	         <value>
+				<type>float</type>
+	         </value>
+           <definition>The maximum attenuation.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>MinAttenuation</name>
+	         <value>
+				<type>float</type>
+	         </value>
+           <definition>The minimum attenuation.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>StepSize</name>
+	         <value>
+				<type>float</type>
+	         </value>
+           <definition>The size of the attenuation steps between minimum and maximum attenuation.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Attenuation</name>
+	         <value>
+				<type>float</type>
+	         </value>
+           <definition>The actual attenuation setting.</definition>
+	      </property> 
+	      
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+	      
+      </section>
+</odML>

v1.0/hardware/camera_objective.xml

@@ -1,158 +1,160 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--           Camera Objective         		 -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-     
-     <section>
-		<type>hardware/camera_objective</type>
-        <name>CameraObjective</name>
-         <definition>This section contains properties that describe a camera objective.</definition>
-	      
-         <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of this device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>SerialNo</name>
-	         <value>
-		         <type>string</type>
-	         </value>
-            <definition>The serial number of this device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The owner of this device.</definition>
-	      </property> 
-          
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The objective model name.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The Manufacturer providing the objective.</definition>
-	      </property> 
-		  
-	      <property>
-            <name>Type</name>
-	         <value>Zoom
-				<type>string</type>
-	         </value>
-			 <value>Macro
-				<type>string</type>
-			 </value>
-			 <value>FixedFocus
-				<type>string</type>
-			 </value>
-			 <value>FixedApperture
-				<type>string</type>
-			 </value>
-	         <definition>The type of objective.</definition>
-	      </property>
-	      
-		  <property>
-            <name>Mount</name>
-	         <value>C-Mount
-				<type>string</type>
-	         </value>
-			 <value>CS-Mount
-				<type>string</type>
-			 </value>
-	         <definition>The type of mount.</definition>
-	      </property>
-		  
-		  <property>
-            <name>NumericalAperture</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The numerical aperture (N.A.) of the objective.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>MaximumAperture</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The maximum aperture of the objective.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Aperture</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The actual aperture setting of the objective.</definition>
-	      </property>
-	      
-	      <property>
-            <name>FocalLengthRange</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The range of focal lengths of the objective.</definition>
-	      </property>
-	      
-	      <property>
-            <name>FocalLength</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The focal length of the objective.</definition>
-	      </property>
-		  
-		  <property>
-            <name>TransmissionLowerBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The lower bound of transmission.</definition>
-	      </property>
-		  
-		  <property>
-            <name>TransmissionUpperBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The upper bound of transmission.</definition>
-	      </property>
-		  
-		   <property>
-            <name>TransmissionRange</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The transmission range (min - max).</definition>
-	      </property>  
-	      
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-          </property>   
-
-	  </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--           Camera Objective         		 -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+     <section>
+		<type>hardware/camera_objective</type>
+        <name>CameraObjective</name>
+         <definition>This section contains properties that describe a camera objective.</definition>
+	      
+         <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of this device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>SerialNo</name>
+	         <value>
+		         <type>string</type>
+	         </value>
+            <definition>The serial number of this device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The owner of this device.</definition>
+	      </property> 
+          
+	      <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The objective model name.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The Manufacturer providing the objective.</definition>
+	      </property> 
+		  
+	      <property>
+            <name>Type</name>
+	         <value>Zoom
+				<type>string</type>
+	         </value>
+			 <value>Macro
+				<type>string</type>
+			 </value>
+			 <value>FixedFocus
+				<type>string</type>
+			 </value>
+			 <value>FixedApperture
+				<type>string</type>
+			 </value>
+	         <definition>The type of objective.</definition>
+	      </property>
+	      
+		  <property>
+            <name>Mount</name>
+	         <value>C-Mount
+				<type>string</type>
+	         </value>
+			 <value>CS-Mount
+				<type>string</type>
+			 </value>
+	         <definition>The type of mount.</definition>
+	      </property>
+		  
+		  <property>
+            <name>NumericalAperture</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The numerical aperture (N.A.) of the objective.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>MaximumAperture</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The maximum aperture of the objective.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Aperture</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The actual aperture setting of the objective.</definition>
+	      </property>
+	      
+	      <property>
+            <name>FocalLengthRange</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The range of focal lengths of the objective.</definition>
+	      </property>
+	      
+	      <property>
+            <name>FocalLength</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The focal length of the objective.</definition>
+	      </property>
+		  
+		  <property>
+            <name>TransmissionLowerBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The lower bound of transmission.</definition>
+	      </property>
+		  
+		  <property>
+            <name>TransmissionUpperBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The upper bound of transmission.</definition>
+	      </property>
+		  
+		   <property>
+            <name>TransmissionRange</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The transmission range (min - max).</definition>
+	      </property>
+
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+	 
+	  </section>
+
+</odML>

v1.0/hardware/daq.xml

@@ -1,191 +1,193 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
- <!-- ********************************** -->
-      <!-- Data  acquisition (DAQ) properties -->
-      <!-- ********************************** -->
-      <section>
-		<type>hardware/daq</type>
-        <name>DataAcquisition</name>
-         <definition>The hardware section describes the settings of the used hardware. There should be one hardware section for each hardware item that was used.</definition>
-                   
-	      <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-      	</property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-           <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>AIResolution</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The voltage resolution of the analog input (AIN) subsystem given in bit.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>AIMaxSampleRate</name>
-	         <value>
-				<type>float</type>
-				<unit>Hz</unit>
-			 </value>
-            <definition>The maximum sampling rate.</definition>
-	      </property>
-	      
-	      <property>
-            <name>AIChannelCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The number of input channels of the DAQ-device.</definition>
-	      </property>
-	      
-	      <property>
-            <name>AOResolution</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The voltage resolution of a data-acquisition
-             analog output (AO) subsystem given in bit.</definition>
-	      </property>
-	      
-         <property>
-            <name>AOMaxSampleRate</name>
-	         <value>
-				<type>float</type>
-				<unit>Hz</unit>
-			 </value>
-            <definition>The maximum sampling rate.</definition>
-	      </property>
-	      
-	      <property>
-            <name>AOChannelCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The number of output channels of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>DIOLineCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The number of digital input/output lines (DIO) of the device.</definition>
-	      </property>
-  
-
-	      <property>
-            <name>AIUsedChannelCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The number of used analog input channels.</definition>
-	      </property>
-	      
-	      <property>
-            <name>AISampleRate</name>
-	         <value>
-				<type>int</type>
-				<unit>Hz</unit>
-			 </value>
-            <definition>The sample rate with which an individual input
-            channel was sampled. Given in Hz. </definition>
-	      </property> 
-	      
-	      <property>
-            <name>AIChannelGain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The gain of an input channel.</definition>
-	      </property>
-	      
-	      <property>
-            <name>AIReference</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The reference to which voltages were measured. Usually either "common ground" or "differential".</definition>
-	      </property> 
-	      
-	      <property>
-            <name>AIPolarity</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The polarity of the measurement "unipolar" or "bipolar".</definition>
-	      </property> 
-	      
-	      <property>
-            <name>AOUsedChannelCount</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The number of used analog output channels.
-	         </definition>
-	      </property>
-	      
-	      <property>
-            <name>AOSampleRate</name>
-	         <value>
-				<type>int</type>
-				<unit>Hz</unit>
-			 </value>
-            <definition>The sample rate with which an individual output
-            channel was sampled. Given in Hz.</definition>
-	      </property>  
-	      
-	      <property>
-            <name>AOChannelGain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The gain of an output channel.</definition>
-	      </property> 
- 
-          <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-         </property>   
-
-   </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+ <!-- ********************************** -->
+      <!-- Data  acquisition (DAQ) properties -->
+      <!-- ********************************** -->
+      <section>
+		<type>hardware/daq</type>
+        <name>DataAcquisition</name>
+         <definition>The hardware section describes the settings of the used hardware. There should be one hardware section for each hardware item that was used.</definition>
+                   
+	      <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property> 
+	      
+	   <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+      	   </property> 
+	
+	   <property>
+                <name>Manufacturer</name>
+	        <value>
+			<type>string</type>
+	        </value>
+                <definition>The Manufacturer of this hardware item.</definition>
+	   </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>AIResolution</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The voltage resolution of the analog input (AIN) subsystem given in bit.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>AIMaxSampleRate</name>
+	         <value>
+				<type>float</type>
+				<unit>Hz</unit>
+			 </value>
+            <definition>The maximum sampling rate.</definition>
+	      </property>
+	      
+	      <property>
+            <name>AIChannelCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The number of input channels of the DAQ-device.</definition>
+	      </property>
+	      
+	      <property>
+            <name>AOResolution</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The voltage resolution of a data-acquisition
+             analog output (AO) subsystem given in bit.</definition>
+	      </property>
+	      
+         <property>
+            <name>AOMaxSampleRate</name>
+	         <value>
+				<type>float</type>
+				<unit>Hz</unit>
+			 </value>
+            <definition>The maximum sampling rate.</definition>
+	      </property>
+	      
+	      <property>
+            <name>AOChannelCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The number of output channels of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>DIOLineCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The number of digital input/output lines (DIO) of the device.</definition>
+	      </property>
+  
+
+	      <property>
+            <name>AIUsedChannelCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The number of used analog input channels.</definition>
+	      </property>
+	      
+	      <property>
+            <name>AISampleRate</name>
+	         <value>
+				<type>int</type>
+				<unit>Hz</unit>
+			 </value>
+            <definition>The sample rate with which an individual input
+            channel was sampled. Given in Hz. </definition>
+	      </property> 
+	      
+	      <property>
+            <name>AIChannelGain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The gain of an input channel.</definition>
+	      </property>
+	      
+	      <property>
+            <name>AIReference</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The reference to which voltages were measured. Usually either "common ground" or "differential".</definition>
+	      </property> 
+	      
+	      <property>
+            <name>AIPolarity</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The polarity of the measurement "unipolar" or "bipolar".</definition>
+	      </property> 
+	      
+	      <property>
+            <name>AOUsedChannelCount</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The number of used analog output channels.
+	         </definition>
+	      </property>
+	      
+	      <property>
+            <name>AOSampleRate</name>
+	         <value>
+				<type>int</type>
+				<unit>Hz</unit>
+			 </value>
+            <definition>The sample rate with which an individual output
+            channel was sampled. Given in Hz.</definition>
+	      </property>  
+	      
+	      <property>
+            <name>AOChannelGain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The gain of an output channel.</definition>
+	      </property> 
+
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+
+   </section>
+</odML>

v1.0/hardware/eyetracker.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1"> 
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<section>
 		<type>hardware/eyetracker</type>
          <name>Eyetracker</name>
@@ -117,14 +119,15 @@
 		  <dependencyValue>Tabletop</dependencyValue>
 		  <definition>The way the head was fixed. Makes no sense if the eytracker is head mounted.</definition>
       </property>
-      
-      <property>
+
+         <property>
             <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-      </property>   
-	        
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+
    </section>
+
 </odML>

v1.0/hardware/filter.xml

@@ -1,122 +1,125 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-		<!-- ********************************** -->
-      <!--        Filter properties       -->
-      <!-- ********************************** -->
-      <section>
-		<type>hardware/filter</type>
-         <name>Filter</name>
-	      <definition>Properties a filter modul for analog signal conditioning.</definition>
-                  
-         <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property>
-         
-         <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-      	</property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>	         
-           <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      
-         <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property>
-	      
-         <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-         <property>
-            <name>Type</name>
-	         <value>Highpass
-				<type>string</type>
-	         </value>
-	         <value>Lowpass
-				<type>string</type>
-	         </value>
-	         <value>Bandpass
-				<type>string</type>
-	         </value>
-	         <value>Notch
-				<type>string</type>
-	         </value>
-            <definition>The type of filter.</definition>
-	      </property>
-	      
-	      <property>
-            <name>SubType</name>
-	         <value>Bessel
-				<type>string</type>
-	         </value>
-	         <value>Butterworth
-				<type>string</type>
-	         </value>
-            <definition>The type of filter.</definition>
-	      </property>
-        
-         <property>
-            <name>LowpassCutoff</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition> The lowpass filter cutoff frequency.</definition>
-	      </property> 
-	      
-         <property>
-            <name>LowpassOrder</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The order of the lowpass filter</definition>
-	      </property> 
-	      
-	       <property>
-            <name>HighpassCutoff</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition> The highpass filter cutoff frequency.</definition>
-	      </property> 
-	      
-         <property>
-            <name>HighpassOrder</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The order of the highpass filter</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-	      </property>   
-	   
-      </section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+		<!-- ********************************** -->
+      <!--        Filter properties       -->
+      <!-- ********************************** -->
+      <section>
+		<type>hardware/filter</type>
+         <name>Filter</name>
+	      <definition>Properties a filter modul for analog signal conditioning.</definition>
+                  
+         <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property>
+         
+         <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+      	</property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>	         
+           <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      
+         <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property>
+	      
+         <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+         <property>
+            <name>Type</name>
+	         <value>Highpass
+				<type>string</type>
+	         </value>
+	         <value>Lowpass
+				<type>string</type>
+	         </value>
+	         <value>Bandpass
+				<type>string</type>
+	         </value>
+	         <value>Notch
+				<type>string</type>
+	         </value>
+            <definition>The type of filter.</definition>
+	      </property>
+	      
+	      <property>
+            <name>SubType</name>
+	         <value>Bessel
+				<type>string</type>
+	         </value>
+	         <value>Butterworth
+				<type>string</type>
+	         </value>
+            <definition>The type of filter.</definition>
+	      </property>
+        
+         <property>
+            <name>LowpassCutoff</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition> The lowpass filter cutoff frequency.</definition>
+	      </property> 
+	      
+         <property>
+            <name>LowpassOrder</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The order of the lowpass filter</definition>
+	      </property> 
+	      
+	       <property>
+            <name>HighpassCutoff</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition> The highpass filter cutoff frequency.</definition>
+	      </property> 
+	      
+         <property>
+            <name>HighpassOrder</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The order of the highpass filter</definition>
+	      </property> 
+
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+	      
+	      
+      </section>
+</odML>

v1.0/hardware/filter_set.xml

@@ -1,194 +1,196 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	 <!-- ********************************** -->
-      <!--     Filter set aka Filter cube     -->
-      <!-- ********************************** -->
-      <section>
-		<type>hardware/filter_set</type>
-         <name>Filterset</name>
-         <definition>The FilterSet or also FilterCube used in a microscope.</definition>
-	      
-	      
-         <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the FilterSet.</definition>
-	      </property> 
-	      
-         <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the FilterSet.</definition>
-	      </property> 
-         
-	      <property>
-            <name>ExcitationFilterModel</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model of excitation filter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>ExcitationFilterManufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Manufacturer providing the  of the excitation filter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>ExcitationFilterWavelength</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The wavelength of the excitation filter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>ExcitationFilterLowerBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The lower bound of of the wavelength transmitted by the excitation filter.</definition>
-	      </property> 
-	      	      
-         <property>
-            <name>ExcitationFilterUpperBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>
-	      </property> 
-	      
-         <property>
-            <name>ExcitationFilterRange</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The width of the transmitted wavelength range.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>ExcitationFilterPassbandTransmission</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The transmission in the passband. Given in %.</definition>
-	      </property>
-	      
-	      <!-- emission Filter -->
-	       <property>
-            <name>EmissionFilterModel</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model of excitation filter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>EmissionFilterManufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Manufacturer providing the  of the excitation filter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>EmissionFilterWavelength</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The wavelength of the excitation filter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>EmissionFilterLowerBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The lower bound of of the wavelength transmitted by the emission filter.</definition>
-	      </property> 
-	      	      
-         <property>
-            <name>EmissionFilterUpperBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>
-	      </property> 
-	      
-         <property>
-            <name>EmissionFilterRange</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The width of the transmitted wavelength range.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>EmissionFilterPassbandTransmission</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The transmission in the passband. Given in %.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>BeamsplitterType</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The type of beamsplitter used.</definition>
-	      </property>
-	      
-	      <property>
-            <name>BeamsplitterModel</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The beam splitter model name.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>BeamsplitterManufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The Manufacturer providing the beam splitter.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>BeamsplitterWavelength</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The wavelength at which the beam splitter separates the beams.</definition>
-	      </property> 
-	      
-      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-      </property>   
-	     
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	 <!-- ********************************** -->
+      <!--     Filter set aka Filter cube     -->
+      <!-- ********************************** -->
+      <section>
+		<type>hardware/filter_set</type>
+         <name>Filterset</name>
+         <definition>The FilterSet or also FilterCube used in a microscope.</definition>
+	      
+	      
+         <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the FilterSet.</definition>
+	      </property> 
+	      
+         <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the FilterSet.</definition>
+	      </property> 
+         
+	      <property>
+            <name>ExcitationFilterModel</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model of excitation filter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>ExcitationFilterManufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Manufacturer providing the  of the excitation filter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>ExcitationFilterWavelength</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The wavelength of the excitation filter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>ExcitationFilterLowerBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The lower bound of of the wavelength transmitted by the excitation filter.</definition>
+	      </property> 
+	      	      
+         <property>
+            <name>ExcitationFilterUpperBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>
+	      </property> 
+	      
+         <property>
+            <name>ExcitationFilterRange</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The width of the transmitted wavelength range.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>ExcitationFilterPassbandTransmission</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The transmission in the passband. Given in %.</definition>
+	      </property>
+	      
+	      <!-- emission Filter -->
+	       <property>
+            <name>EmissionFilterModel</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model of excitation filter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>EmissionFilterManufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Manufacturer providing the  of the excitation filter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>EmissionFilterWavelength</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The wavelength of the excitation filter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>EmissionFilterLowerBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The lower bound of of the wavelength transmitted by the emission filter.</definition>
+	      </property> 
+	      	      
+         <property>
+            <name>EmissionFilterUpperBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>
+	      </property> 
+	      
+         <property>
+            <name>EmissionFilterRange</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The width of the transmitted wavelength range.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>EmissionFilterPassbandTransmission</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The transmission in the passband. Given in %.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>BeamsplitterType</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The type of beamsplitter used.</definition>
+	      </property>
+	      
+	      <property>
+            <name>BeamsplitterModel</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The beam splitter model name.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>BeamsplitterManufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The Manufacturer providing the beam splitter.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>BeamsplitterWavelength</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The wavelength at which the beam splitter separates the beams.</definition>
+	      </property> 
+	      
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+	     
+      </section>
+
+</odML>

v1.0/hardware/hardware.xml

@@ -5,6 +5,8 @@
 <!-- ********************************** -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
      
      <section>
 		<type>hardware</type>
@@ -58,14 +60,13 @@
 	         </value>
             <definition>The Manufacturer of this hardware item.</definition>
 	      </property> 
-	      	    
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-	      </property>   
-	    
+              
+              <property>
+                <name>Description</name>
+                <value>
+                  <type>string</type>
+                </value>
+                <definition>A description of this hardware item.</definition>
+	      </property>
       </section>
 </odML>

v1.0/hardware/iaq.xml

@@ -1,303 +1,306 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!-- Image Acquisition (IAQ) properties -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-     <section>
-		<type>hardware/iaq</type>
-         <name>ImageAcquisition</name>
-         <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>
-	          
-         <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-         </property> 
-         
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-		   <property>
-            <name>Type</name>
-	         <value>Digital Camera
-				<type>string</type>
-	         </value>
-			 <value>Analogue Camera
-				<type>string</type>
-			 </value>
-			 <value>Framegrabber
-				<type>string</type>
-			 </value>
-            <definition> The kind of image acquisiton device.</definition>
-	      </property>
-		  
-		  <property>
-            <name>Mount</name>
-	         <value>C-Mount
-				<type>string</type>
-	         </value>
-			 <value>CS-Mount
-				<type>string</type>
-			 </value>
-            <definition> The lens mount (there are many more).</definition>
-	      </property>
-		  
-		  <property>
-            <name>Colorspace</name>
-	         <value>Monochrome
-				<type>string</type>
-	         </value>
-			 <value>Color
-				<type>string</type>
-			 </value>
-            <definition> The kind of image acquisiton device.</definition>
-	      </property>
-		  
-		  
-		   <property>
-            <name>DetektorType</name>
-	         <value>CMOS
-				<type>string</type>
-	         </value>
-			 <value>CCD
-				<type>string</type>
-			 </value>
-			 <value>2 CCD
-				<type>string</type>
-			 </value>
-			 <value>3 CCD
-				<type>string</type>
-			 </value>
-			 <value>Framegrabber</value>
-            <definition> The kind of image acquisiton device.</definition>
-	      </property>
-		
-		  <property>
-            <name>SensitivityRange</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The sensitivity range of the detektor (min - max).</definition>
-	      </property>
-		  
-		  <property>
-            <name>MinFramerate</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The minimal framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
-	      </property> 
-		  
-		  <property>
-            <name>MaxFramerate</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The maximum framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
-	      </property> 
-		  
-	       <property>
-            <name>Framerate</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The actual framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
-	      </property> 
-	      
-	      <property>
-            <name>SpatialRes</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The spatial resolution of the acquired images (width x height).</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Lens</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>This property can be used to specify which kind of optics have been used.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>ShutterSpeed</name>
-            <value>
-				<type>float</type>
-            </value>
-            <definition>The speed of the shutter, given in seconds or milliseconds.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Apperture</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The actual apperture (e.g. 5.6).</definition>
-	      </property> 
-	      
-	      <property>
-            <name>CCDGain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The gain of a ccd chip.</definition>
-	      </property> 
-	
-	      <property>
-            <name>Depth</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The brightness resoltuion e.g. lower 8 bit.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>RoiPositionX</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left
-            corner relative to the chip origin (also the top left corner).</definition>
-	      </property> 
-	      
-	      <property>
-            <name>RoiPositionY</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left
-            corner relative to the chip origin (also the top left corner).</definition>
-	      </property> 
-	      
-	      <property>
-            <name>RoiWidth</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The width of the region of interest. Given in pixels.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>RoiHeight</name>
-	         <value>
-				<type>int</type>
-			</value>
-            <definition>The heigth of the region of interest. Given in pixels.</definition>
-         </property> 
-	      
-	      <property>
-            <name>PicRotation</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The rotation of the picture. (e.g. +180degrees).</definition>
-	      </property> 
-		  
-		  <property>
-            <name>Brightness</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The brightness adjustment.</definition>
-	      </property> 
-		  
-		  <property>
-            <name>Contrast</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The contrast adjustment.</definition>
-	      </property> 
-	      
-		  <property>
-            <name>Gamma</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The gamma value.</definition>
-	      </property> 
-		  
-		  <property>
-            <name>GammaFuntion</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The gamma calibration function.</definition>
-	      </property> 
-		  
-		   <property>
-            <name>PixelBinning</name>
-	         <value>
-				<type>string</type>
-			</value>
-            <definition>The type of pixel binning on the chip.</definition>
-	      </property> 
-		  
-		  <property>
-            <name>Subsampling</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The subsampling method used on the chip.</definition>
-	      </property> 
-		  
-		  <property>
-            <name>ColorTemperature</name>
-	         <value>
-				<type>int</type>
-	         </value>
-            <definition>The color temperature.</definition>
-	      </property>
-		  
-		  <property>
-            <name>ColorGain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition></definition>
-	      </property> 
-      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-      </property>   
-		  
-      </section> 
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!-- Image Acquisition (IAQ) properties -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+     <section>
+		<type>hardware/iaq</type>
+         <name>ImageAcquisition</name>
+         <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>
+	          
+         <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+         </property> 
+         
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+		   <property>
+            <name>Type</name>
+	         <value>Digital Camera
+				<type>string</type>
+	         </value>
+			 <value>Analogue Camera
+				<type>string</type>
+			 </value>
+			 <value>Framegrabber
+				<type>string</type>
+			 </value>
+            <definition> The kind of image acquisiton device.</definition>
+	      </property>
+		  
+		  <property>
+            <name>Mount</name>
+	         <value>C-Mount
+				<type>string</type>
+	         </value>
+			 <value>CS-Mount
+				<type>string</type>
+			 </value>
+            <definition> The lens mount (there are many more).</definition>
+	      </property>
+		  
+		  <property>
+            <name>Colorspace</name>
+	         <value>Monochrome
+				<type>string</type>
+	         </value>
+			 <value>Color
+				<type>string</type>
+			 </value>
+            <definition> The kind of image acquisiton device.</definition>
+	      </property>
+		  
+		  
+		   <property>
+            <name>DetektorType</name>
+	         <value>CMOS
+				<type>string</type>
+	         </value>
+			 <value>CCD
+				<type>string</type>
+			 </value>
+			 <value>2 CCD
+				<type>string</type>
+			 </value>
+			 <value>3 CCD
+				<type>string</type>
+			 </value>
+			 <value>Framegrabber</value>
+            <definition> The kind of image acquisiton device.</definition>
+	      </property>
+		
+		  <property>
+            <name>SensitivityRange</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The sensitivity range of the detektor (min - max).</definition>
+	      </property>
+		  
+		  <property>
+            <name>MinFramerate</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The minimal framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
+	      </property> 
+		  
+		  <property>
+            <name>MaxFramerate</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The maximum framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
+	      </property> 
+		  
+	       <property>
+            <name>Framerate</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The actual framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
+	      </property> 
+	      
+	      <property>
+            <name>SpatialRes</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The spatial resolution of the acquired images (width x height).</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Lens</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>This property can be used to specify which kind of optics have been used.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>ShutterSpeed</name>
+            <value>
+				<type>float</type>
+            </value>
+            <definition>The speed of the shutter, given in seconds or milliseconds.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Apperture</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The actual apperture (e.g. 5.6).</definition>
+	      </property> 
+	      
+	      <property>
+            <name>CCDGain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The gain of a ccd chip.</definition>
+	      </property> 
+	
+	      <property>
+            <name>Depth</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The brightness resoltuion e.g. lower 8 bit.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>RoiPositionX</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left
+            corner relative to the chip origin (also the top left corner).</definition>
+	      </property> 
+	      
+	      <property>
+            <name>RoiPositionY</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left
+            corner relative to the chip origin (also the top left corner).</definition>
+	      </property> 
+	      
+	      <property>
+            <name>RoiWidth</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The width of the region of interest. Given in pixels.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>RoiHeight</name>
+	         <value>
+				<type>int</type>
+			</value>
+            <definition>The heigth of the region of interest. Given in pixels.</definition>
+         </property> 
+	      
+	      <property>
+            <name>PicRotation</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The rotation of the picture. (e.g. +180degrees).</definition>
+	      </property> 
+		  
+		  <property>
+            <name>Brightness</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The brightness adjustment.</definition>
+	      </property> 
+		  
+		  <property>
+            <name>Contrast</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The contrast adjustment.</definition>
+	      </property> 
+	      
+		  <property>
+            <name>Gamma</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The gamma value.</definition>
+	      </property> 
+		  
+		  <property>
+            <name>GammaFuntion</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The gamma calibration function.</definition>
+	      </property> 
+		  
+		   <property>
+            <name>PixelBinning</name>
+	         <value>
+				<type>string</type>
+			</value>
+            <definition>The type of pixel binning on the chip.</definition>
+	      </property> 
+		  
+		  <property>
+            <name>Subsampling</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The subsampling method used on the chip.</definition>
+	      </property> 
+		  
+		  <property>
+            <name>ColorTemperature</name>
+	         <value>
+				<type>int</type>
+	         </value>
+            <definition>The color temperature.</definition>
+	      </property>
+		  
+		  <property>
+            <name>ColorGain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition></definition>
+	      </property> 
+		  
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+		  
+      </section> 
+</odML>

v1.0/hardware/light_source.xml

@@ -1,160 +1,162 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--           LightSources             -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-    <section>
-		<type>hardware/light_source</type>
-        <name>Lightsource</name>
-	    <definition>This section contains keywords to describe the actual settings of a light source used for stimulation or excitation.</definition>
-	    	      
-         <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-         
-         <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-	       <property>
-            <name>Type</name>
-	         <value>LED
-				<type>string</type>
-	         </value>
-	         <value>Laser
-				<type>string</type>
-	         </value>
-	         <value>Mercury Arc
-				<type>string</type>
-	         </value>
-	         <value>Halogen Lamp
-				<type>string</type>
-	         </value>
-	         <value>Xenon Lamp
-				<type>string</type>
-	         </value>
-            <definition>The type of light source used.</definition>
-	      </property> 
-	   
-	      <property>
-            <name>PulseWidth</name>
-	         <value>
-				<type>string</type>
-				<unit>s</unit>
-			 </value>
-	         <parent>Type</parent>
-	         <dependencyValue>Laser</dependencyValue>
-            <definition>The width of the laser pulse.</definition>
-	      </property>
-	      
-	      <property>
-            <name>PulseRate</name>
-	         <value>
-				<type>float</type>
-				<unit>Hz</unit>
-			 </value>
-	         <dependency>Type</dependency>
-	         <dependencyValue>Laser</dependencyValue>
-            <definition>The frequency with which laser pulses are delivered.</definition>
-	      </property>
-	      
-      	<property>
-            <name>Wavelength</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The wavelength of the emitted light.</definition>
-	      </property>
-	      
-	      <property>
-            <name>WavelengthLowerBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The lower bound of the output spectrum.</definition>
-	      </property>
-	
-	      <property>
-            <name>WavelengthUpperBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The upper bound of the output spectrum.</definition>
-	      </property>
-	      
-	      <property>
-            <name>Intensity</name>
-	         <value>
-				<type>float</type>
-				<unit>W</unit>
-			 </value>
-            <definition>The output intensity of the light source in Watts.</definition>
-	      </property>
-	      
-	      <property>
-            <name>Intensity</name>
-	         <value>
-				<type>float</type>
-				<unit>cd/m^2</unit>
-			 </value>
-            <definition>The output intensity of the light source in candela per square meter.</definition>
-	      </property>
-	      
-	      <property>
-            <name>Intensity</name>
-	         <value>
-				<type>float</type>
-				<unit>lux</unit>
-			 </value>
-            <definition>The output intensity of the light source defined in lux.</definition>
-	      </property>
-	      
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-	      </property>     
-	      
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--           LightSources             -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	
+    <section>
+		<type>hardware/light_source</type>
+        <name>Lightsource</name>
+	    <definition>This section contains keywords to describe the actual settings of a light source used for stimulation or excitation.</definition>
+	    	      
+         <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+         
+         <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+	       <property>
+            <name>Type</name>
+	         <value>LED
+				<type>string</type>
+	         </value>
+	         <value>Laser
+				<type>string</type>
+	         </value>
+	         <value>Mercury Arc
+				<type>string</type>
+	         </value>
+	         <value>Halogen Lamp
+				<type>string</type>
+	         </value>
+	         <value>Xenon Lamp
+				<type>string</type>
+	         </value>
+            <definition>The type of light source used.</definition>
+	      </property> 
+	   
+	      <property>
+            <name>PulseWidth</name>
+	         <value>
+				<type>string</type>
+				<unit>s</unit>
+			 </value>
+	         <dependency>Type</dependency>
+	         <dependencyValue>Laser</dependencyValue>
+            <definition>The width of the laser pulse.</definition>
+	      </property>
+	      
+	      <property>
+            <name>PulseRate</name>
+	         <value>
+				<type>float</type>
+				<unit>Hz</unit>
+			 </value>
+	         <dependency>Type</dependency>
+	         <dependencyValue>Laser</dependencyValue>
+            <definition>The frequency with which laser pulses are delivered.</definition>
+	      </property>
+	      
+      	<property>
+            <name>Wavelength</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The wavelength of the emitted light.</definition>
+	      </property>
+	      
+	      <property>
+            <name>WavelengthLowerBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The lower bound of the output spectrum.</definition>
+	      </property>
+	
+	      <property>
+            <name>WavelengthUpperBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The upper bound of the output spectrum.</definition>
+	      </property>
+	      
+	      <property>
+            <name>Intensity</name>
+	         <value>
+				<type>float</type>
+				<unit>W</unit>
+			 </value>
+            <definition>The output intensity of the light source in Watts.</definition>
+	      </property>
+	      
+	      <property>
+            <name>Intensity</name>
+	         <value>
+				<type>float</type>
+				<unit>cd/m^2</unit>
+			 </value>
+            <definition>The output intensity of the light source in candela per square meter.</definition>
+	      </property>
+	      
+	      <property>
+            <name>Intensity</name>
+	         <value>
+				<type>float</type>
+				<unit>lux</unit>
+			 </value>
+            <definition>The output intensity of the light source defined in lux.</definition>
+	      </property>
+	      
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+	      
+      </section>
+
+</odML>

v1.0/hardware/microscope.xml

@@ -1,73 +1,74 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--        Microscope properties        -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-    <section>
-		<type>hardware/microscope</type>
-        <name>Microscope</name>
-        <definition>The Microscope section describes the properties of the used microscope.</definition>
-	     
-         <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property>
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Type</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The microcope type: widefield, two-photon, multi-photon, confocal, etc...</definition>
-	      </property> 
-	      
-         <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The Manufacturer of this hardware item.</definition>
-
-      </property> 
-	         <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-      </property>   
-   
-	       
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--        Microscope properties        -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	
+    <section>
+		<type>hardware/microscope</type>
+        <name>Microscope</name>
+        <definition>The Microscope section describes the properties of the used microscope.</definition>
+	     
+         <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property>
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Type</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The microcope type: widefield, two-photon, multi-photon, confocal, etc...</definition>
+	      </property> 
+	      
+         <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+ 
+      </section>
+
+</odML>

v1.0/hardware/microscope_objective.xml

@@ -1,120 +1,122 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-<!-- ********************************** -->
-<!--           Microscope Objective                -->
-<!-- ********************************** -->
-	<section>
-		<type>hardware/microscope_objective</type>
-         <name>MicroscopeObjecive</name>
-         <definition>This section contains properties that describe the objective used in a microscope.</definition>
-	    	      
-          <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of this device.</definition>
-	      </property> 
-	      
-	      <property>
-	         <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property>
-	      
-	       <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The objective model name.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The Manufacturer providing the objective.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Type</name>
-            <value>dry
-				<type>string</type>
-            </value>
-	         <value>water immersion
-				<type>string</type>
-	         </value>
-	         <value>oil immersion
-				<type>string</type>
-	         </value>
-	         <definition>The type of objective used in a microscope. (e.g. water immersion, oil immersion, dry.)</definition>
-	      </property>
-	      
-	     <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The owner of this device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Magnification</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The magnification of the objective.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>NumericalAperture</name>
-	         <value>
-				<type>float</type>
-	         </value>
-	         <definition>The numerical aperture (N.A.) of the objective.</definition>
-	      </property> 
-	   
-	   <property>
-            <name>TransmissionLowerBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The lower bound of transmission.</definition>
-	      </property>
-		  
-		  <property>
-            <name>TransmissionUpperBound</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The upper bound of transmission.</definition>
-	      </property>
-	   
-	     <property>
-            <name>TransmissionRange</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The transmission range (min - max).</definition>
-	      </property>
-	      
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-      </property>   
-
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+<!-- ********************************** -->
+<!--           Microscope Objective                -->
+<!-- ********************************** -->
+	<section>
+		<type>hardware/microscope_objective</type>
+         <name>MicroscopeObjecive</name>
+         <definition>This section contains properties that describe the objective used in a microscope.</definition>
+	    	      
+          <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of this device.</definition>
+	      </property> 
+	      
+	      <property>
+	         <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property>
+	      
+	       <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The objective model name.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The Manufacturer providing the objective.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Type</name>
+            <value>dry
+				<type>string</type>
+            </value>
+	         <value>water immersion
+				<type>string</type>
+	         </value>
+	         <value>oil immersion
+				<type>string</type>
+	         </value>
+	         <definition>The type of objective used in a microscope. (e.g. water immersion, oil immersion, dry.)</definition>
+	      </property>
+	      
+	     <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The owner of this device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Magnification</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The magnification of the objective.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>NumericalAperture</name>
+	         <value>
+				<type>float</type>
+	         </value>
+	         <definition>The numerical aperture (N.A.) of the objective.</definition>
+	      </property> 
+	   
+	   <property>
+            <name>TransmissionLowerBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The lower bound of transmission.</definition>
+	      </property>
+		  
+		  <property>
+            <name>TransmissionUpperBound</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The upper bound of transmission.</definition>
+	      </property>
+	   
+	     <property>
+            <name>TransmissionRange</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The transmission range (min - max).</definition>
+	      </property>
+	      
+	      <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+	      
+      </section>
+
+</odML>

v1.0/hardware/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,14 +168,7 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
-		               <td width="10%">
+                     <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">
 				                  <xsl:variable name="mapping" select="."/>

v1.0/hardware/scanner.xml

@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--              Scanner               -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-    <section>
-		<type>hardware/scanner</type>
-         <name>Scanner</name>
-         <definition>The Scanner used to scan microscope images.</definition>
-	      	      
-         <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the FilterSet.</definition>
-	      </property> 
-	      
-         <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the FilterSet.</definition>
-	      </property> 
-	    
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The scanner model name.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The Manufacturer providing the scanner.</definition>
-	      </property> 
-	      
-         <property>
-            <name>Type</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The type of scanner used in a scanning microscope. (e.g. Galvanometer, electro-optic-deflector etc.)</definition>
-	      </property>
-	      
-	      
-	      <property>
-            <name>ImageWidth</name>
-	         <value>
-				<type>int</type>
-				<unit>pixel</unit>
-			 </value>
-            <definition>The width of the scanned image.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>ImageHeight</name>
-	         <value>
-				<type>int</type>
-				<unit>pixel</unit>
-			 </value>
-            <definition>The height of the scanned image.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>PixelSize</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The size of each pixel.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>DwellTime</name>
-	         <value>
-				<type>float</type>
-				<unit>&#181;m</unit>
-			 </value>
-            <definition></definition>
-	      </property> 
-	      
-	      <property>
-            <name>ScanRate</name>
-	         <value>
-				<type>float</type>
-				<unit>nm</unit>
-			 </value>
-            <definition>The size of each pixel.</definition>
-	      </property> 
-	      
-	       <property>
-            <name>ScanMode</name>
-	         <value>
-				<type>string</type>
-	         </value>
-	         <definition>The scanning mode e.g. line or xy.</definition>
-	      </property> 
-	      
-	       <property>
-            <name>StackZRange</name>
-	         <value>
-				<type>float</type>
-				<unit>&#181;m</unit>
-			 </value>
-            <definition>The depth scanned.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>StackZStepSize</name>
-	         <value>
-				<type>float</type>
-				<unit>&#181;m</unit>
-			 </value>
-            <definition>The step size with which the range is scanned.</definition>
-	      </property> 
-	      
-	    
-	      <property>
-            <name>Description</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>A description of the device.</definition>
-	      </property>   
-	   
-
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--              Scanner               -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	
+    <section>
+		<type>hardware/scanner</type>
+         <name>Scanner</name>
+         <definition>The Scanner used to scan microscope images.</definition>
+	      	      
+         <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the FilterSet.</definition>
+	      </property> 
+	      
+         <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the FilterSet.</definition>
+	      </property> 
+	    
+	      <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The scanner model name.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The Manufacturer providing the scanner.</definition>
+	      </property> 
+	      
+         <property>
+            <name>Type</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The type of scanner used in a scanning microscope. (e.g. Galvanometer, electro-optic-deflector etc.)</definition>
+	      </property>
+	      
+	      
+	      <property>
+            <name>ImageWidth</name>
+	         <value>
+				<type>int</type>
+				<unit>pixel</unit>
+			 </value>
+            <definition>The width of the scanned image.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>ImageHeight</name>
+	         <value>
+				<type>int</type>
+				<unit>pixel</unit>
+			 </value>
+            <definition>The height of the scanned image.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>PixelSize</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The size of each pixel.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>DwellTime</name>
+	         <value>
+				<type>float</type>
+				<unit>&#181;m</unit>
+			 </value>
+            <definition></definition>
+	      </property> 
+	      
+	      <property>
+            <name>ScanRate</name>
+	         <value>
+				<type>float</type>
+				<unit>nm</unit>
+			 </value>
+            <definition>The size of each pixel.</definition>
+	      </property> 
+	      
+	       <property>
+            <name>ScanMode</name>
+	         <value>
+				<type>string</type>
+	         </value>
+	         <definition>The scanning mode e.g. line or xy.</definition>
+	      </property> 
+	      
+	       <property>
+            <name>StackZRange</name>
+	         <value>
+				<type>float</type>
+				<unit>&#181;m</unit>
+			 </value>
+            <definition>The depth scanned.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>StackZStepSize</name>
+	         <value>
+				<type>float</type>
+				<unit>&#181;m</unit>
+			 </value>
+            <definition>The step size with which the range is scanned.</definition>
+	      </property> 
+
+         <property>
+            <name>Description</name>
+            <value>
+               <type>string</type>
+            </value>
+            <definition>A description of this hardware item.</definition>
+	      </property>
+
+      </section>
+
+</odML>

v1.0/hardware/stimulus_isolator.xml

@@ -1,181 +1,183 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************** -->
-<!--        Stimulus Isolator           -->
-<!-- ********************************** -->
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
-    <section>
-		<type>hardware/stimulus_isolator</type>
-         <name>StimulusIsolator</name>
-	      <definition>Properties of a stimulus Isolator device.</definition>
-         
-         <property>
-            <name>SerialNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The device's serial number.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>InventoryNo</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The inventory number of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Model</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition>The model name of this hardware item.</definition>
-      	</property> 
-	      
-	      <property>
-            <name>Manufacturer</name>
-	         <value>
-				<type>string</type>
-	         </value>
-           <definition>The Manufacturer of this hardware item.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>Owner</name>
-	         <value>
-				<type>string</type>
-	         </value>
-            <definition> Who's the owner of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>InputRangeMinVoltage</name>
-	         <value>
-				<type>float</type>
-				<unit>V</unit>
-			 </value>
-            <definition>The minimal input voltage.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>InputRangeMaxVoltage</name>
-	         <value>
-				<type>float</type>
-				<unit>V</unit>
-			 </value>
-            <definition>The maximal input voltage.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>OutputRangeMinVolatge</name>
-	         <value>
-				<type>float</type>
-				<unit>V</unit>
-			 </value>
-            <definition>The minimal output voltage.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>OutputRangeMaxVoltage</name>
-	         <value>
-				<type>float</type>
-				<unit>V</unit>
-			 </value>
-            <definition>The maximal ouput voltage.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>OutputRangeMinCurrent</name>
-	         <value>
-				<type>float</type>
-				<unit>A</unit>
-			 </value>
-            <definition>The minimal output current.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>OutputRangeMaxCurrent</name>
-	         <value>
-				<type>float</type>
-				<unit>A</unit>
-			 </value>
-            <definition>The maximal ouput current.</definition>
-	      </property> 
-	      
-        <property>
-            <name>MaximumGain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The maximum gain of the device.</definition>
-	      </property> 
-	      
-	      <property>
-            <name>MinimumGain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The minimum gain of the device.</definition>
-	      </property> 
-	      
-	       <property>
-            <name>GainStepSize</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The size of the gain steps between minimum and maximum.</definition>
-	      </property> 
-	      
-	      <property>
-	         <name>OutputType</name>
-	         <value>Voltage
-				<type>string</type>
-	         </value>
-	         <value>Current
-				<type>string</type>
-	         </value>
-            <definition>The type of output of the stimulus isolator.</definition>
-	      </property>
-	      
-	      <property>
-	         <name>OutpuMode</name>
-	         <value>BipolarOn
-				<type>string</type>
-	         </value>
-	         <value>BipolarOff
-				<type>string</type>
-	         </value>
-            <definition>The polarity mode of the stimulus isolator.</definition>
-	      </property>
-	      
-	      <property>
-            <name>Gain</name>
-	         <value>
-				<type>float</type>
-	         </value>
-            <definition>The gain of the device.</definition>
-         </property> 
-      
-	      <property>
-            <name>GainDb</name>
-	         <value>
-				<type>float</type>
-				<unit>db</unit>
-			 </value>
-            <definition>The gain of the device given in db.</definition>
-         </property> 
-
-         <property>
-            <name>Description</name>
-            <value>
-				<type>string</type>
-	        </value>
-           <definition>A description of the device.</definition>
-         </property>   
-      
-      </section>
-
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************** -->
+<!--        Stimulus Isolator           -->
+<!-- ********************************** -->
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	
+    <section>
+		<type>hardware/stimulus_isolator</type>
+         <name>StimulusIsolator</name>
+	      <definition>Properties of a stimulus Isolator device.</definition>
+         
+         <property>
+            <name>SerialNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The device's serial number.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>InventoryNo</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The inventory number of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Model</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition>The model name of this hardware item.</definition>
+      	</property> 
+	      
+	      <property>
+            <name>Manufacturer</name>
+	         <value>
+				<type>string</type>
+	         </value>
+           <definition>The Manufacturer of this hardware item.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>Owner</name>
+	         <value>
+				<type>string</type>
+	         </value>
+            <definition> Who's the owner of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>InputRangeMinVoltage</name>
+	         <value>
+				<type>float</type>
+				<unit>V</unit>
+			 </value>
+            <definition>The minimal input voltage.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>InputRangeMaxVoltage</name>
+	         <value>
+				<type>float</type>
+				<unit>V</unit>
+			 </value>
+            <definition>The maximal input voltage.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>OutputRangeMinVolatge</name>
+	         <value>
+				<type>float</type>
+				<unit>V</unit>
+			 </value>
+            <definition>The minimal output voltage.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>OutputRangeMaxVoltage</name>
+	         <value>
+				<type>float</type>
+				<unit>V</unit>
+			 </value>
+            <definition>The maximal ouput voltage.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>OutputRangeMinCurrent</name>
+	         <value>
+				<type>float</type>
+				<unit>A</unit>
+			 </value>
+            <definition>The minimal output current.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>OutputRangeMaxCurrent</name>
+	         <value>
+				<type>float</type>
+				<unit>A</unit>
+			 </value>
+            <definition>The maximal ouput current.</definition>
+	      </property> 
+	      
+        <property>
+            <name>MaximumGain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The maximum gain of the device.</definition>
+	      </property> 
+	      
+	      <property>
+            <name>MinimumGain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The minimum gain of the device.</definition>
+	      </property> 
+	      
+	       <property>
+            <name>GainStepSize</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The size of the gain steps between minimum and maximum.</definition>
+	      </property> 
+	      
+	      <property>
+	         <name>OutputType</name>
+	         <value>Voltage
+				<type>string</type>
+	         </value>
+	         <value>Current
+				<type>string</type>
+	         </value>
+            <definition>The type of output of the stimulus isolator.</definition>
+	      </property>
+	      
+	      <property>
+	         <name>OutpuMode</name>
+	         <value>BipolarOn
+				<type>string</type>
+	         </value>
+	         <value>BipolarOff
+				<type>string</type>
+	         </value>
+            <definition>The polarity mode of the stimulus isolator.</definition>
+	      </property>
+	      
+	      <property>
+            <name>Gain</name>
+	         <value>
+				<type>float</type>
+	         </value>
+            <definition>The gain of the device.</definition>
+         </property> 
+      
+	      <property>
+            <name>GainDb</name>
+	         <value>
+				<type>float</type>
+				<unit>db</unit>
+			 </value>
+            <definition>The gain of the device given in db.</definition>
+         </property> 
+         
+         <property>
+           <name>Description</name>
+           <value>
+              <type>string</type>
+           </value>
+           <definition>A description of this hardware item.</definition>
+	      </property>
+
+      </section>
+
+</odML>

v1.0/model/lif.xml

@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--         Leaky integrate and fire	  	 	       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+  <version>1.0</version>
+  <date>2011-01-21</date>
+  <section>
+    <type>model/lif</type>
+    <name>Leaky integrate and fire</name>
+    <definition>Properties to describe a leaky integrate and fire neuron model.</definition>
+    
+    <property>
+      <name>Author</name>
+      <value>
+        <type>person</type> 
+      </value>
+      <definition>The author of this model.</definition>
+    </property>
+    
+    <property>
+      <name>Date</name>
+      <value>
+        <type>date</type> 
+      </value>
+      <definition>The simulation date.</definition>
+    </property>
+    
+    <property>
+      <name>Program</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The program name.</definition>
+    </property>
+    
+    <property>
+      <name>ProgramVersion</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The program version name.</definition>
+    </property>
+    
+    
+    <property>
+      <name>Description</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>A descriptive text.</definition>
+    </property>
+    <!--     Basics    -->
+    <property>
+      <name>RestingPotential</name>
+      <value>
+        <type>float</type> 
+        <unit>V</unit>
+      </value>
+      <definition>The resting voltage.</definition>
+    </property>
+    <property>
+      <name>ResetPotential</name>
+      <value>
+        <type>float</type> 
+        <unit>V</unit>
+      </value>
+      <definition>The potential to which the neuron's potential is set after a spike.</definition>
+    </property>
+    
+    <property>
+      <name>Resistance</name>
+      <value>
+        <type>float</type> 
+        <unit>Ohm</unit>
+      </value>
+      <definition>The membrane restisance.</definition>
+    </property>
+  
+    <property>
+      <name>Capacitance</name>
+      <value>
+        <type>float</type> 
+        <unit>F</unit>
+      </value>
+      <definition>The membrane restisance.</definition>
+    </property>
+  
+    
+    <property>
+      <name>MembraneTimeConstant</name>
+      <value>
+        <type>float</type> 
+        <unit>s</unit>
+      </value>
+      <definition>The membrane time constant.</definition>
+    </property>
+  
+    <property>
+      <name>BiasCurrent</name>
+      <value>
+        <type>float</type> 
+        <unit>A</unit>
+      </value>
+      <definition>The offset current.</definition>
+    </property>
+    
+    
+    <property>
+      <name>Timestep</name>
+      <value>
+        <type>float</type> 
+        <unit>s</unit>
+      </value>
+      <definition>The duration of a time step in the simulation.</definition>
+    </property>
+    
+    <property>
+      <name>VoltageEquation</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The equation to calculate the membrane voltage.</definition>
+    </property>
+    
+  
+    
+    <!--     Adaptation -->
+    <property>
+      <name>AdaptationIncrement</name>
+      <value>
+        <type>float</type> 
+        <unit>A</unit>
+      </value>
+      <definition>When an adaptation current is implemented the amount about which the adaptation is increased when a spike is fired.</definition>
+    </property>
+    
+    <property>
+      <name>AdaptationTimeConstant</name>
+      <value>
+        <type>float</type> 
+        <unit>s</unit>
+      </value>
+      <definition>The time constant with which the adaptation current returns back to zero.</definition>
+    </property>
+    
+    <property>
+      <name>AdaptationEquation</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The equation to calculate the adaptation currrent.</definition>
+    </property>
+    
+    <!--     Noise  -->
+    <property>
+      <name>NoiseAmplitude</name>
+      <value>
+        <type>float</type> 
+        <unit>A</unit>
+      </value>
+      <definition>The amount of noise added.</definition>
+    </property>
+    
+    <property>
+      <name>NoiseType</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The type of noise. For example Gaussian, Ohrnstein-Uhlenbeck etc.</definition>
+    </property>
+    
+    <property>
+      <name>NoiseCorrelation</name>
+      <value>
+        <type>float</type> 
+        <unit>s</unit>
+      </value>
+      <definition>The correlation time constant used e.g. with OU noise.</definition>
+    </property>
+    
+    
+    
+    
+    <!-- Threshold settings -->
+    <property>
+      <name>Threshold</name>
+      <value>
+        <type>float</type> 
+        <unit>V</unit>
+      </value>
+      <definition>The firing threshold.</definition>
+    </property>
+    
+    <property>
+      <name>ThresholdIncrement</name>
+      <value>
+        <type>float</type> 
+        <unit>V</unit>
+      </value>
+      <definition>The voltage about which the threshold is increased once a spike has been fired.</definition>
+    </property>
+    
+    <property>
+      <name>ThresholdTimeConstant</name>
+      <value>
+        <type>float</type> 
+        <unit>s</unit>
+      </value>
+      <definition>The time ocnstant with which the threshold returns back to baseline.</definition>
+    </property>
+    
+    <property>
+      <name>Threshold</name>
+      <value>
+        <type>float</type> 
+        <unit>V</unit>
+      </value>
+      <definition>The firing threshold.</definition>
+    </property>
+    
+    <property>
+      <name>ThresholdEquation</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The equation to calculate the threshold.</definition>
+    </property>
+    
+  </section>
+</odML> 

v1.0/model/multi_compartment.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--            multi compartmental model 	  	       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+  <version>1.0</version>
+  <date>2011-10-14</date>
+  <section>
+    <type>model/multi_comparment</type>
+    <name>Multi compartment model</name>
+    <definition>Properties to describe a biophysical model that consists of a number of compartments.</definition>
+    
+    
+    <property>
+      <name>SimulationType</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
+    </property>
+  </section>
+</odML> 

v1.0/model/odmlTerms.xsl

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
+
+<!-- This stylesheet is for viewing odml-terminologies in a web browser -->
+<!-- Please note: only those elements will be displayed terminology related -->
+<!-- e.g. uncertainty, id, and valueComments will not be shown -->
+<!-- For viewing real metadata files use the odml.xsl stylesheet -->
+<!-- ************************************************  -->
+<!--                   root template                   -->
+<xsl:template match="odML">
+   <!-- if there is a base url definition read it and later pass it to the sections template -->
+   <xsl:variable name="repository" select="repository"/>
+   <html>
+      <link href="../../../images/odMLIcon.ico" rel="shortcut icon" csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4=" livesrc="../../../images/odMLIcon.png" />
+      <style type="text/css">
+      body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; } 
+
+      #navigationContainer { left:20px; width:80%;} 
+
+      #contentContainer { left:20px; width:80%;}
+      </style>
+      
+      
+      <body>
+         <a name="top" style="color:#336699"><h1>odML - Metadata</h1></a>
+         <div id="navigationContainer">     
+            <p>
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Document info</h2>
+            <b>Author: </b><xsl:if test="author"><xsl:value-of select="author"/></xsl:if><br/>
+            <b>Date: </b><xsl:if test="date"><xsl:value-of select="date"/></xsl:if><br/>
+            <b>Version: </b><xsl:if test="version"><xsl:value-of select="version"/></xsl:if><br/>
+            <b>Repository: </b><xsl:if test="repository"><xsl:value-of select="repository"/></xsl:if><br/>
+            </p>
+   
+         
+            
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+
+            <h2>Structure</h2>
+	         <font  size ="-1" >
+            <xsl:if test="section">
+               <xsl:for-each select="section">
+			         <li>
+					      <xsl:call-template name="sectionTemplate">
+						      <xsl:with-param name="navigation">1</xsl:with-param>
+							   <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+							    <xsl:with-param name="url" select="$repository"/>
+						   </xsl:call-template>
+					   </li>
+               </xsl:for-each>
+            </xsl:if></font>
+         </div>
+         
+         <div id="contentContainer">
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Content</h2>
+            <!-- apply the section template  -->
+	         <xsl:if test="section">
+               <xsl:for-each select="section">
+                  <xsl:call-template name="sectionTemplate">
+                     <xsl:with-param name="navigation">0</xsl:with-param>
+                     <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+                     <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>
+               </xsl:for-each>
+            </xsl:if>
+         </div>
+      </body>
+   </html> 
+</xsl:template>
+
+<!-- ************************************************  -->
+<!--              section template.                    -->
+<xsl:template name="sectionTemplate" match="section">
+   <xsl:param name="navigation"/>   
+   <xsl:param name="anchorBase"/>
+   <xsl:param name="url"/>
+   <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
+   <!-- set new repository if specified within this section otherwise use the old one -->
+   <xsl:variable name="repository">
+	   <xsl:choose>
+		   <xsl:when test="repository">
+			   <xsl:value-of select ="repository"/>        
+   		</xsl:when>
+	   	<xsl:otherwise>
+			   <xsl:value-of select ="$url"/>
+         </xsl:otherwise>
+	   </xsl:choose>
+	</xsl:variable>
+	<!-- print out the content -->
+   <xsl:choose>
+      <!--  fill the navigation container if this is the task (navigation param = 1) -->
+      <xsl:when test="$navigation = 1">
+         <!-- create a link to the anchor in the content container  -->
+         <ol style="compact"><font size="normal"><a href="#{$anchorName}">
+	          <xsl:value-of select="name"/> (type: <xsl:value-of select="type"/>)</a></font>
+            <!--  recursive call if there are subsections  -->
+            <xsl:if test="section">
+               <xsl:for-each select="section">
+                  <xsl:call-template name="sectionTemplate">
+                     <xsl:with-param name="navigation" select="$navigation"/>
+                     <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/>
+                     <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>      
+               </xsl:for-each>
+            </xsl:if> 
+         </ol>
+      </xsl:when>
+      <!--  otherwise use template to display the content (navigation !=1) -->
+      <xsl:otherwise>
+       
+	 <a name="{$anchorName}"><h3> <xsl:value-of select="name"/> Section</h3></a>
+         <p>
+            <b>Type: </b><xsl:value-of select="type"/><br/>
+            <xsl:choose>
+            <xsl:when test ="repository">
+               <b>Repository: </b><xsl:value-of select="repository"/><br/>
+            </xsl:when>
+            <xsl:otherwise>
+               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
+            </xsl:otherwise>
+         </xsl:choose>
+            <b>Link: </b><xsl:if test="link"><xsl:value-of select="link"/></xsl:if><br/>
+            <b>Include:</b> <xsl:if test="include"><font color="red"><xsl:value-of select="include"/></font></xsl:if><br/>
+            <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
+         </p>
+         <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
+
+	      <!--  Check if there are any properties  -->
+         <xsl:if test="property">
+            <table border="1" rules="rows" width="100%"><font size="-1">
+               <tr bgcolor="#336699">
+                  <th><font size="+1" color="white"><b>Name</b></font></th>
+                  <th><font size="+1" color="white"><b>Value</b></font></th>
+                  <th><font size="+1" color="white"><b>Unit</b></font></th>
+                  <th><font size="+1" color="white"><b>Type</b></font></th>
+		            <th><font size="+1" color="white"><b>Definition</b></font></th>
+		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
+                  <th><font size="+1" color="white"><b>Dependency</b></font></th>
+                  <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
+               </tr>
+               <xsl:for-each select="property">
+                  <xsl:variable name="anchor">
+                     <xsl:value-of select ="name"/>
+                  </xsl:variable>
+                  <tr>
+                     <td width="15%"><a name="{$anchor}"/>
+                        <p><xsl:value-of select="name"/></p>
+                     </td>
+                     <td width="10%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="text()"/><br/></p>
+                        </xsl:for-each>      
+                     </td>
+                     <td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="unit"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+                     <td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="type"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
+                     <td width="10%">
+			               <p>
+				               <xsl:for-each select="mapping">
+				                  <xsl:variable name="mapping" select="."/>
+	                           <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
+					            </xsl:for-each>
+			               </p>
+                     </td>
+		               <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
+                     <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
+                  </tr>
+               </xsl:for-each></font>
+            </table>
+         </xsl:if>  
+         <a href="#top"><tiny>top</tiny></a>
+         <hr style="background-color:#336699; height:1px; margin-right:0; text-align:right;"/>  
+         <!--  recursive call if there are subsections  -->
+         <xsl:if test="section">
+            <xsl:for-each select="section">
+               <xsl:call-template name="sectionTemplate">
+                  <xsl:with-param name="navigation" select="$navigation"/>
+                  <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/> 
+			         <xsl:with-param name="url" select="$repository"/>
+               </xsl:call-template>      
+            </xsl:for-each>
+         </xsl:if> 
+      </xsl:otherwise>
+   </xsl:choose> 
+</xsl:template>
+	
+</xsl:stylesheet>

v1.0/model/pif.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--            perfect integrate and fire	  	       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+  <version>1.0</version>
+  <date>2011-10-14</date>
+  <section>
+    <type>model/pif</type>
+    <name>perfect Integrate and Fire</name>
+    <definition>Properties to describe a perfect integrate and fire model.</definition>
+    
+    
+    <property>
+      <name>SimulationType</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
+    </property>
+  </section>
+</odML> 

v1.0/model/single_compartment.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--            single-compartmental model 	  	       -->
+<!-- ********************************************************* --> 
+<odML version="1">
+  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+  <version>1.0</version>
+  <date>2011-10-14</date>
+  <section>
+    <type>model/single_comparment</type>
+    <name>Single compartment model</name>
+    <definition>Properties to describe a biophysical model that consists of a single compartment.</definition>
+    
+    
+    <property>
+      <name>SimulationType</name>
+      <value>
+        <type>string</type> 
+      </value>
+      <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
+    </property>
+  </section>
+</odML> 

v1.0/odml.xsl

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:odml="http://www.g-node.org/odml">
+<!-- ************************************************  -->
+<!--                   root template                   -->
+<xsl:template match="odML">
+     <xsl:variable name="repository" select="repository"/>
+   <html>
+      <style type="text/css">
+         body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; } 
+    
+         #navigationContainer { left:10%; width:95%;} 
+
+         #contentContainer { left:10%; width:95%;}
+      </style>
+      
+      <body>
+         <a name="top" style="color:#336699"><h1>odML - Metadata</h1></a>
+         <div id="navigationContainer">     
+            <p>
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Document info</h2>
+            <b>Author: </b><xsl:if test="author"><xsl:value-of select="author"/></xsl:if><br/>
+            <b>Date: </b><xsl:if test="date"><xsl:value-of select="date"/></xsl:if><br/>
+            <b>Version: </b><xsl:if test="version"><xsl:value-of select="version"/></xsl:if><br/>
+            <b>Repository: </b><xsl:if test="repository"><xsl:value-of select="repository"/></xsl:if><br/>
+            </p>
+            
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+
+            <h2>Structure</h2>
+	         <font  size ="-1" >
+            <xsl:if test="section">
+               <xsl:for-each select="section">
+			         <li>
+					      <xsl:call-template name="sectionTemplate">
+						      <xsl:with-param name="navigation">1</xsl:with-param>
+							   <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+							    <xsl:with-param name="url" select="$repository"/>
+						   </xsl:call-template>
+					   </li>
+               </xsl:for-each>
+            </xsl:if></font>
+         </div>
+         
+
+         <div id="contentContainer">
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Content</h2>
+          
+	         <xsl:if test="section">
+               <xsl:for-each select="section">
+                  <xsl:call-template name="sectionTemplate">
+                     <xsl:with-param name="navigation">0</xsl:with-param>
+                     <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+                     <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>
+               </xsl:for-each>
+            </xsl:if>
+         </div>
+      </body>
+   </html> 
+</xsl:template>
+
+<!-- ************************************************  -->
+<!--              section template.                    -->
+<xsl:template name="sectionTemplate" match="section">
+   <xsl:param name="navigation"/>   
+   <xsl:param name="anchorBase"/>
+   <xsl:param name="url"/>
+   <!-- create the anchor for the navigation menu-->   
+   <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
+ 	<!-- set new baseurl if specified within this section otherwise use the old one -->
+   <xsl:variable name="repository">
+	   <xsl:choose>
+		   <xsl:when test="repository">
+			   <xsl:value-of select ="repository"/>        
+   		</xsl:when>
+	   	<xsl:otherwise>
+			   <xsl:value-of select ="$url"/>
+         </xsl:otherwise>
+	   </xsl:choose>
+	</xsl:variable>
+   <!-- print out the content -->
+   <xsl:choose>
+      <!--  fill the navigation container if this is the task (navigation param = 1)  -->
+      <xsl:when test="$navigation = 1">
+         <!-- create a link to the anchor in the content container  -->
+         <ol style="compact"><font size="normal"><a href="#{$anchorName}">
+	         <xsl:value-of select="name"/> (type: <xsl:value-of select="type"/>)</a></font>
+            <!--  recursive call if there are subsections  -->
+            <xsl:if test="section">
+               <xsl:for-each select="section">
+                  <xsl:call-template name="sectionTemplate">
+                     <xsl:with-param name="navigation" select="$navigation"/>
+                     <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/>
+                     <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>      
+               </xsl:for-each>
+            </xsl:if> 
+         </ol>
+      </xsl:when>
+      <!--  otherwise use template to display the content (navigation !=1) -->
+      <xsl:otherwise>
+       
+	      <a name="{$anchorName}"><h3>Section: <xsl:value-of select="name"/> </h3></a>
+         <p>
+            <b>Type: </b><xsl:value-of select="type"/><br/>
+            <b>Id: </b><xsl:value-of select="id"/><br/>
+            <xsl:choose>
+            <xsl:when test ="repository">
+               <b>Repository: </b><xsl:value-of select="repository"/><br/>
+            </xsl:when>
+            <xsl:otherwise>
+               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
+            </xsl:otherwise>
+         </xsl:choose>
+            <b>Link: </b><xsl:if test="link"><xsl:value-of select="link"/></xsl:if><br/>
+            <b>Include:</b> <xsl:if test="include"><font color="red"><xsl:value-of select="include"/></font></xsl:if><br/>
+            <b>Definition:</b> <xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
+            <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
+         </p>
+         
+         <!--  Check if there are any properties  -->
+         <xsl:if test="property">
+            <table border="1" rules="rows" width="100%"><font size ="-1">
+               <tr bgcolor="#336699">
+                  <th><font size="+1" color="white"><b>Name</b></font></th>
+                  <th><font size="+1" color="white"><b>Value</b></font></th>
+                  <th><font size="+1" color="white"><b>Uncertainty</b></font></th>
+                  <th><font size="+1" color="white"><b>Unit</b></font></th>
+                  <th><font size="+1" color="white"><b>value reference</b></font></th>
+                  <th><font size="+1" color="white"><b>Type</b></font></th>
+                  <th><font size="+1" color="white"><b>Comment</b></font></th>
+<!--
+                  <th><font size="+1" color="white"><b>Dependency</b></font></th>
+                  <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
+-->
+                  <th><font size="+1" color="white"><b>Definition</b></font></th>
+               </tr>
+               <xsl:for-each select="property">
+                  <xsl:variable name="anchor">
+                     <xsl:value-of select ="name"/>
+                  </xsl:variable>
+                  <tr>
+                     <td width="15%"><a name="{$anchor}"/>
+                        <p><xsl:value-of select="name"/></p>
+                     </td>
+                     <td width="10%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="text()"/><br/></p>
+                        </xsl:for-each>      
+                     </td>
+                     <td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="uncertainty"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+							<td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="unit"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+							<td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="reference"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+                     <td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="type"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+							<td width="22.5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="comment"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+<!--
+						   <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
+                     <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
+-->
+                     <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>   
+                  </tr>
+               </xsl:for-each></font>
+            </table>
+         </xsl:if>  
+         <a href="#top"><tiny>top</tiny></a>
+         <hr style="background-color:#336699; height:1px; margin-right:0; text-align:right;"/>         
+         <!--  recursive call if there are subsections  -->
+         <xsl:if test="section">
+            <xsl:for-each select="section">
+               <xsl:call-template name="sectionTemplate">
+                  <xsl:with-param name="navigation" select="$navigation"/>
+                  <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/> 
+                  <xsl:with-param name="url" select="$repository"/>
+               </xsl:call-template>      
+            </xsl:for-each>
+         </xsl:if> 
+      </xsl:otherwise>
+   </xsl:choose> 
+</xsl:template>
+	
+</xsl:stylesheet>

v1.0/odmlTerms.xsl

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
+
+<!-- This stylesheet is for viewing odml-terminologies in a web browser -->
+<!-- Please note: only those elements will be displayed terminology related -->
+<!-- e.g. uncertainty, id, and valueComments will not be shown -->
+<!-- For viewing real metadata files use the odml.xsl stylesheet -->
+<!-- ************************************************  -->
+<!--                   root template                   -->
+<xsl:template match="odML">
+   <!-- if there is a base url definition read it and later pass it to the sections template -->
+   <xsl:variable name="repository" select="repository"/>
+   <html>
+      <link href="../../../images/odMLIcon.ico" rel="shortcut icon" csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4=" livesrc="../../../images/odMLIcon.png" />
+      <style type="text/css">
+      body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; } 
+
+      #navigationContainer { left:20px; width:80%;} 
+
+      #contentContainer { left:20px; width:80%;}
+      </style>
+      
+      
+      <body>
+         <a name="top" style="color:#336699"><h1>odML - Metadata</h1></a>
+         <div id="navigationContainer">     
+            <p>
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Document info</h2>
+            <b>Author: </b><xsl:if test="author"><xsl:value-of select="author"/></xsl:if><br/>
+            <b>Date: </b><xsl:if test="date"><xsl:value-of select="date"/></xsl:if><br/>
+            <b>Version: </b><xsl:if test="version"><xsl:value-of select="version"/></xsl:if><br/>
+            <b>Repository: </b><xsl:if test="repository"><xsl:value-of select="repository"/></xsl:if><br/>
+            </p>
+   
+         
+            
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+
+            <h2>Structure</h2>
+	         <font  size ="-1" >
+            <xsl:if test="section">
+               <xsl:for-each select="section">
+			         <li>
+					      <xsl:call-template name="sectionTemplate">
+						      <xsl:with-param name="navigation">1</xsl:with-param>
+							   <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+							    <xsl:with-param name="url" select="$repository"/>
+						   </xsl:call-template>
+					   </li>
+               </xsl:for-each>
+            </xsl:if></font>
+         </div>
+         
+         <div id="contentContainer">
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Content</h2>
+            <!-- apply the section template  -->
+	         <xsl:if test="section">
+               <xsl:for-each select="section">
+                  <xsl:call-template name="sectionTemplate">
+                     <xsl:with-param name="navigation">0</xsl:with-param>
+                     <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+                     <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>
+               </xsl:for-each>
+            </xsl:if>
+         </div>
+      </body>
+   </html> 
+</xsl:template>
+
+<!-- ************************************************  -->
+<!--              section template.                    -->
+<xsl:template name="sectionTemplate" match="section">
+   <xsl:param name="navigation"/>   
+   <xsl:param name="anchorBase"/>
+   <xsl:param name="url"/>
+   <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
+   <!-- set new repository if specified within this section otherwise use the old one -->
+   <xsl:variable name="repository">
+	   <xsl:choose>
+		   <xsl:when test="repository">
+			   <xsl:value-of select ="repository"/>        
+   		</xsl:when>
+	   	<xsl:otherwise>
+			   <xsl:value-of select ="$url"/>
+         </xsl:otherwise>
+	   </xsl:choose>
+	</xsl:variable>
+	<!-- print out the content -->
+   <xsl:choose>
+      <!--  fill the navigation container if this is the task (navigation param = 1) -->
+      <xsl:when test="$navigation = 1">
+         <!-- create a link to the anchor in the content container  -->
+         <ol style="compact"><font size="normal"><a href="#{$anchorName}">
+	          <xsl:value-of select="name"/> (type: <xsl:value-of select="type"/>)</a></font>
+            <!--  recursive call if there are subsections  -->
+            <xsl:if test="section">
+               <xsl:for-each select="section">
+                  <xsl:call-template name="sectionTemplate">
+                     <xsl:with-param name="navigation" select="$navigation"/>
+                     <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/>
+                     <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>      
+               </xsl:for-each>
+            </xsl:if> 
+         </ol>
+      </xsl:when>
+      <!--  otherwise use template to display the content (navigation !=1) -->
+      <xsl:otherwise>
+       
+	 <a name="{$anchorName}"><h3> <xsl:value-of select="name"/> Section</h3></a>
+         <p>
+            <b>Type: </b><xsl:value-of select="type"/><br/>
+            <xsl:choose>
+            <xsl:when test ="repository">
+               <b>Repository: </b><xsl:value-of select="repository"/><br/>
+            </xsl:when>
+            <xsl:otherwise>
+               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
+            </xsl:otherwise>
+         </xsl:choose>
+            <b>Link: </b><xsl:if test="link"><xsl:value-of select="link"/></xsl:if><br/>
+            <b>Include:</b> <xsl:if test="include"><font color="red"><xsl:value-of select="include"/></font></xsl:if><br/>
+            <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
+         </p>
+
+         <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
+
+	      <!--  Check if there are any properties  -->
+         <xsl:if test="property">
+            <table border="1" rules="rows" width="100%"><font size="-1">
+               <tr bgcolor="#336699">
+                  <th><font size="+1" color="white"><b>Name</b></font></th>
+                  <th><font size="+1" color="white"><b>Value</b></font></th>
+                  <th><font size="+1" color="white"><b>Unit</b></font></th>
+                  <th><font size="+1" color="white"><b>Type</b></font></th>
+		            <th><font size="+1" color="white"><b>Definition</b></font></th>
+		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
+                  <th><font size="+1" color="white"><b>Dependency</b></font></th>
+                  <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
+               </tr>
+               <xsl:for-each select="property">
+                  <xsl:variable name="anchor">
+                     <xsl:value-of select ="name"/>
+                  </xsl:variable>
+                  <tr>
+                     <td width="15%"><a name="{$anchor}"/>
+                        <p><xsl:value-of select="name"/></p>
+                     </td>
+                     <td width="10%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="text()"/><br/></p>
+                        </xsl:for-each>      
+                     </td>
+                     <td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="unit"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+                     <td width="5%">
+                        <xsl:for-each select="value">
+                           <p><xsl:value-of select="type"/><br/></p>
+                        </xsl:for-each>      
+							</td>
+							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
+		               <td width="10%">
+			               <p>
+				               <xsl:for-each select="mapping">
+				                  <xsl:variable name="mapping" select="."/>
+	                           <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
+					            </xsl:for-each>
+			               </p>
+                     </td>
+		               <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
+                     <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
+                  </tr>
+               </xsl:for-each></font>
+            </table>
+         </xsl:if>  
+         <a href="#top"><tiny>top</tiny></a>
+         <hr style="background-color:#336699; height:1px; margin-right:0; text-align:right;"/>  
+         <!--  recursive call if there are subsections  -->
+         <xsl:if test="section">
+            <xsl:for-each select="section">
+               <xsl:call-template name="sectionTemplate">
+                  <xsl:with-param name="navigation" select="$navigation"/>
+                  <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/> 
+			         <xsl:with-param name="url" select="$repository"/>
+               </xsl:call-template>      
+            </xsl:for-each>
+         </xsl:if> 
+      </xsl:otherwise>
+   </xsl:choose> 
+</xsl:template>
+	
+</xsl:stylesheet>

v1.0/person/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/person/person.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                     Person section                        -->
 <!-- ********************************************************* -->

v1.0/preparation/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/preparation/preparation.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                  Preparation  section                     -->
 <!-- ********************************************************* -->

v1.0/project/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/project/project.xml

@@ -1,62 +1,64 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-<!-- ********************************************************* -->
-<!--                     Project section                    				   -->
-<!-- ********************************************************* -->  
-<odML version="1">
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	<section>
-		<type>project</type>
-		<name>Project</name>
-		<definition>Information about the project.</definition>
-
-		<property>
-			<name>Topic</name>
-			<value>test
-				<type>text</type> 
-			</value>
-			<definition>A descriptive text of the 
-         project topic.</definition>
-		</property>
-      
-		<property>
-			<name>Grant</name>
-			<value>
-				<type>string</type> 
-			</value>
-			<definition>The name or identifier of the grant funding this project.</definition>
-		</property> 
-      
-		<property>
-			<name>PrincipleInvestigator</name>
-			<value>
-				<type>person</type> 
-			</value>
-			<definition>The person responsible for this project.</definition>
-		</property>
-      
-		<property>
-			<name>Scientist</name>
-			<value>
-				<type>person</type> 
-			</value>
-			<definition>Additional involved person(s).</definition>
-		</property> 
-      
-		<property>
-			<name>Start</name>
-			<value>
-				<type>date</type> 
-			</value>	      
-			<definition>The day the project was begun.</definition>
-		</property> 
-      
-		<property>
-			<name>End</name>
-			<value>
-				<type>date</type> 
-			</value>
-			<definition>The date the project ended.</definition>
-		</property>      
-    </section> 
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<!-- ********************************************************* -->
+<!--                     Project section                    				   -->
+<!-- ********************************************************* -->  
+<odML version="1">
+	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
+	<section>
+		<type>project</type>
+		<name>Project</name>
+		<definition>Information about the project.</definition>
+
+		<property>
+			<name>Topic</name>
+			<value>
+				<type>text</type> 
+			</value>
+			<definition>A descriptive text of the 
+         project topic.</definition>
+		</property>
+      
+		<property>
+			<name>Grant</name>
+			<value>
+				<type>string</type> 
+			</value>
+			<definition>The name or identifier of the grant funding this project.</definition>
+		</property> 
+      
+		<property>
+			<name>PrincipleInvestigator</name>
+			<value>
+				<type>person</type> 
+			</value>
+			<definition>The person responsible for this project.</definition>
+		</property>
+      
+		<property>
+			<name>Scientist</name>
+			<value>
+				<type>person</type> 
+			</value>
+			<definition>Additional involved person(s).</definition>
+		</property> 
+      
+		<property>
+			<name>Start</name>
+			<value>
+				<type>date</type> 
+			</value>	      
+			<definition>The day the project was begun.</definition>
+		</property> 
+      
+		<property>
+			<name>End</name>
+			<value>
+				<type>date</type> 
+			</value>
+			<definition>The date the project ended.</definition>
+		</property>      
+    </section> 
+</odML>

v1.0/recording/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/recording/recording.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
 <!-- ********************************************************* -->
 <!--                    Recording section                      -->
 <!-- ********************************************************* --> 

v1.0/setup/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/setup/setup.xml

@@ -2,6 +2,8 @@
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
   <!-- ********************************************************* -->
   <!--                      Setup section                        -->
   <!-- ********************************************************* -->

v1.0/stimulus/dc.xml

@@ -4,11 +4,14 @@
 <!--                      DC stimulus                       -->
 <!-- ********************************************************* -->
 <odML version="1">   
-	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-		<section>
-			<type>stimulus/dc</type>
-			<name>DC</name>
-			<definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination, current etc.</definition>
+  <version>1.0</version>
+  <date>2011-01-21</date>
+  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+  
+  <section>
+	<type>stimulus/dc</type>
+	<name>DC</name>
+	<definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination, current etc.</definition>
       
       
       <property>

v1.0/stimulus/gabor.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-    
+        <version>1.0</version>
+        <date>2011-01-21</date>
     <section>
 		<type>stimulus/gabor</type>
 		<name>Gabor</name>

v1.0/stimulus/grating.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-    
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<section>
 		<type>stimulus/grating</type>
 		<name>Grating</name>

v1.0/stimulus/movie.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
+        <version>1.0</version>
+        <date>2011-01-21</date>
     <section>
 		<type>stimulus/movie</type>
 		<name>Movie</name>

v1.0/stimulus/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/stimulus/pulse.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-   
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<section>
 		<type>stimulus/pulse</type>
 		<name>Pulse</name>

v1.0/stimulus/ramp.xml

@@ -5,6 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+        <version>1.0</version>
+        <date>2011-01-21</date>
     <section>
 		<type>stimulus/ramp</type>
 		<name>Ramp</name>

v1.0/stimulus/random_dot.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
+        <version>1.0</version>
+        <date>2011-01-21</date>
     <section>
 		<type>stimulus/random_dot</type>
       <name>RandomDot</name>

v1.0/stimulus/sawtooth.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-    
+        <version>1.0</version>
+        <date>2011-01-21</date>
     <section>
 		<type>stimulus/sawtooth</type>
 		<name>Sawtooth</name>

v1.0/stimulus/sine_wave.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<section>
 		<type>stimulus/sine_wave</type>
 		<name>Sinewave</name>

v1.0/stimulus/square_wave.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-    
+        <version>1.0</version>
+        <date>2011-01-21</date>
     <section>
 		<type>stimulus/square_wave</type>
       <name>Squarewave</name>

v1.0/stimulus/stimulus.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1">
+  <version>1.0</version>
+        <date>2011-01-21</date>
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
   <!-- ********************************************************* -->
   <!--                  stimulation section                      -->

v1.0/stimulus/stimulusTypes.xml

@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
-
-<odML version="1"> 
-   <section>
-      <name>DC</name>
-      <type>stimulus/dc</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-	   <name>Gabor</name>
-	   <type>stimulus/gabor</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-	
-	<section>
-	   <name>Grating</name>
-	   <type>stimulus/grating</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-	
-	<section>
-	   <name>Pulse</name>
-	   <type>stimulus/pulse</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-	   <name>Movie</name>
-	   <type>stimulus/movie</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-	   <name>Ramp</name>
-	   <type>stimulus/ramp</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-	   <name>RandomDot</name>
-	   <type>stimulus/randomdot</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-	   <name>Sawtooth</name>
-	   <type>stimulus/sawtooth</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-      <name>Sinewave</name>
-      <type>stimulus/sinewave</type>
-      <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-		
-	<section>
-	   <name>Squarewave</name>
-	   <type>stimulus/squarewave</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-	
-	<section>
-	   <name>WhiteNoise</name>
-	   <type>stimulus/whitenoise</type>
-		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-	</section>
-</odML>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+
+<odML version="1"> 
+   <section>
+      <name>DC</name>
+      <type>stimulus/dc</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+	   <name>Gabor</name>
+	   <type>stimulus/gabor</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+	
+	<section>
+	   <name>Grating</name>
+	   <type>stimulus/grating</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+	
+	<section>
+	   <name>Pulse</name>
+	   <type>stimulus/pulse</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+	   <name>Movie</name>
+	   <type>stimulus/movie</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+	   <name>Ramp</name>
+	   <type>stimulus/ramp</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+	   <name>RandomDot</name>
+	   <type>stimulus/randomdot</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+	   <name>Sawtooth</name>
+	   <type>stimulus/sawtooth</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+      <name>Sinewave</name>
+      <type>stimulus/sinewave</type>
+      <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+		
+	<section>
+	   <name>Squarewave</name>
+	   <type>stimulus/squarewave</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+	
+	<section>
+	   <name>WhiteNoise</name>
+	   <type>stimulus/whitenoise</type>
+		<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
+	</section>
+</odML>

v1.0/stimulus/white_noise.xml

@@ -4,6 +4,8 @@
 <!--                   White Noise stimulus                    -->
 <!-- ********************************************************* -->
 <odML version="1">
+  <version>1.0</version>
+        <date>2011-01-21</date>
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
 	
     <section>

v1.0/subject/odmlTerms.xsl

@@ -128,9 +128,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
          
 <!--
-         <xsl:for-each select="synonym">
-		      <p><b>Synonyms:</b> <xsl:value-of select="."/></p>
-	      </xsl:for-each>
 -->
          <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
 		 </p>
@@ -143,7 +140,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                   <th><font size="+1" color="white"><b>Unit</b></font></th>
                   <th><font size="+1" color="white"><b>Type</b></font></th>
 		            <th><font size="+1" color="white"><b>Definition</b></font></th>
-		            <th><font size="+1" color="white"><b>Synonym</b></font></th>
 		            <th><font size="+1" color="white"><b>Mapping</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency</b></font></th>
                   <th><font size="+1" color="white"><b>Dependency Value</b></font></th>	
@@ -172,13 +168,6 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
                         </xsl:for-each>      
 							</td>
 							<td width="22.5%"><p><xsl:value-of select="definition"/></p></td> 
-		               <td width="10%">
-			               <p>
-				               <xsl:for-each select="synonym">
-					               <xsl:value-of select="."/><br/>
-				               </xsl:for-each>
-			               </p>
-                     </td>
 		               <td width="10%">
 			               <p>
 				               <xsl:for-each select="mapping">

v1.0/subject/subject.xml

@@ -5,7 +5,8 @@
 <!-- ********************************************************* -->
 <odML version="1">
 	<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
-
+        <version>1.0</version>
+        <date>2011-01-21</date>
 	<section>
 		<type>subject</type>
 		<name>Subject</name>

v1.0/terminologies.xml

@@ -72,12 +72,12 @@
            <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/imaging.xml</include>
 	</section>
 		
-	<section>
+	<!-- <section>
 	   <type>experiment/modeling</type>
 	   <name>Modeling</name>		      
            <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/modeling.xml</include>
-	</section>
-   	
+	 </section>-->
+
 	<section>
 	   <type>experiment/pschophysics</type>
 	   <name>Psychophysics</name>
@@ -181,7 +181,30 @@
           <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/stimulus_isolator.xml</include>
 	</section>
      
-      
+       <section>
+         <type>model/lif</type>
+         <name>Leaky integrate and fire</name>
+         <include>http://portal.g-node.org/odml/terminologies/v1.0/model/lif.xml</include>
+       </section>
+        
+       <section>
+         <type>model/pif</type>
+         <name>perfect integrate and fire</name>
+         <include>http://portal.g-node.org/odml/terminologies/v1.0/model/pif.xml</include>
+       </section>
+        
+       <section>
+         <type>model/one_compartment</type>
+         <name>One compartment model</name>
+         <include>http://portal.g-node.org/odml/terminologies/v1.0/model/single_compartment.xml</include>
+       </section>
+       
+       <section>
+         <type>model/multi_compartment</type>
+         <name>Multi compartment model</name>
+         <include>http://portal.g-node.org/odml/terminologies/v1.0/model/multi_compartment.xml</include>
+       </section>
+       
       <section>
         <type>person</type>
 	<name>Person</name>