Add changes for fcab162

_modules/kai/reduce/analysis.html

@@ -143,6 +143,7 @@ <h1>Source code for kai.reduce.analysis</h1><div class="highlight"><pre>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">starlist</span> <span class="o">=</span> <span class="n">rootDir</span> <span class="o">+</span> <span class="s1">&#39;source_list/psf_central.dat&#39;</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">labellist</span> <span class="o">=</span> <span class="n">rootDir</span><span class="o">+</span> <span class="s1">&#39;source_list/label.dat&#39;</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">labellist_accel</span> <span class="o">=</span> <span class="kc">True</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">orbitlist</span> <span class="o">=</span> <span class="n">rootDir</span><span class="o">+</span> <span class="s1">&#39;source_list/orbits.dat&#39;</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">calFile</span> <span class="o">=</span> <span class="n">rootDir</span> <span class="o">+</span> <span class="s1">&#39;source_list/photo_calib.dat&#39;</span>
 
@@ -793,10 +794,16 @@ <h1>Source code for kai.reduce.analysis</h1><div class="highlight"><pre>
 
             <span class="c1"># Make a named/labeled version</span>
             <span class="n">cmd</span> <span class="o">=</span> <span class="s1">&#39;java -Xmx1024m align </span><span class="si">%s</span><span class="s1"> &#39;</span> <span class="o">%</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">alignFlags</span><span class="p">)</span>
-            <span class="c1">#cmd += &#39;-N %s &#39; % self.labellist</span>
-            <span class="n">cmd</span> <span class="o">+=</span> <span class="s1">&#39;-accel_file </span><span class="si">%s</span><span class="s1"> &#39;</span> <span class="o">%</span> <span class="bp">self</span><span class="o">.</span><span class="n">labellist</span>
+
+            <span class="c1"># Support label.dat files with or without accelerations.</span>
+            <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">labellist_accel</span><span class="p">:</span>
+                <span class="n">cmd</span> <span class="o">+=</span> <span class="s1">&#39;-accel_file </span><span class="si">%s</span><span class="s1"> &#39;</span> <span class="o">%</span> <span class="bp">self</span><span class="o">.</span><span class="n">labellist</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="n">cmd</span> <span class="o">+=</span> <span class="s1">&#39;-N </span><span class="si">%s</span><span class="s1"> &#39;</span> <span class="o">%</span> <span class="bp">self</span><span class="o">.</span><span class="n">labellist</span>
+
             <span class="k">if</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">orbitlist</span> <span class="o">!=</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">and</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">orbitlist</span> <span class="o">!=</span> <span class="s1">&#39;&#39;</span><span class="p">):</span>
                 <span class="n">cmd</span> <span class="o">+=</span> <span class="s1">&#39;-o </span><span class="si">%s</span><span class="s1"> &#39;</span> <span class="o">%</span> <span class="bp">self</span><span class="o">.</span><span class="n">orbitlist</span>
+
             <span class="n">cmd</span> <span class="o">+=</span> <span class="s1">&#39;-r align</span><span class="si">%s%s</span><span class="s1">_</span><span class="si">%3.1f</span><span class="s1">_named &#39;</span> <span class="o">%</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">imgSuffix</span><span class="p">,</span> <span class="n">file_ext</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">corrMain</span><span class="p">)</span>
             <span class="n">cmd</span> <span class="o">+=</span> <span class="n">alnList2</span>
             <span class="nb">print</span><span class="p">(</span><span class="n">cmd</span><span class="p">)</span>