Index: q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 410)
+++ q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 411)
@@ -161,24 +161,29 @@
 
          <sml:contact>
+            <sml:ContactList gml:id="contact">
+               <sml:member>
+                  <sml:ResponsibleParty gml:id="sales">
+                     <sml:individualName>Somebody from YSI</sml:individualName>
+                     <sml:organizationName>YSI Environmental</sml:organizationName>
+                     <sml:contactInfo>
+                        <sml:phone>
+                           <sml:voice>+1-937-767-7241</sml:voice>
+                           <sml:facsimile>+1-937-767-9353</sml:facsimile>
+                        </sml:phone>
+                        <sml:address>
+                           <sml:deliveryPoint>1700/1725 Brannum Lane</sml:deliveryPoint>
+                           <sml:city>Yellow Springs</sml:city>
+                           <sml:administrativeArea>Ohio</sml:administrativeArea>
+                           <sml:postalCode>45387-1107</sml:postalCode>
+                           <sml:country>USA</sml:country>
+                           <sml:electronicMailAddress>environmental@ysi.com</sml:electronicMailAddress>
+                        </sml:address>
+                     </sml:contactInfo>
+                  </sml:ResponsibleParty>                 
+               </sml:member>
+            </sml:ContactList>
+            
             <!-- Pretty View does not see Sales -->
-            <sml:ResponsibleParty gml:id="sales">
-               <sml:individualName>Somebody from YSI</sml:individualName>
-               <sml:organizationName>YSI Environmental</sml:organizationName>
-               <sml:contactInfo>
-                  <sml:phone>
-                     <sml:voice>+1-937-767-7241</sml:voice>
-                     <sml:facsimile>+1-937-767-9353</sml:facsimile>
-                  </sml:phone>
-                  <sml:address>
-                     <sml:deliveryPoint>1700/1725 Brannum Lane</sml:deliveryPoint>
-                     <sml:city>Yellow Springs</sml:city>
-                     <sml:administrativeArea>Ohio</sml:administrativeArea>
-                     <sml:postalCode>45387-1107</sml:postalCode>
-                     <sml:country>USA</sml:country>
-                     <sml:electronicMailAddress>environmental@ysi.com</sml:electronicMailAddress>
-                  </sml:address>
-               </sml:contactInfo>
-            </sml:ResponsibleParty>
-         </sml:contact>
+        </sml:contact>
 
          <!--==========================================================-->
@@ -187,29 +192,31 @@
 
          <sml:documentation>
-            <sml:Document>
-               <gml:description>Collection of information regarding YSI 6600V2 Multiparameter Sonde</gml:description>
-               <sml:onlineResource 
-                  xlink:href="http://www.ysi.com/productsdetail.php?6600V2-1"/>
-            </sml:Document>
-         </sml:documentation>
-         <sml:documentation>
-            <sml:Document>
-               <gml:description>Photos of the 6600V2</gml:description>
-               <sml:onlineResource 
-                  xlink:href="http://www.ysi.com/media/products/6600V2-sensors.jpg"/>
-            </sml:Document>
-         </sml:documentation>
-         <sml:documentation>
-            <sml:Document>
-               <gml:description>Specification sheet for the 6600V2</gml:description>
-               <sml:onlineResource 
-                  xlink:href="http://www.ysi.com/media/pdfs/E52-6600V2.pdf"/>
-            </sml:Document>
-         </sml:documentation>
-         <sml:documentation>
-
-            <sml:Document>
-               <gml:description>Standard Methods for the Examination of Water and Wastewater (Ed. 1989)</gml:description>
-            </sml:Document>
+            <sml:DocumentList gml:id="documentation">
+               <sml:member name="">
+                  <sml:Document>
+                     <gml:description>Collection of information regarding YSI 6600V2 Multiparameter Sonde</gml:description>
+                     <sml:onlineResource xlink:href="http://www.ysi.com/productsdetail.php?6600V2-1"
+                     />
+                  </sml:Document>
+               </sml:member>
+               <sml:member name="">
+                  <sml:Document>
+                     <gml:description>Photos of the 6600V2</gml:description>
+                     <sml:onlineResource
+                        xlink:href="http://www.ysi.com/media/products/6600V2-sensors.jpg"/>
+                  </sml:Document>
+               </sml:member>
+               <sml:member name="">
+                  <sml:Document>
+                     <gml:description>Specification sheet for the 6600V2</gml:description>
+                     <sml:onlineResource xlink:href="http://www.ysi.com/media/pdfs/E52-6600V2.pdf"/>
+                  </sml:Document>
+               </sml:member>
+               <sml:member name="">                  
+                  <sml:Document>
+                     <gml:description>Standard Methods for the Examination of Water and Wastewater (Ed. 1989)</gml:description>
+                  </sml:Document>
+               </sml:member>
+            </sml:DocumentList>
          </sml:documentation>
 
@@ -223,5 +230,5 @@
 
          <sml:inputs>
-            <sml:InputList>
+            <sml:InputList id="inputs">
                <sml:input name="conductivity">
                   <swe:ObservableProperty
@@ -260,23 +267,13 @@
          <!--==============================-->
          <sml:outputs>
-            <sml:OutputList>
+            <sml:OutputList id="outputs">
                <!-- xxxx need to complete definitions -->
-               <sml:output name="deep_non_vented_water_level">
-                  <swe:Quantity definition="">
+               <sml:output name="depth">
+                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/depth">
                      <swe:uom code="m"/>
                   </swe:Quantity>
                </sml:output>
-               <sml:output name="medium_non_vented_water_level">
-                  <swe:Quantity definition="">
-                     <swe:uom code="m"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="shallow_non_vented_water_level">
-                  <swe:Quantity definition="">
-                     <swe:uom code="m"/>
-                  </swe:Quantity>
-               </sml:output>
-               <sml:output name="shallow_vented_water_level">
-                  <swe:Quantity definition="">
+               <sml:output name="water_level">
+                  <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/water_level">
                      <swe:uom code="m"/>
                   </swe:Quantity>
@@ -344,5 +341,5 @@
          <!--=======================-->
          <sml:parameters>
-            <sml:ParameterList>
+            <sml:ParameterList id="parameters">
                <sml:parameter name="SondeParameters">
                   <swe:DataRecord>
@@ -412,5 +409,5 @@
          <sml:components>
             <sml:ComponentList>
-
+               <!-- xxxx Add response time or latency to all parameters in each component -->
                <sml:component name="Conductivity" xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component>
@@ -645,5 +642,6 @@
                </sml:component>
 
-               <sml:component name="Deep Non-vented Depth">
+               <sml:component name="Deep Non-vented Depth"
+                  xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component>
                      <gml:description>YSI Pressure Sensor</gml:description>
@@ -657,5 +655,5 @@
                            <sml:identifier name="sensorType">
                               <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
-                                 <sml:value>strain gauge</sml:value>
+                                 <sml:value>differential strain gauge</sml:value>
                               </sml:Term>
                            </sml:identifier>
@@ -712,5 +710,6 @@
                   </sml:Component>
                </sml:component>
-               <sml:component name="Medium Non-vented Depth">
+               <sml:component name="Medium Non-vented Depth"
+                  xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component>
                      <gml:description>YSI Pressure Sensor</gml:description>
@@ -724,5 +723,5 @@
                            <sml:identifier name="sensorType">
                               <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
-                                 <sml:value>strain gauge</sml:value>
+                                 <sml:value>differential strain gauge</sml:value>
                               </sml:Term>
                            </sml:identifier>
@@ -779,5 +778,6 @@
                   </sml:Component>
                </sml:component>
-               <sml:component name="Shallow Non-vented Depth">
+               <sml:component name="Shallow Non-vented Depth"
+                  xlink:role="urn:ogc:def:process:OGC:detector">
                   <sml:Component>
                      <gml:description>YSI Pressure Sensor</gml:description>
@@ -791,5 +791,5 @@
                            <sml:identifier name="sensorType">
                               <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
-                                 <sml:value>strain gauge</sml:value>
+                                 <sml:value>differential strain gauge</sml:value>
                               </sml:Term>
                            </sml:identifier>
@@ -846,4 +846,73 @@
                   </sml:Component>
                </sml:component>
+               <sml:component name="Shallow Vented Water Level"
+                  xlink:role="urn:ogc:def:process:OGC:detector">
+                  <sml:Component>
+                     <gml:description>YSI Pressure Sensor </gml:description>
+                     <sml:identification>
+                        <sml:IdentifierList>
+                           <sml:identifier name="longName">
+                              <sml:Term definition="urn:ogc:def:property:OGC:longName">
+                                 <sml:value>Depth</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                           <sml:identifier name="sensorType">
+                              <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
+                                 <sml:value>differential strain gauge</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                        </sml:IdentifierList>
+                     </sml:identification>
+
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="pressure">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/pressure"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="water_level">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/water_level">
+                                 <swe:uom code="m"/>
+                              </swe:Quantity>
+                           </sml:output>
+                        </sml:OutputList>
+                     </sml:outputs>
+
+                     <sml:parameters>
+                        <sml:ParameterList>
+                           <sml:parameter name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 9.1</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.018</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                        </sml:ParameterList>
+                     </sml:parameters>
+                  </sml:Component>
+               </sml:component>
 
                <sml:component name="Optical Dissolved Oxygen"> </sml:component>
@@ -857,8 +926,13 @@
 
             </sml:ComponentList>
-
          </sml:components>
 
-         <sml:positions/>
+         <sml:positions>
+            <sml:PositionList id="positions">
+               <sml:position name="">
+                  
+               </sml:position>
+            </sml:PositionList>
+         </sml:positions>
 
          <!--==============================-->
@@ -866,5 +940,16 @@
          <!--==============================-->
 
-         <sml:connections/>
+         <sml:connections>
+            <sml:ConnectionList>
+               <sml:connection>
+                  <sml:Link>
+                     <sml:source ref=""/>
+                     <sml:destination ref=""/>
+                  </sml:Link>
+                  
+               </sml:connection>
+            </sml:ConnectionList>
+            
+         </sml:connections>
 
       </sml:System>
Index: q2o/sos_unc/trunk/sos_unc/morgan.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/morgan.xml (revision 398)
+++ q2o/sos_unc/trunk/sos_unc/morgan.xml (revision 411)
@@ -34,4 +34,16 @@
                 </gml:EngineeringCRS>
             </sml:spatialReferenceFrame>
+            
+            <sml:parameters>
+                <sml:ParameterList>
+                    <sml:parameter name="Nominal Water Depth">
+                        <swe:Quantity definition="http://mmisw.org/ont/ioos/parameter/water_depth">
+                            <swe:uom code="m"/>
+                            <swe:value>10.5</swe:value>
+                        </swe:Quantity>
+                    </sml:parameter>
+                </sml:ParameterList>
+                
+            </sml:parameters>
 
             <sml:components>
@@ -44,5 +56,5 @@
                     <sml:component name="WaterQualitySystem"
                         xlink:role="urn:ogc:def:process:OGC:system"
-                        xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/WQ_System.xml"
+                        xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/morgan_ysi.xml"
                     />
                 </sml:ComponentList>