Changeset 1490

Timestamp:

Sep 9, 2014 4:33:26 PM (7 years ago)

Author:

vondreele

Message:

fix TOF t-bar reference
"fix" TOF single xtal extinction?

Location:

trunk

Files:

• GSASIIstrIO.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (2 diffs)

trunk/GSASIIstrIO.py

@@ -1858 +1858 @@
                 controlDict[pfx+'EType'] = extType
                 controlDict[pfx+'EApprox'] = extApprox
-                controlDict[pfx+'Tbar'] = extParms['Tbar']
-                controlDict[pfx+'Cos2TM'] = extParms['Cos2TM']
+                if 'C' in inst['Type'][0]:
+                    controlDict[pfx+'Tbar'] = extParms['Tbar']
+                    controlDict[pfx+'Cos2TM'] = extParms['Cos2TM']
                 if 'Primary' in extType:
                     Ekey = ['Ep',]
@@ -1883 +1884 @@
                     print >>pFile,' Scale factor     : %10.4f'%(hapData['Scale'][0]),' Refine?',hapData['Scale'][1]
                     if extType != 'None':
-                        print >>pFile,' Extinction  Type: %15s'%(extType),' approx: %10s'%(extApprox),' tbar: %6.3f'%(extParms['Tbar'])
+                        print >>pFile,' Extinction  Type: %15s'%(extType),' approx: %10s'%(extApprox)
                         text = ' Parameters       :'
                         for eKey in Ekey:

trunk/GSASIIstrMath.py

@@ -2014 +2014 @@
                             depDerivDict[var][iref] = w*dFdvDict[var][iref]*parmDict[phfx+'Scale']*ref[11]  #*dervCor
                     if phfx+'Scale' in varylist:
-                        dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*ref[11]  #*dervCor
+                        dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*ref[11]  #OK? *dervCor
                     elif phfx+'Scale' in dependentVars:
-                        depDerivDict[phfx+'Scale'][iref] = w*ref[9]*ref[11]  #*dervCor
+                        depDerivDict[phfx+'Scale'][iref] = w*ref[9]*ref[11]  #OK? *dervCor
                     for item in ['Ep','Es','Eg']:
                         if phfx+item in varylist and dervDict:
-                            dMdvh[varylist.index(phfx+item)][iref] = w*dervDict[phfx+item]/ref[11]  #/dervCor
+                            dMdvh[varylist.index(phfx+item)][iref] = w*dervDict[phfx+item]/ref[11]  #OK? /dervCor
                         elif phfx+item in dependentVars and dervDict:
-                            depDerivDict[phfx+item][iref] = w*dervDict[phfx+item]/ref[11]  #/dervCor
+                            depDerivDict[phfx+item][iref] = w*dervDict[phfx+item]/ref[11]  #OK? /dervCor
                     for item in ['BabA','BabU']:
                         if phfx+item in varylist:
@@ -2043 +2043 @@
                             depDerivDict[var][iref] = w*dFdvDict[var][iref]*parmDict[phfx+'Scale']*dervCor      #*ref[11]
                     if phfx+'Scale' in varylist:
-                        dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*dervCor    #*ref[11]
+                        dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*ref[11]    #*dervCor
                     elif phfx+'Scale' in dependentVars:
-                        depDerivDict[phfx+'Scale'][iref] = w*ref[9]*dervCor #*ref[11]                           
+                        depDerivDict[phfx+'Scale'][iref] = w*ref[9]*ref[11] #*dervCor                           
                     for item in ['Ep','Es','Eg']:
                         if phfx+item in varylist and dervDict: