Changeset 1852 for trunk/GSASIIstrMain.py

Timestamp:

May 14, 2015 10:31:16 AM (7 years ago)

Author:

vondreele

Message:

addmtexture analysis tutorial to list in G2ctrls
remove Clear Texture - not needed (commented out for now)
Add print of resonant form factors for x-ray & cw neutron refinements. Appears in the results part of the ,lst file

File:

• trunk/GSASIIstrMain.py (modified) (2 diffs)

trunk/GSASIIstrMain.py

@@ -208 +208 @@
         G2stIO.SetRigidBodyModels(parmDict,sigDict,rigidbodyDict,printFile)
         G2stIO.SetPhaseData(parmDict,sigDict,Phases,rbIds,covData,restraintDict,printFile)
-        G2stIO.SetHistogramPhaseData(parmDict,sigDict,Phases,Histograms,pFile=printFile)
-        G2stIO.SetHistogramData(parmDict,sigDict,Histograms,pFile=printFile)
+        G2stIO.SetHistogramPhaseData(parmDict,sigDict,Phases,Histograms,calcControls['FFtables'],pFile=printFile)
+        G2stIO.SetHistogramData(parmDict,sigDict,Histograms,calcControls['FFtables'],pFile=printFile)
         G2stIO.SetUsedHistogramsAndPhases(GPXfile,Histograms,Phases,rigidbodyDict,covData)
         printFile.close()
@@ -409 +409 @@
             G2stMth.ApplyRBModels(parmDict,Phases,rigidbodyDict,True)
     #        G2stIO.SetRigidBodyModels(parmDict,sigDict,rigidbodyDict,printFile)
-            G2stIO.SetHistogramPhaseData(parmDict,sigDict,Phases,Histo,ifPrint,printFile)
-            G2stIO.SetHistogramData(parmDict,sigDict,Histo,ifPrint,printFile)
+            G2stIO.SetHistogramPhaseData(parmDict,sigDict,Phases,Histo,None,ifPrint,printFile)
+            G2stIO.SetHistogramData(parmDict,sigDict,Histo,None,ifPrint,printFile)
             G2stIO.SetUsedHistogramsAndPhases(GPXfile,Histo,Phases,rigidbodyDict,histRefData,makeBack)
             makeBack = False