Browse Source

Section definitions now in the terminologies.xml file. Minor changes
to cell and dataset terminology. fixed stylesheet in stimulus folder.

Jan Grewe 12 years ago
parent
commit
b1ccadf06d
4 changed files with 196 additions and 116 deletions
  1. 12 14
      v1.0/cell/cell.xml
  2. 1 1
      v1.0/dataset/dataset.xml
  3. 7 9
      v1.0/stimulus/odmlTerms.xsl
  4. 176 92
      v1.0/terminologies.xml

+ 12 - 14
v1.0/cell/cell.xml

@@ -1,17 +1,15 @@
-<?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>
-	<!-- ********************************************************* -->
-	<!--                      Cell  section                        -->
-	<!-- ********************************************************* -->
-	<section>
-		<type>cell</type>
-		<name>Cell</name>
-      <definition>Specification of the recorded cell.
-      definition be a subsection of the <a href="../subject/subjectTerms.xml">Subsect</a> section.</definition>
+<?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> <!--
+********************************************************* --> <!--
+Cell section --> <!--
+********************************************************* -->
+<section> <type>cell</type> <name>Cell</name>
+<definition>Specification of the recorded cell. A cell definition
+should be a subsection of the <a
+href="../subject/subject.xml">Subject</a> section.
            
       <property>
          <name>Type</name>

+ 1 - 1
v1.0/dataset/dataset.xml

@@ -13,7 +13,7 @@
 		<definition>Names (URLs) and times of recorded data files.
      Datasets are obtained during a Recording and may belong to
      different Experiments. Related sections that can be used as
-     subsections, parent sections, or siblilngs are Stimulus,
+     subsections, parent sections, or siblings are Stimulus,
      HardwareSettings, and Experiment.</definition>
           
      <property>

+ 7 - 9
v1.0/stimulus/odmlTerms.xsl

@@ -8,11 +8,11 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 <!-- For viewing real metadata files use the odml.xsl stylesheet -->
 <!-- ************************************************  -->
 <!--                   root template                   -->
-<xsl:template match="odml">
+<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" />
+      <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; } 
 
@@ -23,7 +23,7 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
       
       
       <body>
-         <a name="top" style="color:#336699"><h1>odml - Metadata</h1></a>
+         <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;"/>
@@ -114,8 +114,7 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 	 <a name="{$anchorName}"><h3> <xsl:value-of select="name"/> Section</h3></a>
          <p>
             <b>Type: </b><xsl:value-of select="type"/><br/>
-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
-         <xsl:choose>
+            <xsl:choose>
             <xsl:when test ="repository">
                <b>Repository: </b><xsl:value-of select="repository"/><br/>
             </xsl:when>
@@ -126,11 +125,10 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
             <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/>
-		 </p>
+
 	      <!--  Check if there are any properties  -->
          <xsl:if test="property">
             <table border="1" rules="rows" width="100%"><font size="-1">

+ 176 - 92
v1.0/terminologies.xml

@@ -4,71 +4,88 @@
 	<section>
 	   <type>analysis</type>
 	   <name>Analysis</name>
+	   <definition>Sections of the Analysis type can be used to describe analyses.</definition>
 	   <include>http://portal.g-node.org/odml/terminologies/v1.0/analysis/analysis.xml</include>
 	</section>
 	 
     <section>
 	   <type>analysis/psth</type>
 	   <name>PSTH</name>
-           <include>http://portal.g-node.org/odml/terminologies/v1.0/analysis/psth.xml</include>
+	   <definition>An Analysis-type section to describe a PSTH.</definition>
+       <include>http://portal.g-node.org/odml/terminologies/v1.0/analysis/psth.xml</include>
 	</section>
          
     <section>
            <type>analysis/power_spectrum</type>
            <name>PowerSpectrum</name>
+           <definition>Properties of this section define the way a power spectrum was calculated.</definition>
            <include>http://portal.g-node.org/odml/terminologies/v1.0/analysis/power_spectrum.xml</include>
 	</section>
          
 	<section>
 	   <type>cell</type>
 	   <name>Cell</name>
+	   <definition>Specification of the recorded cell. A cell definition should be a subsection of the <a href="../subject/subject.xml">Subject</a> section.</definition>
            <include>http://portal.g-node.org/odml/terminologies/v1.0/cell/cell.xml</include>
 	</section>
 	
     <section>
           <type>dataset</type>
           <name>Dataset</name>
+          <definition>Names (URLs) and times of recorded data files. Datasets are obtained during a Recording
+ and may belong to different Experiments. Related sections that can be used as subsections, parent sections, or siblings are Stimulus, HardwareSettings, and Experiment.</definition>
           <include>http://portal.g-node.org/odml/terminologies/v1.0/dataset/dataset.xml</include>
     </section>
 
     <section>
-          <type>electrode/generic</type>
+          <type>electrode</type>
           <name>Electrode</name>
+          <definition>Properties to describe an electrode.</definition>
+          <include>http://portal.g-node.org/odml/terminologies/v1.0/electrode/electrode.xml</include>
     </section>
 
     <section>
        <type>event</type>
           <name>Event</name>
+          <definition>Section for short annotations that are taken during an experiment to describe certain events.</definition>
           <include>http://portal.g-node.org/odml/terminologies/v1.0/event/event.xml</include>
     </section>
 
     <section>
           <type>event_list</type>
-          <name>EventList</name>
+          <name>EventList</name><definition>Section for grouping short annotations that are taken during
+     an experiment, preparation etc...</definition>
           <include>http://portal.g-node.org/odml/terminologies/v1.0/collection/event_list.xml</include>
 	</section>
 
     <section>
           <type>experiment</type>
           <name>Experiment</name>
+          <definition>Specification of an experiment. The Experiment is
+      part of a Project and the recorded data for a specific
+      Experiment are found in Datasets. Possible subsections are, for
+      example, Dataset and Stimulus.</definition>
           <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/experiment.xml</include>
     </section>
         
     <section>
 	  <type>experiment/behavior</type>
 	  <name>Behavior</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/behavior.xml</include>
+	  <definition>Properties for describing an behavioural experiment.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/behavior.xml</include>
 	</section>
 
     <section>
 	   <type>experiment/electrophysiology</type>
-	   <name>Electrophysiology</name>
-           <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/electrophysiology.xml</include>
+	   <name>Electrophysiology</name> 
+	   <definition>Properties for describing an electrophysiological experiment.</definition>
+       <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/electrophysiology.xml</include>
 	</section>
 	
 	<section>
 	   <type>experiment/imaging</type>
 	   <name>Imaging</name>
+	   <definition>Properties for describing an imaging experiment ranging from conventional light microscpoy to fMRI.</definition>
            <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/imaging.xml</include>
 	</section>
 		
@@ -81,7 +98,8 @@
 	<section>
 	   <type>experiment/pschophysics</type>
 	   <name>Psychophysics</name>
-           <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/psychophysics.xml</include>
+	   <definition>Properties for describing an psychophysical experiment.</definition>
+       <include>http://portal.g-node.org/odml/terminologies/v1.0/experiment/psychophysics.xml</include>
 	</section>	
 	
 
@@ -94,158 +112,212 @@
     <section>
         <type>hardware_settings</type>
         <name>HardwareSettings</name>
+        <definition>The used values of variable properties of hardware
+      components. 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>
         <include>http://portal.g-node.org/odml/terminologies/v1.0/collection/hardware_settings.xml</include>
     </section>
         
     <section>
 		<type>hardware</type>
 		<name>Hardware</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>
         <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/hardware.xml</include>
      </section>  
 	
     <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>
        <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/amplifier.xml</include>
     </section>
          
     <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>
 		<include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/attenuator.xml</include>
      </section>
 		
      <section>
-        <type>hardware/cameraObjective</type>
+        <type>hardware/camera_objective</type>
         <name>CameraObjective</name>
+        <definition>This section contains properties that describe a camera objective.</definition>
         <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/attenuator.xml</include>
 	 </section>
 		
 	<section>
 	  <type>hardware/daq</type>
 	  <name>DataAcquisition</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/daq.xml</include>
+	  <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>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/daq.xml</include>
 	</section>
 		
 	<section>
 	  <type>hardware/eyetracker</type>
 	  <name>Eyetracker</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/eyetracker.xml</include>
+	  <definition>Properties of an eyetracker.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/eyetracker.xml</include>
 	</section>
 		
 	<section>
 	  <type>hardware/filter</type>
 	  <name>Filter</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/filter.xml</include>
+	  <definition>Properties a filter modul for analog signal conditioning.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/filter.xml</include>
 	</section>
 		
 	<section>
 	  <type>hardware/filter_set</type>
 	  <name>Filterset</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/filter_set.xml</include>
+	  <definition>The FilterSet or also FilterCube used in a microscope.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/filter_set.xml</include>
 	</section>
 		
 	<section>
 	  <type>hardware/iaq</type>
 	  <name>ImageAcquisition</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/iaq.xml</include>
+	  <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/iaq.xml</include>
 	</section>
 		
 	<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>
           <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/light_source.xml</include>
 	</section>
 		
 	<section>
 	  <type>hardware/microscope</type>
 	  <name>Microscope</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/microscope.xml</include>
+	  <definition>The Microscope section describes the properties of the used microscope.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/microscope.xml</include>
 	</section>
 		
 	<section>
-          <type>hardware/microscope_objective</type>
+      <type>hardware/microscope_objective</type>
 	  <name>MicroscopeObjective</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/microscope_objective.xml</include>
+	  <definition>This section contains properties that describe the objective used in a microscope.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/microscope_objective.xml</include>
 	</section>
 				
 	<section>
 	  <type>hardware/scanner</type>
 	  <name>Scanner</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/scanner.xml</include>
+	  <definition>The Scanner used to scan microscope images.</definition>
+      <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/scanner.xml</include>
 	</section>
 		
 	<section>
 	  <type>hardware/stimulus_isolator</type>
 	  <name>StimulusIsolator</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/hardware/stimulus_isolator.xml</include>
+	  <definition>Properties of a stimulus Isolator device.</definition>
+      <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/lif</type>
+    <name>Leaky integrate and fire</name>
+    <definition>Section to describe a leaky integrate and fire neuron model.</definition>
+    <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/pif</type>
+    <name>perfect integrate and fire</name>
+    <definition>Section to describe a perfect integrate and fire model.</definition>
+    <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>model/multi_compartment</type>
+    <name>Multi compartment model</name>
+    <definition>Section to describe a biophysical model that consists of a number of compartments.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/model/multi_compartment.xml</include>
+  </section>
+     
+  <section>
+    <type>model/single_compartment</type>
+    <name>One compartment model</name>
+    <definition>Section to describe a biophysical model that consists of a single compartment.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/model/single_compartment.xml</include>
+  </section>
        
-      <section>
-        <type>person</type>
-	<name>Person</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/person/person.xml</include>
-      </section>	
+  <section>
+    <type>person</type>
+	  <name>Person</name>
+	  <definition>Information about a person. E.g. as Experimenter, Author, etc.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/person/person.xml</include>
+  </section>	
 	
-      <section>
-        <type>preparation</type>
-	<name>Preparation</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/preparation/preparation.xml</include>
-      </section>
+  <section>
+    <type>preparation</type>
+    <name>Preparation</name>
+    <definition>Description of the preparation procedure.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/preparation/preparation.xml</include>
+  </section>
 	
-      <section>
-        <type>project</type>
-        <name>Project</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/project/project.xml</include>
-      </section>
+  <section>
+    <type>project</type>
+    <name>Project</name>
+    <definition>Information about the project.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/project/project.xml</include>
+  </section>
       
-      <section>
-        <type>recording</type>
-	<name>Recording</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/recording/recording.xml</include>
-      </section>
+  <section>
+    <type>recording</type>
+  	<name>Recording</name>
+  	<definition>During a recording session in a Setup Datasets are
+      obtained from Cells and/or a Subject by using various stimuli (Stimulus section).</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/recording/recording.xml</include>
+  </section>
 	
-      <section>
-        <type>setup</type>
-	<name>Setup</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/setup/setup.xml</include>
-      </section>
+  <section>
+    <type>setup</type>
+	  <name>Setup</name>
+	  <definition>The experimental setup used in the recordings. By
+      using HardwareProperties as a subsection, a very detailed
+      description of the setup can be given.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/setup/setup.xml</include>
+  </section>
 	
-      <section>
-        <type>stimulus</type>
-	<name>Stimulus</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/stimulus.xml</include>
-      </section>
+  <section>
+    <type>stimulus</type>
+    <name>Stimulus</name>
+    <definition>General description of an applied stimulus. This
+      section is basis of various related sections that specify
+      more specific stimuli.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/stimulus.xml</include>
+  </section>
       
-      <section>
-          <type>stimulus/dc</type>
+  <section>
+    <type>stimulus/dc</type>
 	  <name>DC</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/dc.xml</include>
-        </section>
+	  <definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination, current etc.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/dc.xml</include>
+  </section>
       
 	<section>
 	  <type>stimulus/gabor</type>
@@ -256,31 +328,36 @@
 	<section>
 	  <type>stimulus/grating</type>
 	  <name>Grating</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/grating.xml</include>
+	  <definition>Property definitions to describe Gabor stimuli.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/grating.xml</include>
 	</section>
 		
 	<section>
 	  <type>stimulus/pulse</type>
 	  <name>Pulse</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/pulse.xml</include>
+    <definition>Properties to describe a simple pulse stimulus that starts from and returns to a certain baseline.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/pulse.xml</include>
 	</section>
 		
 	<section>
 	  <type>stimulus/movie</type>
 	  <name>Movie</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/movie.xml</include>
+	  <definition>Properties to describe a movie (or image sequence) stimulus.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/movie.xml</include>
 	</section>
 		
 	<section>
 	  <type>stimulus/ramp</type>
 	  <name>Ramp</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/ramp.xml</include>
-	</section>
+	  <definition>A ramp stimulus may either linearly increase or decrease in amplitude. Starting from a certain start amplitude and reaching with a certain slope the destination amplitude.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/ramp.xml</include>
+  </section>
 		
 	<section>
 	  <type>stimulus/random_dot</type>
 	  <name>RandomDot</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/random_dot.xml</include>
+	  <definition>Properties to describe a random dot stimulus.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/random_dot.xml</include>
 	</section>
 		
 	<section>
@@ -292,30 +369,37 @@
 	<section>
 	  <type>stimulus/sine_wave</type>
 	  <name>Sinewave</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/sine_wave.xml</include>
+	  <definition>Sawtooth Properties.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/sine_wave.xml</include>
 	</section>
 		
 	<section>
 	  <type>stimulus/square_wave</type>
 	  <name>Squarewave</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/square_wave.xml</include>
+	  <definition>A squarewave stimulus was presented. Squarewaves modulate with a certain frequency about the intensity offset. </definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/square_wave.xml</include>
 	</section>
 		
 	<section>
 	  <type>stimulus/white_noise</type>
 	  <name>Whitenoise</name>
-          <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/white_noise.xml</include>
+	  <definition>Property definitions to describe a white noise stimulus.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/stimulus/white_noise.xml</include>
 	</section>
 	
-      <section>
-	<type>subject</type>
-	<name>Subject</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/subject/subject.xml</include>
-      </section>
+  <section>
+	  <type>subject</type>
+  	<name>Subject</name>
+  	<definition>The investigated experimental subject (animal or person).
+      May contain the Cell and Preparation sections as subsections.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/subject/subject.xml</include>
+  </section>
    
-      <section>
-	<type>carmen_mini</type>
-	<name>CarmenMini</name>
-        <include>http://portal.g-node.org/odml/terminologies/v1.0/carmenMini/carmen_mini.xml</include>
-      </section>
+  <section>
+	  <type>carmen_mini</type>
+  	<name>CarmenMini</name>
+  	<definition>This is a convenience section that lists the terms of the CARMEN MINI (Gibson et al. Nature Precedings, 2009 Version 0.6) and 
+    maps them to the odml "standard" terminologies.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.0/carmenMini/carmen_mini.xml</include>
+  </section>
 </odML>