Skip to content

Commit

Permalink
Fix UB matrix calculation warning messages
Browse files Browse the repository at this point in the history
  • Loading branch information
isikhar committed Jun 7, 2018
1 parent 473b421 commit ab85c16
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions diffcalc/ub/calc.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,16 @@ def _set_lattice(self, name, a, b, c, alpha, beta, gamma):
# Clear U and UB if these exist
if self._U is not None: # (UB will also exist)
print "Warning: the old UB calculation has been cleared."
print " Use 'calcub' to recalculate with old reflections."
print " Use 'calcub' to recalculate with old reflections or"
print " 'orientub' to recalculate with old orientations."

### Surface normal stuff ###

def _gettau(self):
"""
Returns tau (in degrees): the (minus) ammount of phi axis rotation ,
that together with some chi axis rotation (minus sigma) brings the
optical surface normal parallelto the omega axis.
optical surface normal parallel to the omega axis.
"""
return self._state.tau

Expand Down Expand Up @@ -532,7 +533,7 @@ def _autocalculateOrientationUbAndReport(self):
"been specified.")
elif not self._state.is_okay_to_autocalculate_ub:
print ("Not calculating UB matrix as it has been manually set. "
"Use 'calcub' to explicitly recalculate it.")
"Use 'orientub' to explicitly recalculate it.")
else: # okay to autocalculate
if self._UB is None:
print "Calculating UB matrix."
Expand Down

0 comments on commit ab85c16

Please sign in to comment.