Deploying to gh-pages from @ c5ad13c 🚀

Author: wvangoet

_modules/omc3/model/accelerators/accelerator.html

@@ -411,7 +411,10 @@ <h1>Source code for omc3.model.accelerators.accelerator</h1><div class="highligh
             <span class="n">bpm_mask</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">elements</span><span class="o">.</span><span class="n">index</span><span class="o">.</span><span class="n">str</span><span class="o">.</span><span class="n">match</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">RE_DICT</span><span class="p">[</span><span class="n">AccElementTypes</span><span class="o">.</span><span class="n">BPMS</span><span class="p">])</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">model</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">elements</span><span class="o">.</span><span class="n">loc</span><span class="p">[</span><span class="n">bpm_mask</span><span class="p">,</span> <span class="p">:]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">nat_tunes</span> <span class="o">=</span> <span class="p">[</span><span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="o">.</span><span class="n">headers</span><span class="p">[</span><span class="s2">&quot;Q1&quot;</span><span class="p">]),</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="o">.</span><span class="n">headers</span><span class="p">[</span><span class="s2">&quot;Q2&quot;</span><span class="p">])]</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">energy</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="o">.</span><span class="n">headers</span><span class="p">[</span><span class="s2">&quot;ENERGY&quot;</span><span class="p">])</span>  <span class="c1"># always 450GeV because we do not set it anywhere properly...</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">energy</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="o">.</span><span class="n">headers</span><span class="p">[</span><span class="s2">&quot;ENERGY&quot;</span><span class="p">])</span>  <span class="c1"># always 450GeV because we do not set it anywhere properly...</span>
+        <span class="k">except</span> <span class="ne">KeyError</span><span class="p">:</span> <span class="c1">#KEK model does not have energy in the header</span>
+            <span class="k">pass</span>
 
         <span class="c1"># Excitations #####################################</span>
         <span class="n">driven_filenames</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">(</span><span class="n">acd</span><span class="o">=</span><span class="n">model_dir</span> <span class="o">/</span> <span class="n">TWISS_AC_DAT</span><span class="p">,</span> <span class="n">adt</span><span class="o">=</span><span class="n">model_dir</span> <span class="o">/</span> <span class="n">TWISS_ADT_DAT</span><span class="p">)</span>

_modules/omc3/model/accelerators/skekb.html

@@ -286,7 +286,8 @@ <h1>Source code for omc3.model.accelerators.skekb</h1><div class="highlight"><pr
 <span class="kn">from</span><span class="w"> </span><span class="nn">generic_parser</span><span class="w"> </span><span class="kn">import</span> <span class="n">EntryPoint</span>
 
 <span class="kn">from</span><span class="w"> </span><span class="nn">omc3.model.accelerators.accelerator</span><span class="w"> </span><span class="kn">import</span> <span class="p">(</span><span class="n">Accelerator</span><span class="p">,</span>
-                                                 <span class="n">AcceleratorDefinitionError</span><span class="p">)</span>
+                                                 <span class="n">AcceleratorDefinitionError</span><span class="p">,</span>
+                                                 <span class="n">AccElementTypes</span><span class="p">)</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">omc3.utils</span><span class="w"> </span><span class="kn">import</span> <span class="n">logging_tools</span>
 
 <span class="n">LOGGER</span> <span class="o">=</span> <span class="n">logging_tools</span><span class="o">.</span><span class="n">get_logger</span><span class="p">(</span><span class="vm">__name__</span><span class="p">)</span>
@@ -298,6 +299,11 @@ <h1>Source code for omc3.model.accelerators.skekb</h1><div class="highlight"><pr
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;KEK&#39;s SuperKEKB accelerator.&quot;&quot;&quot;</span>
     <span class="n">NAME</span> <span class="o">=</span> <span class="s2">&quot;skekb&quot;</span>
     <span class="n">RINGS</span> <span class="o">=</span> <span class="p">(</span><span class="s2">&quot;ler&quot;</span><span class="p">,</span> <span class="s2">&quot;her&quot;</span><span class="p">)</span>
+    <span class="n">RE_DICT</span><span class="p">:</span> <span class="nb">dict</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="nb">str</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span>
+        <span class="n">AccElementTypes</span><span class="o">.</span><span class="n">BPMS</span><span class="p">:</span> <span class="sa">r</span><span class="s2">&quot;^M*&quot;</span><span class="p">,</span>
+        <span class="n">AccElementTypes</span><span class="o">.</span><span class="n">MAGNETS</span><span class="p">:</span> <span class="sa">r</span><span class="s2">&quot;.*&quot;</span><span class="p">,</span>  
+        <span class="n">AccElementTypes</span><span class="o">.</span><span class="n">ARC_BPMS</span><span class="p">:</span> <span class="sa">r</span><span class="s2">&quot;^M*&quot;</span><span class="p">,</span>
+    <span class="p">}</span>
 
     <span class="nd">@classmethod</span>
     <span class="k">def</span><span class="w"> </span><span class="nf">get_parameters</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>