Changeset 1387

Timestamp:

Jun 18, 2014 12:08:07 PM (9 years ago)

Author:

vondreele

Message:

fixes to seq display for strain refinements
get sign right on strain calcs

Location:

trunk

Files:

• GSASIIimage.py (modified) (2 diffs)
• GSASIIobj.py (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -948 +948 @@
         th,azm = ring['ImtaObs']
         th0 = np.ones_like(azm)*npasind(wave/(2.*ring['Dset']))
-        V = np.sum(np.sum(E*calcFij(90.,phi,azm,th0).T/1.e6,axis=2),axis=1)
+        V = -np.sum(np.sum(E*calcFij(90.,phi,azm,th0).T/1.e6,axis=2),axis=1)
         if StaType == 'True':
             ring['ImtaCalc'] = np.array([np.exp(V)*ring['Dset'],azm])
@@ -999 +999 @@
         dspo,azm,dsp = xyd
         th = npasind(wave/(2.0*dspo))
-        V = np.sum(np.sum(E*calcFij(90.,phi,azm,th).T/1.e6,axis=2),axis=1)
+        V = -np.sum(np.sum(E*calcFij(90.,phi,azm,th).T/1.e6,axis=2),axis=1)
         if StaType == 'True':
             dspc = dset*np.exp(V)

trunk/GSASIIobj.py

@@ -1132 +1132 @@
 
     if not l[-1]:
-        l[-1] = "(variable needs a definition!)"
+        l[-1] = "(variable needs a definition! Set it in CompileVarDesc)"
 
     if len(l) == 3:         #SASD variable name!
@@ -1309 +1309 @@
         'PkPos': 'Bragg peak position',
         'PkSig': 'Bragg peak sigma',
-        'PkGam': 'Bragg peak gamma',   
+        'PkGam': 'Bragg peak gamma',
+        # strain vars e11, e22, e12
+        'e11' : 'strain tensor e11',
+        'e22' : 'strain tensor e22',
+        'e12' : 'strain tensor e12',
         }.items():
         VarDesc[key] = value