Merge branch 'master' into TEST

DOC/html/classdata__obs__vector__inherit__graph.map

-<map id="data_obs_vector" name="data_obs_vector">
-<area shape="rect" id="node2" href="$classdata__obs.html" title="data_obs" alt="" coords="27,5,102,32"/>
-</map>

DOC/html/classdriver__obs.html

@@ -70,11 +70,6 @@ Inheritance diagram for driver_obs:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__inherit__graph.png" border="0" usemap="#driver__obs_inherit__map" alt="Inheritance graph"/></div>
 <map name="driver__obs_inherit__map" id="driver__obs_inherit__map">
-<area shape="rect" id="node2" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="155,80,283,107"/>
-<area shape="rect" id="node3" href="classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="88,155,203,181"/>
-<area shape="rect" id="node6" href="classdriver__obs__obsdaq.html" title="driver_obs_obsdaq" alt="" coords="227,155,357,181"/>
-<area shape="rect" id="node4" href="classdriver__obs__gsm19.html" title="driver_obs_gsm19" alt="" coords="5,229,133,256"/>
-<area shape="rect" id="node5" href="classdriver__obs__gsm90.html" title="driver_obs_gsm90" alt="" coords="157,229,285,256"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <div class="dynheader">
@@ -82,8 +77,6 @@ Collaboration diagram for driver_obs:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__coll__graph.png" border="0" usemap="#driver__obs_coll__map" alt="Collaboration graph"/></div>
 <map name="driver__obs_coll__map" id="driver__obs_coll__map">
-<area shape="rect" id="node2" href="classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node3" href="classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
@@ -191,7 +184,7 @@ Protected Attributes</h2></td></tr>
 </div><div class="memdoc">
 <p>Take continuous measurements in triggered mode </p>
 
-<p>Implemented in <a class="el" href="classdriver__obs__obsdaq.html#aa1983d3f41669000cbecda9055545906">driver_obs_obsdaq</a>, <a class="el" href="classdriver__obs__gsm.html#a683a581d16e390495a8c79f7500bfa8f">driver_obs_gsm</a>, and <a class="el" href="classDriver__Obs__Serial.html#ace908dd3123aff8d1193d8f70ac0fe4f">Driver_Obs_Serial</a>.</p>
+<p>Implemented in <a class="el" href="classdriver__obs__obsdaq.html#aa1983d3f41669000cbecda9055545906">driver_obs_obsdaq</a>, <a class="el" href="classdriver__obs__gsm.html#a683a581d16e390495a8c79f7500bfa8f">driver_obs_gsm</a>, <a class="el" href="classdriver__obs__gsm90.html#af95f3de241ccc9d1810bfbd8e26f936d">driver_obs_gsm90</a>, and <a class="el" href="classDriver__Obs__Serial.html#ace908dd3123aff8d1193d8f70ac0fe4f">Driver_Obs_Serial</a>.</p>
 
 </div>
 </div>

DOC/html/classdriver__obs__coll__graph.map

-<map id="driver_obs" name="driver_obs">
-<area shape="rect" id="node2" href="$classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node3" href="$classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
-</map>

DOC/html/classdriver__obs__gsm.html

@@ -70,10 +70,6 @@ Inheritance diagram for driver_obs_gsm:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__gsm__inherit__graph.png" border="0" usemap="#driver__obs__gsm_inherit__map" alt="Inheritance graph"/></div>
 <map name="driver__obs__gsm_inherit__map" id="driver__obs__gsm_inherit__map">
-<area shape="rect" id="node4" href="classdriver__obs__gsm19.html" title="driver_obs_gsm19" alt="" coords="5,229,133,256"/>
-<area shape="rect" id="node5" href="classdriver__obs__gsm90.html" title="driver_obs_gsm90" alt="" coords="157,229,285,256"/>
-<area shape="rect" id="node2" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="81,80,209,107"/>
-<area shape="rect" id="node3" href="classdriver__obs.html" title="driver_obs" alt="" coords="104,5,187,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <div class="dynheader">
@@ -81,10 +77,6 @@ Collaboration diagram for driver_obs_gsm:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__gsm__coll__graph.png" border="0" usemap="#driver__obs__gsm_coll__map" alt="Collaboration graph"/></div>
 <map name="driver__obs__gsm_coll__map" id="driver__obs__gsm_coll__map">
-<area shape="rect" id="node2" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="60,171,188,197"/>
-<area shape="rect" id="node3" href="classdriver__obs.html" title="driver_obs" alt="" coords="83,95,165,121"/>
-<area shape="rect" id="node4" href="classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node5" href="classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
@@ -346,6 +338,8 @@ Additional Inherited Members</h2></td></tr>
 
 <p>Implements <a class="el" href="classDriver__Obs__Serial.html#ace908dd3123aff8d1193d8f70ac0fe4f">Driver_Obs_Serial</a>.</p>
 
+<p>Reimplemented in <a class="el" href="classdriver__obs__gsm90.html#af95f3de241ccc9d1810bfbd8e26f936d">driver_obs_gsm90</a>.</p>
+
 </div>
 </div>
 <a id="abaca6e42c6070a71d2c368e45dab58df"></a>

DOC/html/classdriver__obs__gsm19.html

@@ -69,9 +69,6 @@ Inheritance diagram for driver_obs_gsm19:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__gsm19__inherit__graph.png" border="0" usemap="#driver__obs__gsm19_inherit__map" alt="Inheritance graph"/></div>
 <map name="driver__obs__gsm19_inherit__map" id="driver__obs__gsm19_inherit__map">
-<area shape="rect" id="node2" href="classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="12,155,127,181"/>
-<area shape="rect" id="node3" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="5,80,133,107"/>
-<area shape="rect" id="node4" href="classdriver__obs.html" title="driver_obs" alt="" coords="28,5,111,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <div class="dynheader">
@@ -79,11 +76,6 @@ Collaboration diagram for driver_obs_gsm19:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__gsm19__coll__graph.png" border="0" usemap="#driver__obs__gsm19_coll__map" alt="Collaboration graph"/></div>
 <map name="driver__obs__gsm19_coll__map" id="driver__obs__gsm19_coll__map">
-<area shape="rect" id="node2" href="classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="67,247,181,273"/>
-<area shape="rect" id="node3" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="60,171,188,197"/>
-<area shape="rect" id="node4" href="classdriver__obs.html" title="driver_obs" alt="" coords="83,95,165,121"/>
-<area shape="rect" id="node5" href="classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node6" href="classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">

DOC/html/classdriver__obs__gsm19__coll__graph.map

-<map id="driver_obs_gsm19" name="driver_obs_gsm19">
-<area shape="rect" id="node2" href="$classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="67,247,181,273"/>
-<area shape="rect" id="node3" href="$classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="60,171,188,197"/>
-<area shape="rect" id="node4" href="$classdriver__obs.html" title="driver_obs" alt="" coords="83,95,165,121"/>
-<area shape="rect" id="node5" href="$classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node6" href="$classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
-</map>

DOC/html/classdriver__obs__gsm19__inherit__graph.map

-<map id="driver_obs_gsm19" name="driver_obs_gsm19">
-<area shape="rect" id="node2" href="$classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="12,155,127,181"/>
-<area shape="rect" id="node3" href="$classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="5,80,133,107"/>
-<area shape="rect" id="node4" href="$classdriver__obs.html" title="driver_obs" alt="" coords="28,5,111,32"/>
-</map>

DOC/html/classdriver__obs__gsm90.html

@@ -69,9 +69,6 @@ Inheritance diagram for driver_obs_gsm90:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__gsm90__inherit__graph.png" border="0" usemap="#driver__obs__gsm90_inherit__map" alt="Inheritance graph"/></div>
 <map name="driver__obs__gsm90_inherit__map" id="driver__obs__gsm90_inherit__map">
-<area shape="rect" id="node2" href="classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="12,155,127,181"/>
-<area shape="rect" id="node3" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="5,80,133,107"/>
-<area shape="rect" id="node4" href="classdriver__obs.html" title="driver_obs" alt="" coords="28,5,111,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <div class="dynheader">
@@ -79,11 +76,6 @@ Collaboration diagram for driver_obs_gsm90:</div>
 <div class="dyncontent">
 <div class="center"><img src="classdriver__obs__gsm90__coll__graph.png" border="0" usemap="#driver__obs__gsm90_coll__map" alt="Collaboration graph"/></div>
 <map name="driver__obs__gsm90_coll__map" id="driver__obs__gsm90_coll__map">
-<area shape="rect" id="node2" href="classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="67,247,181,273"/>
-<area shape="rect" id="node3" href="classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="60,171,188,197"/>
-<area shape="rect" id="node4" href="classdriver__obs.html" title="driver_obs" alt="" coords="83,95,165,121"/>
-<area shape="rect" id="node5" href="classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node6" href="classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
 </map>
 <center><span class="legend">[<a href="graph_legend.html">legend</a>]</span></center></div>
 <table class="memberdecls">
@@ -95,6 +87,8 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:ac06d9dbfc4364751a115817a7606c751"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa51ab2388523ab4783894c90ff756485"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdriver__obs__gsm90.html#aa51ab2388523ab4783894c90ff756485">freerun</a> (double <a class="el" href="classdriver__obs.html#a46b9d8013cd13df2cb45fcbb05f55691">freq</a>)</td></tr>
 <tr class="separator:aa51ab2388523ab4783894c90ff756485"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:af95f3de241ccc9d1810bfbd8e26f936d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdriver__obs__gsm90.html#af95f3de241ccc9d1810bfbd8e26f936d">run</a> (double <a class="el" href="classdriver__obs.html#a46b9d8013cd13df2cb45fcbb05f55691">freq</a>)</td></tr>
+<tr class="separator:af95f3de241ccc9d1810bfbd8e26f936d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_classdriver__obs__gsm"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_classdriver__obs__gsm')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="classdriver__obs__gsm.html">driver_obs_gsm</a></td></tr>
 <tr class="memitem:afa6fb2084ee610e78ec311233c431bdc inherit pub_methods_classdriver__obs__gsm"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdriver__obs__gsm.html#afa6fb2084ee610e78ec311233c431bdc">driver_obs_gsm</a> (std::string port, <a class="el" href="classbuffer__obs.html">buffer_obs</a> *<a class="el" href="classdriver__obs.html#a5953d64be5b3006aa8fb439db8ab1129">buffer</a>, int baud)</td></tr>
 <tr class="separator:afa6fb2084ee610e78ec311233c431bdc inherit pub_methods_classdriver__obs__gsm"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -102,8 +96,6 @@ Public Member Functions</h2></td></tr>
 <tr class="separator:aea9955d5f32d847ae52f158fc86eb729 inherit pub_methods_classdriver__obs__gsm"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a07a4397cb1403b48ee45a6bb091615ad inherit pub_methods_classdriver__obs__gsm"><td class="memItemLeft" align="right" valign="top">virtual int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdriver__obs__gsm.html#a07a4397cb1403b48ee45a6bb091615ad">get</a> (<a class="el" href="classdata__obs__scalar.html">data_obs_scalar</a> *data)</td></tr>
 <tr class="separator:a07a4397cb1403b48ee45a6bb091615ad inherit pub_methods_classdriver__obs__gsm"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a683a581d16e390495a8c79f7500bfa8f inherit pub_methods_classdriver__obs__gsm"><td class="memItemLeft" align="right" valign="top">virtual int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdriver__obs__gsm.html#a683a581d16e390495a8c79f7500bfa8f">run</a> (double freq_in)</td></tr>
-<tr class="separator:a683a581d16e390495a8c79f7500bfa8f inherit pub_methods_classdriver__obs__gsm"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:abaca6e42c6070a71d2c368e45dab58df inherit pub_methods_classdriver__obs__gsm"><td class="memItemLeft" align="right" valign="top">virtual int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdriver__obs__gsm.html#abaca6e42c6070a71d2c368e45dab58df">stop</a> ()</td></tr>
 <tr class="separator:abaca6e42c6070a71d2c368e45dab58df inherit pub_methods_classdriver__obs__gsm"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
@@ -247,6 +239,35 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>set_term</b> ()</td></
 
 <p>Reimplemented from <a class="el" href="classdriver__obs__gsm.html#a70ea84c41476132eda0dbf2d292e57dd">driver_obs_gsm</a>.</p>
 
+</div>
+</div>
+<a id="af95f3de241ccc9d1810bfbd8e26f936d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#af95f3de241ccc9d1810bfbd8e26f936d">&#9670;&nbsp;</a></span>run()</h2>
+
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+  <tr>
+  <td class="mlabels-left">
+      <table class="memname">
+        <tr>
+          <td class="memname">int driver_obs_gsm90::run </td>
+          <td>(</td>
+          <td class="paramtype">double&#160;</td>
+          <td class="paramname"><em>freq</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+  </td>
+  <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">virtual</span></span>  </td>
+  </tr>
+</table>
+</div><div class="memdoc">
+<p>Triggered run mode </p>
+
+<p>Reimplemented from <a class="el" href="classdriver__obs__gsm.html#a683a581d16e390495a8c79f7500bfa8f">driver_obs_gsm</a>.</p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following files:<ul>

DOC/html/classdriver__obs__gsm90__coll__graph.map

-<map id="driver_obs_gsm90" name="driver_obs_gsm90">
-<area shape="rect" id="node2" href="$classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="67,247,181,273"/>
-<area shape="rect" id="node3" href="$classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="60,171,188,197"/>
-<area shape="rect" id="node4" href="$classdriver__obs.html" title="driver_obs" alt="" coords="83,95,165,121"/>
-<area shape="rect" id="node5" href="$classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node6" href="$classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
-</map>

DOC/html/classdriver__obs__gsm90__inherit__graph.map

-<map id="driver_obs_gsm90" name="driver_obs_gsm90">
-<area shape="rect" id="node2" href="$classdriver__obs__gsm.html" title="driver_obs_gsm" alt="" coords="12,155,127,181"/>
-<area shape="rect" id="node3" href="$classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="5,80,133,107"/>
-<area shape="rect" id="node4" href="$classdriver__obs.html" title="driver_obs" alt="" coords="28,5,111,32"/>
-</map>

DOC/html/classdriver__obs__gsm__coll__graph.map

-<map id="driver_obs_gsm" name="driver_obs_gsm">
-<area shape="rect" id="node2" href="$classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="60,171,188,197"/>
-<area shape="rect" id="node3" href="$classdriver__obs.html" title="driver_obs" alt="" coords="83,95,165,121"/>
-<area shape="rect" id="node4" href="$classObs__Calibration.html" title="Obs_Calibration" alt="" coords="5,5,120,32"/>
-<area shape="rect" id="node5" href="$classbuffer__obs.html" title="buffer_obs" alt="" coords="144,5,227,32"/>
-</map>

DOC/html/classdriver__obs__gsm__inherit__graph.map

-<map id="driver_obs_gsm" name="driver_obs_gsm">
-<area shape="rect" id="node4" href="$classdriver__obs__gsm19.html" title="driver_obs_gsm19" alt="" coords="5,229,133,256"/>
-<area shape="rect" id="node5" href="$classdriver__obs__gsm90.html" title="driver_obs_gsm90" alt="" coords="157,229,285,256"/>
-<area shape="rect" id="node2" href="$classDriver__Obs__Serial.html" title="Driver_Obs_Serial" alt="" coords="81,80,209,107"/>
-<area shape="rect" id="node3" href="$classdriver__obs.html" title="driver_obs" alt="" coords="104,5,187,32"/>
-</map>