Changeset 1123 for branches/sandbox


Ignore:
Timestamp:
Mar 23, 2011 5:20:58 PM (10 years ago)
Author:
toby
Message:

resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/rb.tcl

    r1119 r1123  
    655655# Rigid body utility routines
    656656#============================================================================
    657 <<<<<<< .mine
    658657# RigidBodyGetVarNums: Returns a list of the variable numbers in use
    659658#       for rigid body variable parameters.
     
    679678# RigidBodyGetVarNums: Returns a list of the variable numbers used already
    680679# for rigid body variable parameters
    681 =======
    682 # RigidBodyGetVarNums: Returns a list of the variable numbers in use
    683 #       for rigid body variable parameters.
    684 # RigidBodyAtomNums: returns a list of atom numbers that are mapped to
    685 #       rigid bodies in a selected phase
    686 # RigidStartAtoms: returns a list of atoms that are allowed for creation of RB
    687 # ExtractRigidBody: Use the GSAS geometry program to cartesian coordinates &
    688 #       setting info for a RB from fractional coordinates for atoms in a phase
    689 # RunRecalcRBCoords: updates the coordinates in all phases after changes have
    690 #       been made to rigid parameters.
    691 # CalcBody: Convert ortho to fractional coordinates using RB parameters
    692 # FitBody: Optimize the origin and Euler angles to match a rigid body to a
    693 #       set of fractional coordinates
    694 # zmat2coord: convert a z-matrix to a set of cartesian coordinates
    695 # RB2cart: convert the representation used for rigid bodies into
    696 #       cartesian coordinates
    697 # PlotRBtype: plot a rigid body with DRAWxtl
    698 # PlotRBcoords: plot orthogonal coordinates with DRAWxtl
    699 # DRAWxtlPlotRBFit: plot a set of fraction coordinates superimposed
    700 #       on a structure read from a phase with DRAWxtl
    701 #============================================================================
    702 #============================================================================
    703 # RigidBodyGetVarNums: Returns a list of the variable numbers used already
    704 # for rigid body variable parameters
    705 >>>>>>> .r1117
    706680proc RigidBodyGetVarNums {} {
    707681    set varlist {}
Note: See TracChangeset for help on using the changeset viewer.