Changeset 1137

Timestamp:

Nov 6, 2013 3:16:07 PM (8 years ago)

Author:

vondreele

Message:

allow a 'None' for image calibrant to facilitate fitting single rings
fix an atom hard reference to use atm pointer

Location:

trunk

Files:

• GSASIIstrIO.py (modified) (1 diff)
• ImageCalibrants.py (modified) (1 diff)
• imports/G2sfact.py (modified) (1 diff)

trunk/GSASIIstrIO.py

@@ -964 +964 @@
                                     G2mv.StoreEquivalence(name,(eqv,))
                     if 'U' in at[ct+1]:
-                        if at[9] == 'I':
+                        if at[cia] == 'I':
                             phaseVary.append(pfx+'AUiso:'+str(i))
                         else:

trunk/ImageCalibrants.py

@@ -34 +34 @@
 """
 Calibrants={
-'':([0,],[(0,0,0,0,0,0),],0,(0,0,0)),
+'None':([0,],[(0,0,0,0,0,0),],0,(1.0,10,10)),
 'LaB6  SRM660a':([2,],[(4.1569162,4.1569162,4.1569162,90,90,90),],0,(1.0,10,10)),
 'LaB6  SRM660a skip 1':([2,],[(4.1569162,4.1569162,4.1569162,90,90,90),],1,(1.0,10,10)),

trunk/imports/G2sfact.py

@@ -115 +115 @@
             traceback.print_exc(file=sys.stdout)
             return False
+