Changeset 419

Timestamp:

Nov 17, 2011 1:25:51 PM (12 years ago)

Author:

toby

Message:

print constraint-generated variables

Location:

trunk

Files:

• GSASIImapvars.py (modified) (4 diffs)
• GSASIIstruct.py (modified) (1 diff)

trunk/GSASIImapvars.py

@@ -439 +439 @@
     return dependentVars
 
+def GetIndependentVars():
+    '''Return a list of independent variables: e.g. variables that are
+    created by constrains of other variables'''
+    independentVars = []
+    global indParmList,fixedDict
+    for lst in indParmList:
+        for name in lst:
+            if name in fixedDict: continue
+            independentVars.append(name)
+    return independentVars
+
+def PrintIndependentVars(parmDict,varyList,sigDict,PrintAll=False):
+    '''Print the values and uncertainties on the independent variables'''
+    global dependentParmList,arrayList,invarrayList,indParmList,fixedDict
+    printlist = []
+    mapvars = GetIndependentVars()
+    #    for varlist,mapvars,multarr,invmultarr in zip(
+    #        dependentParmList,indParmList,arrayList,invarrayList):
+    for i,name in enumerate(mapvars):
+        if name in fixedDict: continue
+        if PrintAll or name in varyList:
+            sig = sigDict.get(name)
+            printlist.append([name,parmDict[name],sig])
+    if len(printlist) == 0: return
+    s1 = ''
+    print 130*'-'
+    print "Variables generated by constraints"
+    printlist.append(3*[None])
+    for name,val,esd in printlist:
+        if len(s1) > 40 or name is None:
+            print
+            print s1
+            print s2
+            print s3
+            s1 = ''
+            if name is None: break
+        if s1 == "":
+            s1 = ' name  :'
+            s2 = ' value :'
+            s3 = ' sig   :'
+        s1 += '%12s' % (name)
+        s2 += '%12.6f' % (val)
+        if esd is None:
+            s3 += '%12s' % ('n/a')
+        else:    
+            s3 += '%12.6f' % (esd)
+            
 def VarRemapShow(varyList):
     '''List out the saved relationships.
@@ -452 +499 @@
     for varlist,mapvars,multarr,invmultarr in zip(
         dependentParmList,indParmList,arrayList,invarrayList):
-        i = 0
-        for mv in mapvars:
+        for i,mv in enumerate(mapvars):
             if multarr is None:
                 s += '  ' + str(mv) + ' defines parameter(s): '
@@ -475 +521 @@
             if mv in varyList: s += ' VARY'
             s += '\n'
-            i += 1
     s += 'Inverse variable mapping relations:\n'
     for varlist,mapvars,invmultarr in zip(dependentParmList,indParmList,invarrayList):
-        i = 0
-        for mv in varlist:
+        for i,mv in enumerate(varlist):
             s += '  %s = ' % mv
             j = 0
@@ -488 +532 @@
                 s += '(%s * %s)' % (m,v)
             s += '\n'
-            i += 1
     return s
 

trunk/GSASIIstruct.py

@@ -2573 +2573 @@
     SetHistogramPhaseData(parmDict,sigDict,Phases,Histograms)
     SetHistogramData(parmDict,sigDict,Histograms)
+    G2mv.PrintIndependentVars(parmDict,varyList,sigDict)
     SetUsedHistogramsAndPhases(GPXfile,Histograms,Phases,covData)
 #for testing purposes!!!