Changeset 1123 for branches

Timestamp:

Mar 23, 2011 5:20:58 PM (13 years ago)

Author:

toby

Message:

resolve conflict

File:

• branches/sandbox/rb.tcl (modified) (2 diffs)

branches/sandbox/rb.tcl

@@ -655 +655 @@
 # Rigid body utility routines
 #============================================================================
-<<<<<<< .mine
 # RigidBodyGetVarNums: Returns a list of the variable numbers in use 
 #       for rigid body variable parameters. 
@@ -679 +678 @@
 # RigidBodyGetVarNums: Returns a list of the variable numbers used already 
 # for rigid body variable parameters
-=======
-# RigidBodyGetVarNums: Returns a list of the variable numbers in use 
-#       for rigid body variable parameters. 
-# RigidBodyAtomNums: returns a list of atom numbers that are mapped to 
-#       rigid bodies in a selected phase
-# RigidStartAtoms: returns a list of atoms that are allowed for creation of RB
-# ExtractRigidBody: Use the GSAS geometry program to cartesian coordinates & 
-#       setting info for a RB from fractional coordinates for atoms in a phase
-# RunRecalcRBCoords: updates the coordinates in all phases after changes have 
-#       been made to rigid parameters.
-# CalcBody: Convert ortho to fractional coordinates using RB parameters
-# FitBody: Optimize the origin and Euler angles to match a rigid body to a 
-#       set of fractional coordinates
-# zmat2coord: convert a z-matrix to a set of cartesian coordinates
-# RB2cart: convert the representation used for rigid bodies into 
-#       cartesian coordinates
-# PlotRBtype: plot a rigid body with DRAWxtl
-# PlotRBcoords: plot orthogonal coordinates with DRAWxtl
-# DRAWxtlPlotRBFit: plot a set of fraction coordinates superimposed 
-#       on a structure read from a phase with DRAWxtl
-#============================================================================
-#============================================================================
-# RigidBodyGetVarNums: Returns a list of the variable numbers used already 
-# for rigid body variable parameters
->>>>>>> .r1117
 proc RigidBodyGetVarNums {} {
     set varlist {}