Skip to content

Commit

Permalink
Merge pull request #42 from darrencpagan/master
Browse files Browse the repository at this point in the history
Peak Fitting Improvements
  • Loading branch information
joelvbernier committed May 4, 2016
2 parents e302d82 + 8cd7c90 commit 22503a6
Show file tree
Hide file tree
Showing 7 changed files with 989 additions and 3 deletions.
1 change: 1 addition & 0 deletions hexrd/findorientations.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ def quat_distance(x, y):
return xfcapi.quat_distance(np.array(x, order='C'), np.array(y, order='C'), qsym)

qfib_r = qfib[:, np.array(compl) > min_compl]

num_ors = qfib_r.shape[1]

if num_ors > 25000:
Expand Down
35 changes: 35 additions & 0 deletions hexrd/fitting/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# ============================================================
# Copyright (c) 2012, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory.
# Written by Joel Bernier <bernier2@llnl.gov> and others.
# LLNL-CODE-529294.
# All rights reserved.
#
# This file is part of HEXRD. For details on dowloading the source,
# see the file COPYING.
#
# Please also see the file LICENSE.
#
# This program is free software; you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License (as published by the Free Software
# Foundation) version 2.1 dated February 1999.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the terms and conditions of the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this program (see file LICENSE); if not, write to
# the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
# Boston, MA 02111-1307 USA or visit <http://www.gnu.org/licenses/>.
# ============================================================
"""Functions for peak fitting
"""







Loading

0 comments on commit 22503a6

Please sign in to comment.