Changeset 1939

Timestamp:

Jul 21, 2015 10:11:25 AM (7 years ago)

Author:

vondreele

Message:

change atom naming conventions - remove '()' and H atoms are numbered from attachment atom.

File:

• trunk/GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIphsGUI.py

@@ -1592 +1592 @@
                     Neigh.append(neigh)
             if Neigh:
+                letters = ['A','B','C']
                 HydIds = {}
                 mapError = False
@@ -1607 +1608 @@
                         Hxyz,HU = G2mth.AddHydrogens(AtLookUp,generalData,atomData,AddHydIds[ineigh])
                         for iX,X in enumerate(Hxyz):
-                            AtomInsert(loc+iX,X[0],X[1],X[2],'H','H(%d)'%(Nat))
+                            AtomInsert(loc+iX,X[0],X[1],X[2],'H','H%s'%(neigh[0][1:]+letters[iX]))
                             data['Atoms'][loc+iX][cia+1] = HU[iX]
                             Id = data['Atoms'][loc+iX][cia+8]
@@ -1613 +1614 @@
                             Nat += 1
                             AtLookUp = G2mth.FillAtomLookUp(atomData,cia+8)
-                            print Id,HydIds[Id]
                 if mapError:
                     G2frame.ErrorDialog('Add H atom error','Adding O-H atoms requires delt-F map')
@@ -1805 +1805 @@
                                 atomData[r][cid] = El
                                 if len(El) in [2,4]:
-                                    atomData[r][cid-1] = El[:2]+'(%d)'%(r+1)
+                                    atomData[r][cid-1] = El[:2]+'%d'%(r+1)
                                 else:
-                                    atomData[r][cid-1] = El[:1]+'(%d)'%(r+1)
+                                    atomData[r][cid-1] = El[:1]+'%d'%(r+1)
                         SetupGeneral()
                         if 'Atoms' in data['Drawing']:
@@ -1825 +1825 @@
                                 El = atomData[r][cid+1]
                                 if len(El) in [2,4]:
-                                    atomData[r][cid] = El[:2]+'(%d)'%(r+1)
+                                    atomData[r][cid] = El[:2]+'%d'%(r+1)
                                 else:
-                                    atomData[r][cid] = El[:1]+'(%d)'%(r+1)
+                                    atomData[r][cid] = El[:1]+'%d'%(r+1)
                     FillAtomsGrid(Atoms)
                 finally: