deploy: f976fa5

dgbowl · Apr 6, 2024 · 5ad1100 · 5ad1100
1 parent 6183a38
commit 5ad1100
Show file tree

Hide file tree

Showing 15 changed files with 219 additions and 13 deletions.
diff --git a/master/.doctrees/apidoc/yadg.extractors.ezchrom.doctree b/master/.doctrees/apidoc/yadg.extractors.ezchrom.doctree
diff --git a/master/.doctrees/environment.pickle b/master/.doctrees/environment.pickle
diff --git a/master/.doctrees/version.5_1.doctree b/master/.doctrees/version.5_1.doctree
diff --git a/master/.doctrees/version.doctree b/master/.doctrees/version.doctree
diff --git a/master/_sources/apidoc/yadg.extractors.ezchrom.rst.txt b/master/_sources/apidoc/yadg.extractors.ezchrom.rst.txt
@@ -12,3 +12,9 @@
    :members:
    :undoc-members:
    :show-inheritance:
+
+
+.. automodule:: yadg.extractors.ezchrom.dat
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/master/_sources/version.5_1.rst.txt b/master/_sources/version.5_1.rst.txt
@@ -18,12 +18,19 @@ New features since ``yadg-5.0`` are:
     - ``Fig8_*cm.s1p`` from https://zenodo.org/doi/10.5281/zenodo.10222705
     - ``VNA_radial_middle.s*p`` from https://zenodo.org/doi/10.5281/zenodo.7339709
 
+  - Support for EZChrom ``.dat`` files using the :mod:`yadg.extractors.ezchrom.dat` extractor. Test files were provided by Z. Asahi from FU Berlin, and J. Schumann from HU Berlin. The data extracted from the ``.dat`` files is cross-checked against the data obtained from ``.asc`` files using the :mod:`yadg.extractors.ezchrom.asc` extractor.
 
 Other changes in ``yadg-5.1`` are:
 
   - The dataschema has been simplified, eliminating parsers in favour of extractors.
   - The code has been reorganised to highlight the extractor functionality in favour of parsers.
 
+Bug fixes in ``yadg-5.1`` include:
+
+  - Fixed incorrect unit assignment when ``/`` was substituted to ``_`` in column names.
+  - Fixed incorrect annotation of ancillary variables: ``standard error`` should be ``standard_error``.
+  - Fixed incorrect parsing of units in the :mod:`yadg.extractors.ezchrom.asc` parser. Now, the ``25 μV`` unit will be correctly replaced by just ``μV`` (without modifying data), which can be understood by :mod:`pint`.
+
 
 .. _concat_lab: https://tu.berlin/en/concat
 

diff --git a/master/apidoc/yadg.extractors.ezchrom.html b/master/apidoc/yadg.extractors.ezchrom.html
diff --git a/master/apidoc/yadg.extractors.html b/master/apidoc/yadg.extractors.html
@@ -337,6 +337,7 @@ <h2>Subpackages<a class="headerlink" href="#subpackages" title="Link to this hea
 <li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#usage">Usage</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc"><code class="docutils literal notranslate"><span class="pre">EZChrom_asc</span></code></a><ul>
 <li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc.filetype"><code class="docutils literal notranslate"><span class="pre">EZChrom_asc.filetype</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc.encoding"><code class="docutils literal notranslate"><span class="pre">EZChrom_asc.encoding</span></code></a></li>
 </ul>
 </li>
 </ul>
@@ -345,6 +346,18 @@ <h2>Subpackages<a class="headerlink" href="#subpackages" title="Link to this hea
 <li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#metadata">Metadata</a></li>
 <li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#uncertainties">Uncertainties</a></li>
 <li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#yadg.extractors.ezchrom.asc.extract"><code class="docutils literal notranslate"><span class="pre">extract()</span></code></a></li>
+<li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#id1">Usage</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_dat"><code class="docutils literal notranslate"><span class="pre">EZChrom_dat</span></code></a><ul>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_dat.filetype"><code class="docutils literal notranslate"><span class="pre">EZChrom_dat.filetype</span></code></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#id2">Schema</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#id3">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#notes-on-file-structure">Notes on file structure</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#id4">Uncertainties</a></li>
+<li class="toctree-l2"><a class="reference internal" href="yadg.extractors.ezchrom.html#yadg.extractors.ezchrom.dat.extract"><code class="docutils literal notranslate"><span class="pre">extract()</span></code></a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="yadg.extractors.fhimcpt.html"><strong>fhimcpt</strong>: For MCPT set-up at FHI</a><ul>

diff --git a/master/apidoc/yadg.html b/master/apidoc/yadg.html
@@ -257,6 +257,12 @@ <h2>Subpackages<a class="headerlink" href="#subpackages" title="Link to this hea
 <li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#metadata">Metadata</a></li>
 <li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#uncertainties">Uncertainties</a></li>
 <li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#yadg.extractors.ezchrom.asc.extract"><code class="docutils literal notranslate"><span class="pre">extract()</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#id1">Usage</a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#id2">Schema</a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#id3">Metadata</a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#notes-on-file-structure">Notes on file structure</a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#id4">Uncertainties</a></li>
+<li class="toctree-l4"><a class="reference internal" href="yadg.extractors.ezchrom.html#yadg.extractors.ezchrom.dat.extract"><code class="docutils literal notranslate"><span class="pre">extract()</span></code></a></li>
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="yadg.extractors.fhimcpt.html"><strong>fhimcpt</strong>: For MCPT set-up at FHI</a><ul>

diff --git a/master/genindex.html b/master/genindex.html
@@ -211,6 +211,8 @@ <h2 id="E">E</h2>
 
       <ul>
         <li><a href="apidoc/yadg.extractors.eclab.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EClab_mpt.encoding">(dgbowl_schemas.yadg.dataschema_5_1.filetype.EClab_mpt attribute)</a>
+</li>
+        <li><a href="apidoc/yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc.encoding">(dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc attribute)</a>
 </li>
       </ul></li>
       <li><a href="apidoc/yadg.extractors.panalytical.html#yadg.extractors.panalytical.xrdml.etree_to_dict">etree_to_dict() (in module yadg.extractors.panalytical.xrdml)</a>
@@ -243,6 +245,8 @@ <h2 id="E">E</h2>
         <li><a href="apidoc/yadg.extractors.example.html#yadg.extractors.example.extract">(in module yadg.extractors.example)</a>
 </li>
         <li><a href="apidoc/yadg.extractors.ezchrom.html#yadg.extractors.ezchrom.asc.extract">(in module yadg.extractors.ezchrom.asc)</a>
+</li>
+        <li><a href="apidoc/yadg.extractors.ezchrom.html#yadg.extractors.ezchrom.dat.extract">(in module yadg.extractors.ezchrom.dat)</a>
 </li>
         <li><a href="apidoc/yadg.extractors.fhimcpt.html#yadg.extractors.fhimcpt.csv.extract">(in module yadg.extractors.fhimcpt.csv)</a>
 </li>
@@ -301,6 +305,8 @@ <h2 id="F">F</h2>
         <li><a href="apidoc/yadg.extractors.example.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.Example.filetype">(dgbowl_schemas.yadg.dataschema_5_1.filetype.Example attribute)</a>
 </li>
         <li><a href="apidoc/yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc.filetype">(dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_asc attribute)</a>
+</li>
+        <li><a href="apidoc/yadg.extractors.ezchrom.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_dat.filetype">(dgbowl_schemas.yadg.dataschema_5_1.filetype.EZChrom_dat attribute)</a>
 </li>
         <li><a href="apidoc/yadg.extractors.fhimcpt.html#dgbowl_schemas.yadg.dataschema_5_1.filetype.FHI_csv.filetype">(dgbowl_schemas.yadg.dataschema_5_1.filetype.FHI_csv attribute)</a>
 </li>
@@ -456,6 +462,8 @@ <h2 id="M">M</h2>
         <li><a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom">yadg.extractors.ezchrom</a>
 </li>
         <li><a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc">yadg.extractors.ezchrom.asc</a>
+</li>
+        <li><a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.dat">yadg.extractors.ezchrom.dat</a>
 </li>
         <li><a href="apidoc/yadg.extractors.fhimcpt.html#module-yadg.extractors.fhimcpt">yadg.extractors.fhimcpt</a>
 </li>
@@ -904,15 +912,15 @@ <h2 id="Y">Y</h2>
         <li><a href="apidoc/yadg.extractors.eclab.html#module-yadg.extractors.eclab.mpt">module</a>
 </li>
       </ul></li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li>
     yadg.extractors.empalc
 
       <ul>
         <li><a href="apidoc/yadg.extractors.empalc.html#module-yadg.extractors.empalc">module</a>
 </li>
       </ul></li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li>
     yadg.extractors.empalc.csv
 
@@ -946,6 +954,13 @@ <h2 id="Y">Y</h2>
 
       <ul>
         <li><a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc">module</a>
+</li>
+      </ul></li>
+      <li>
+    yadg.extractors.ezchrom.dat
+
+      <ul>
+        <li><a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.dat">module</a>
 </li>
       </ul></li>
       <li>

diff --git a/master/objects.inv b/master/objects.inv
diff --git a/master/py-modindex.html b/master/py-modindex.html
@@ -286,6 +286,11 @@ <h1>Python Module Index</h1>
        <td>&#160;&#160;&#160;
        <a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc"><code class="xref">yadg.extractors.ezchrom.asc</code></a></td><td>
        <em></em></td></tr>
+     <tr class="cg-1">
+       <td></td>
+       <td>&#160;&#160;&#160;
+       <a href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.dat"><code class="xref">yadg.extractors.ezchrom.dat</code></a></td><td>
+       <em></em></td></tr>
      <tr class="cg-1">
        <td></td>
        <td>&#160;&#160;&#160;

diff --git a/master/searchindex.js b/master/searchindex.js
diff --git a/master/version.5_1.html b/master/version.5_1.html
@@ -118,6 +118,7 @@ <h1><strong>yadg</strong> version 5.1<a class="headerlink" href="#yadg-version-5
 - <code class="docutils literal notranslate"><span class="pre">CABLE_3_5MM_1N_TYPE_CONNECTORS.S2P</span></code> from <a class="reference external" href="https://zenodo.org/doi/10.5281/zenodo.10016477">https://zenodo.org/doi/10.5281/zenodo.10016477</a>
 - <code class="docutils literal notranslate"><span class="pre">Fig8_*cm.s1p</span></code> from <a class="reference external" href="https://zenodo.org/doi/10.5281/zenodo.10222705">https://zenodo.org/doi/10.5281/zenodo.10222705</a>
 - <code class="docutils literal notranslate"><span class="pre">VNA_radial_middle.s*p</span></code> from <a class="reference external" href="https://zenodo.org/doi/10.5281/zenodo.7339709">https://zenodo.org/doi/10.5281/zenodo.7339709</a></p></li>
+<li><p>Support for EZChrom <code class="docutils literal notranslate"><span class="pre">.dat</span></code> files using the <a class="reference internal" href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.dat" title="yadg.extractors.ezchrom.dat"><code class="xref py py-mod docutils literal notranslate"><span class="pre">yadg.extractors.ezchrom.dat</span></code></a> extractor. Test files were provided by Z. Asahi from FU Berlin, and J. Schumann from HU Berlin. The data extracted from the <code class="docutils literal notranslate"><span class="pre">.dat</span></code> files is cross-checked against the data obtained from <code class="docutils literal notranslate"><span class="pre">.asc</span></code> files using the <a class="reference internal" href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc" title="yadg.extractors.ezchrom.asc"><code class="xref py py-mod docutils literal notranslate"><span class="pre">yadg.extractors.ezchrom.asc</span></code></a> extractor.</p></li>
 </ul>
 </div></blockquote>
 <p>Other changes in <code class="docutils literal notranslate"><span class="pre">yadg-5.1</span></code> are:</p>
@@ -127,6 +128,14 @@ <h1><strong>yadg</strong> version 5.1<a class="headerlink" href="#yadg-version-5
 <li><p>The code has been reorganised to highlight the extractor functionality in favour of parsers.</p></li>
 </ul>
 </div></blockquote>
+<p>Bug fixes in <code class="docutils literal notranslate"><span class="pre">yadg-5.1</span></code> include:</p>
+<blockquote>
+<div><ul class="simple">
+<li><p>Fixed incorrect unit assignment when <code class="docutils literal notranslate"><span class="pre">/</span></code> was substituted to <code class="docutils literal notranslate"><span class="pre">_</span></code> in column names.</p></li>
+<li><p>Fixed incorrect annotation of ancillary variables: <code class="docutils literal notranslate"><span class="pre">standard</span> <span class="pre">error</span></code> should be <code class="docutils literal notranslate"><span class="pre">standard_error</span></code>.</p></li>
+<li><p>Fixed incorrect parsing of units in the <a class="reference internal" href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc" title="yadg.extractors.ezchrom.asc"><code class="xref py py-mod docutils literal notranslate"><span class="pre">yadg.extractors.ezchrom.asc</span></code></a> parser. Now, the <code class="docutils literal notranslate"><span class="pre">25</span> <span class="pre">μV</span></code> unit will be correctly replaced by just <code class="docutils literal notranslate"><span class="pre">μV</span></code> (without modifying data), which can be understood by <code class="xref py py-mod docutils literal notranslate"><span class="pre">pint</span></code>.</p></li>
+</ul>
+</div></blockquote>
 </section>
 
 

diff --git a/master/version.html b/master/version.html
@@ -130,6 +130,7 @@ <h2><strong>yadg</strong> version 5.1<a class="headerlink" href="#yadg-version-5
 - <code class="docutils literal notranslate"><span class="pre">CABLE_3_5MM_1N_TYPE_CONNECTORS.S2P</span></code> from <a class="reference external" href="https://zenodo.org/doi/10.5281/zenodo.10016477">https://zenodo.org/doi/10.5281/zenodo.10016477</a>
 - <code class="docutils literal notranslate"><span class="pre">Fig8_*cm.s1p</span></code> from <a class="reference external" href="https://zenodo.org/doi/10.5281/zenodo.10222705">https://zenodo.org/doi/10.5281/zenodo.10222705</a>
 - <code class="docutils literal notranslate"><span class="pre">VNA_radial_middle.s*p</span></code> from <a class="reference external" href="https://zenodo.org/doi/10.5281/zenodo.7339709">https://zenodo.org/doi/10.5281/zenodo.7339709</a></p></li>
+<li><p>Support for EZChrom <code class="docutils literal notranslate"><span class="pre">.dat</span></code> files using the <a class="reference internal" href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.dat" title="yadg.extractors.ezchrom.dat"><code class="xref py py-mod docutils literal notranslate"><span class="pre">yadg.extractors.ezchrom.dat</span></code></a> extractor. Test files were provided by Z. Asahi from FU Berlin, and J. Schumann from HU Berlin. The data extracted from the <code class="docutils literal notranslate"><span class="pre">.dat</span></code> files is cross-checked against the data obtained from <code class="docutils literal notranslate"><span class="pre">.asc</span></code> files using the <a class="reference internal" href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc" title="yadg.extractors.ezchrom.asc"><code class="xref py py-mod docutils literal notranslate"><span class="pre">yadg.extractors.ezchrom.asc</span></code></a> extractor.</p></li>
 </ul>
 </div></blockquote>
 <p>Other changes in <code class="docutils literal notranslate"><span class="pre">yadg-5.1</span></code> are:</p>
@@ -139,6 +140,14 @@ <h2><strong>yadg</strong> version 5.1<a class="headerlink" href="#yadg-version-5
 <li><p>The code has been reorganised to highlight the extractor functionality in favour of parsers.</p></li>
 </ul>
 </div></blockquote>
+<p>Bug fixes in <code class="docutils literal notranslate"><span class="pre">yadg-5.1</span></code> include:</p>
+<blockquote>
+<div><ul class="simple">
+<li><p>Fixed incorrect unit assignment when <code class="docutils literal notranslate"><span class="pre">/</span></code> was substituted to <code class="docutils literal notranslate"><span class="pre">_</span></code> in column names.</p></li>
+<li><p>Fixed incorrect annotation of ancillary variables: <code class="docutils literal notranslate"><span class="pre">standard</span> <span class="pre">error</span></code> should be <code class="docutils literal notranslate"><span class="pre">standard_error</span></code>.</p></li>
+<li><p>Fixed incorrect parsing of units in the <a class="reference internal" href="apidoc/yadg.extractors.ezchrom.html#module-yadg.extractors.ezchrom.asc" title="yadg.extractors.ezchrom.asc"><code class="xref py py-mod docutils literal notranslate"><span class="pre">yadg.extractors.ezchrom.asc</span></code></a> parser. Now, the <code class="docutils literal notranslate"><span class="pre">25</span> <span class="pre">μV</span></code> unit will be correctly replaced by just <code class="docutils literal notranslate"><span class="pre">μV</span></code> (without modifying data), which can be understood by <code class="xref py py-mod docutils literal notranslate"><span class="pre">pint</span></code>.</p></li>
+</ul>
+</div></blockquote>
 </section>
 <section id="yadg-version-5-0">
 <h2><strong>yadg</strong> version 5.0<a class="headerlink" href="#yadg-version-5-0" title="Link to this heading"></a></h2>