Skip to content

Commit d3e402b

Browse files
committed
Add relative_length_tolerance and absolute_angle_tolerance_degree to SpaceGroupExplorer::Run() and RunAll().
Small doc correction.
1 parent 74dc2d4 commit d3e402b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

doc/manual/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ modeling initiative at the Brookhaven National Laboratory.
1919

2020
Further developments including the ability to index and refine
2121
powder patterns, solve and display crystal structures, using the
22-
global optimisation and least squares algorithms (see the notebooks
23-
in the examples) are provided by Vincent Favre-Nicolin (ESRF).
22+
global optimisation and least squares algorithms (see the
23+
:doc:`examples/index`) are provided by Vincent Favre-Nicolin (ESRF).
2424

2525
For a complete list of contributors, see
2626
https://github.com/diffpy/pyobjcryst/graphs/contributors.

src/extensions/powderpattern_ext.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,17 @@ void wrap_powderpattern()
342342
//,init<PowderPatternDiffraction *>(bp::arg("powdiff")),with_custodian_and_ward_postcall<1,2>()
343343
class_<SpaceGroupExplorer>("SpaceGroupExplorer", init<PowderPatternDiffraction * >
344344
((bp::arg("powdiff"))) [with_custodian_and_ward<1,2>()])
345-
.def("Run", (SPGScore (SpaceGroupExplorer::*)(const string&, const bool, const bool, const bool, const bool))
345+
.def("Run", (SPGScore (SpaceGroupExplorer::*)(const string&, const bool, const bool, const bool, const bool,
346+
const double, const double))
346347
&SpaceGroupExplorer::Run,
347348
(bp::arg("spg"), bp::arg("fitprofile")=false, bp::arg("verbose")=false,
348-
bp::arg("restore_orig")=false, bp::arg("update_display")=false))
349+
bp::arg("restore_orig")=false, bp::arg("update_display")=false,
350+
bp::arg("relative_length_tolerance")=0.01, bp::arg("absolute_angle_tolerance_degree")=1))
349351
.def("RunAll", &SpaceGroupExplorer::RunAll,
350352
(bp::arg("fitprofile_all")=false, bp::arg("verbose")=true,
351353
bp::arg("keep_best")=true, bp::arg("update_display")=true,
352-
bp::arg("fitprofile_p1")=true))
354+
bp::arg("fitprofile_p1")=true, bp::arg("relative_length_tolerance")=0.01,
355+
bp::arg("absolute_angle_tolerance_degree")=1))
353356
.def("GetScores", &_GetScores)
354357
;
355358

0 commit comments

Comments
 (0)