<div dir="ltr"><div>Hi James, I went with 'cctbx-staging'. Here's what I did:</div><div><br></div>git pull<div>git checkout simtbx_sandbox</div><div>git log # note the hashes for the two commits</div><div>git checkout master</div><div>git checkout -b cctbx-staging<br></div><div>git cherry-pick 728e4daec5b20f15ff67263b85487c212455448b 53b7cf50a5be7f275ce6980171465360ec93b9ab<br></div><div>git push -u origin cctbx-staging<br></div><div><br></div><div>Ready to be tested with Jenkins.</div><div><br></div><div>-Aaron</div><div><br></div><div><br></div><div><br></div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Apr 8, 2018 at 11:38 AM, James Holton <span dir="ltr"><<a href="mailto:jmholton@lbl.gov" target="_blank">jmholton@lbl.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF">
<p>Sounds good to me. Assuming I'm not the only one who would like
to do test Jenkins runs without breaking the master branch,
perhaps cctbx-playground is the branch to use?</p><span class="HOEnZb"><font color="#888888">
<p>-James<br>
</p></font></span><div><div class="h5">
<br>
<div class="m_3757681174255349647moz-cite-prefix">On 4/8/2018 9:13 AM, Aaron Brewster
wrote:<br>
</div>
<blockquote type="cite">
Hi James, I’ve looked at it. The branch still has my test commit
that breaks Windows in it. That’s the demo commit we made to test
Jenkins. I’ll cherry pick your two commits into a new branch later
today. Maybe we can point Jenkins at that branch instead?
<div><br>
<div id="m_3757681174255349647AppleMailSignature">-Aaron</div>
<div><br>
On Apr 7, 2018, at 1:52 PM, James Holton <<a href="mailto:jmholton@lbl.gov" target="_blank">jmholton@lbl.gov</a>>
wrote:<br>
<br>
</div>
<blockquote type="cite">
<div><span>Took most of last week, but I finally got it to
work. tst_nanoBragg_pilatus.py will create a Pilatus-like
image, complete with bad pixels, window panes, thickness
effects, module-to-module misalignment and 0.1 deg of phi
rotation. It takes one optional argument, which is the
image number in a sequence of 3600. I've processed this
simulated data set with xia2 and XDS and found the
anomalous signal has the right sign.</span><br>
<span></span><br>
<span>This required some edits and additions to the simTBX
code as well as FormatCBFMini.as_file() that I think fixed
a beam center consistency bug. Now if you dxtbx.load()
and FormatCBFMiniPilatus.as_file() you get the same beam
center in both input and output headers. I also enhanced
the header to make it look more like the ones in DIALS
regression. A new "SIM.F000" value is now available for
marking the "direct beam" on the image itself.</span><br>
<span></span><br>
<span>I spent most of Friday and all of this morning trying
to follow the check-in procedure we laid out during the
DIALS workshop. Not sure how, but it suddenly started
working just now. I believe I have checked in this code
into the simtbx_sandbox branch of cctbx_project. Is
Jenkins looking at this yet? Is anyone looking at this
yet?</span><br>
<span></span><br>
<span>-James Holton</span><br>
<span>MAD Scientist</span><br>
<span></span><br>
<span></span><br>
<span></span><br>
<span></span><br>
<span></span><br>
<span>______________________________<wbr>_________________</span><br>
<span>cctbxbb mailing list</span><br>
<span><a href="mailto:cctbxbb@phenix-online.org" target="_blank">cctbxbb@phenix-online.org</a></span><br>
<span><a href="http://phenix-online.org/mailman/listinfo/cctbxbb" target="_blank">http://phenix-online.org/<wbr>mailman/listinfo/cctbxbb</a></span><br>
</div>
</blockquote>
</div>
<br>
<fieldset class="m_3757681174255349647mimeAttachmentHeader"></fieldset>
<br>
<pre>______________________________<wbr>_________________
cctbxbb mailing list
<a class="m_3757681174255349647moz-txt-link-abbreviated" href="mailto:cctbxbb@phenix-online.org" target="_blank">cctbxbb@phenix-online.org</a>
<a class="m_3757681174255349647moz-txt-link-freetext" href="http://phenix-online.org/mailman/listinfo/cctbxbb" target="_blank">http://phenix-online.org/<wbr>mailman/listinfo/cctbxbb</a>
</pre>
</blockquote>
<br>
</div></div></div>
<br>______________________________<wbr>_________________<br>
cctbxbb mailing list<br>
<a href="mailto:cctbxbb@phenix-online.org">cctbxbb@phenix-online.org</a><br>
<a href="http://phenix-online.org/mailman/listinfo/cctbxbb" rel="noreferrer" target="_blank">http://phenix-online.org/<wbr>mailman/listinfo/cctbxbb</a><br>
<br></blockquote></div><br></div>