Changeset 1696

Timestamp:

Mar 11, 2015 11:30:57 PM (9 years ago)

Author:

toby

Message:

more work on seq. ref. with differing variables; rework svn interface; fix tutorial downloads

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIctrls.py (modified) (7 diffs)
• GSASIIgrid.py (modified) (3 diffs)
• GSASIIpath.py (modified) (6 diffs)
• config_example.py (modified) (1 diff)

trunk/GSASII.py

@@ -2012 +2012 @@
             self._init_Macro()
         HelpMenu=G2G.MyHelp(self,helpType='Data tree',
-            morehelpitems=[('&Tutorials','Tutorials')])
-        menubar.Append(menu=HelpMenu,title='&Help')
-        # this will eventually go away
-        HelpMenu=G2G.MyHelp(self,helpType='Data tree',
-            morehelpitems=[('&New Tutorials','NewTutorials')])
+            morehelpitems=[('&Tutorials','Tutorials'),
+                           ('&New Tutorials','NewTutorials'), # this will eventually go away
+                           ])
         menubar.Append(menu=HelpMenu,title='&Help')
 

trunk/GSASIIctrls.py

@@ -1962 +1962 @@
     ['TOF Charge Flipping', 'TOF Charge Flipping', 'Charge Flipping with TOF single crystal data in GSASII.htm',
      'Charge flipping with neutron TOF single crystal data'],
+    ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm', 'Combined XN Rietveld refinement with TOF data'],
     ['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''],
     ['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''],
-    ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', '', ''],
     )
 if GSASIIpath.GetConfigValue('Tutorial_location'):
@@ -1970 +1970 @@
 else:
     tutorialPath = GSASIIpath.path2GSAS2
-    
+
 class OpenTutorial(wx.Dialog):
     '''Open a tutorial, optionally copying it to the local disk. Always copy
@@ -2062 +2062 @@
         '''
         self.BrowseMode = self.mode.GetSelection()
-        #self.FillListBox()
-    #def FillListBox(self):
         if self.BrowseMode == 3:
             import glob
-            filelist = glob.glob(tutorialPath+'/help/*/*.htm')
+            filelist = glob.glob(os.path.join(tutorialPath,'help','*','*.htm'))
             taillist = [os.path.split(f)[1] for f in filelist]
             itemlist = [tut[-1] for tut in tutorialCatalog if tut[2] in taillist]
@@ -2095 +2093 @@
                 return
         self.dataLoc.SetLabel(tutorialPath)
+        self.EndModal(wx.ID_OK)
         if self.BrowseMode == 0:
             # xfer data & web page locally, then open web page
@@ -2116 +2115 @@
         else:
             raise Exception("How did this happen!")
-        self.EndModal(wx.ID_OK)
     def ValidateTutorialDir(self,fullpath=tutorialPath,baseURL=G2BaseURL):
         '''Load help to new directory or make sure existing directory looks correctly set up
@@ -2139 +2137 @@
     def LoadTutorial(self,tutorialname,fullpath=tutorialPath,baseURL=G2BaseURL):
         'Load a Tutorial to the selected location'
-        if GSASIIpath.svnSwitchDir("help/"+tutorialname,baseURL+"/Tutorials/"+tutorialname,fullpath):
+        if GSASIIpath.svnSwitchDir("help",tutorialname,baseURL+"/Tutorials",fullpath):
             return True
         raise Exception("Problem transferring Tutorial from web")
@@ -2145 +2143 @@
     def LoadExercise(self,tutorialname,fullpath=tutorialPath,baseURL=G2BaseURL):
         'Load Exercise file(s) for a Tutorial to the selected location'
-        if GSASIIpath.svnSwitchDir("Exercises/"+tutorialname,baseURL+"/Exercises/"+tutorialname,fullpath):
+        if GSASIIpath.svnSwitchDir("Exercises",tutorialname,baseURL+"/Exercises",fullpath):
             return True
         raise Exception("Problem transferring Exercise from web")

trunk/GSASIIgrid.py

@@ -3511 +3511 @@
     VaryListChanges = [] # histograms where there is a change
     combinedVaryList = []
-    firstValueList = []
+    firstValueDict = {}
     vallookup = {}
     posdict = {}
+    prevVaryList = []
     for i,name in enumerate(histNames):
-        newval = False
-        for var,val in zip(data[name]['varyList'],data[name]['variables']):
-            svar = striphist(var,'*')
-            if svar in combinedVaryList: continue
-            # add variables to list as they appear
-            combinedVaryList.append(svar)
-            firstValueList.append(val)
-            newval = True
-        if newval:
+        for var,val,sig in zip(data[name]['varyList'],data[name]['variables'],data[name]['sig']):
+            svar = striphist(var,'*') # wild-carded
+            if svar not in combinedVaryList:
+                # add variables to list as they appear
+                combinedVaryList.append(svar)
+                firstValueDict[svar] = (val,sig)
+        if prevVaryList != data[name]['varyList']: # this refinement has a different refinement list from previous
+            prevVaryList = data[name]['varyList']
             vallookup[name] = dict(zip(data[name]['varyList'],data[name]['variables']))
             posdict[name] = {}
@@ -3617 +3617 @@
         if name in posdict:
             varsellist = [posdict[name].get(i) for i in range(varcols)]
-            #sellist = [data[name]['varyList'].index(v) if v is not None else None for v in varsellist]
-            sellist = [i if striphist(v,'*') in varsellist else None for i,v in enumerate(data[name]['varyList'])]
+            # translate variable names to how they will be used in the headings
+            vs = [striphist(v,'*') for v in data[name]['varyList']]
+            # determine the index for each column (or None) in the data[]['variables'] and ['sig'] lists
+            sellist = [vs.index(v) if v is not None else None for v in varsellist]
+            #sellist = [i if striphist(v,'*') in varsellist else None for i,v in enumerate(data[name]['varyList'])]
         if not varsellist: raise Exception()
         vals.append([data[name]['variables'][s] if s is not None else None for s in sellist])
         esds.append([data[name]['sig'][s] if s is not None else None for s in sellist])
+        #GSASIIpath.IPyBreak()
     colList += zip(*vals)
     colSigs += zip(*esds)
-    # add the variables that were refined; change from rows to columns
-    #colList += zip(*[data[name]['variables'] for name in histNames])
-    #colLabels += data[histNames[0]]['varyList']
-    #Types += len(data[histNames[0]]['varyList'])*[wg.GRID_VALUE_FLOAT]
-    #colSigs += zip(*[data[name]['sig'] for name in histNames])
-
-    # for var in combinedVaryList:
-    #     colLabels += [var]
-    #     Types += [wg.GRID_VALUE_FLOAT]
-    #     vals = []
-    #     sigs = []
-    #     for name in histNames:
-    #         try:
-    #             i = data[name]['varyList'].index(var)
-    #             vals.append(data[name]['variables'][i])
-    #             sigs.append(data[name]['sig'][i])
-    #         except ValueError: # var not in list
-    #             vals.append(None)
-    #             sigs.append(None)
-    #     colList += [vals]
-    #     colSigs += [sigs]
                 
     # tabulate constrained variables, removing histogram numbers if needed
@@ -3729 +3712 @@
 
     #******************************************************************************
+    # create a set of values for example evaluation of pseudovars and 
     # this does not work for refinements that have differing numbers of variables.
     #raise Exception
-    indepVarDict = {     #  values in table w/o ESDs
-        var:colList[i][0] for i,var in enumerate(colLabels) if colSigs[i] is None
-        }
-    # make dict of dependent vars (w/ESDs) that are not converted (Dij to Ak or dAx to Ax) 
-    depVarDict = {
-        var:colList[i][0] for i,var in enumerate(colLabels)
-        if colSigs[i] is not None and striphist(var) not in Dlookup
-        }
+    indepVarDict = {}     #  values in table w/o ESDs
+    depVarDict = {}
+    for i,var in enumerate(colLabels):
+        if var == 'Use': continue
+        if colList[i][0] is None:
+            val,sig = firstValueDict.get(var,[None,None])
+        elif colSigs[i]:
+            val,sig = colList[i][0],colSigs[i][0]
+        else:
+            val,sig = colList[i][0],None
+        if val is None:
+            continue
+        elif sig is None:
+            indepVarDict[var] = val
+        elif striphist(var) not in Dlookup:
+            depVarDict[var] = val
     # add recip cell coeff. values
     depVarDict.update({var:val for var,val in data[name].get('newCellDict',{}).values()})

trunk/GSASIIpath.py

@@ -153 +153 @@
             return os.path.abspath(exe_file)
 
+def svnVersion():
+    '''Get the version number of the current subversion executable
+
+    :returns: a string with a version number such as "1.6.6" or None if
+      subversion is not found.
+
+    '''
+    import subprocess
+    svn = whichsvn()
+    if not svn: return
+
+    cmd = [svn,'--version','--quiet']
+    s = subprocess.Popen(cmd,
+                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print 'subversion error!\nout=',out
+        print 'err=',err
+        return None
+    return out.strip()
+
+def svnVersionNumber():
+    '''Get the version number of the current subversion executable
+
+    :returns: a fractional version number such as 1.6 or None if
+      subversion is not found.
+
+    '''
+    ver = svnVersion()
+    if not ver: return 
+    M,m = svnVersion().split('.')[:2]
+    return int(M)+int(m)/10.
+
 def svnGetLog(fpath=os.path.split(__file__)[0],version=None):
-    '''Get the revision log information for a specific version of the 
+    '''Get the revision log information for a specific version of the specified package
 
     :param str fpath: path to repository dictionary, defaults to directory where
@@ -213 +246 @@
     else:
         cmd = [svn,'info',fpath,'--xml','-rHEAD']
-    s = subprocess.Popen(cmd+['--non-interactive', '--trust-server-cert'],
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
-    if err:
-        print 'svn failed, retry w/o --trust...\nout=',out
+    if svnVersionNumber() >= 1.6:
+        cmd += ['--non-interactive', '--trust-server-cert']
+    s = subprocess.Popen(cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print 'svn failed\n',out
         print 'err=',err
-        s = subprocess.Popen(cmd,
-                            stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        out,err = s.communicate()
-        if err:
-            print 'out=',out
-            print 'err=',err
-            return None
+        return None
     x = ET.fromstring(out)
     for i in x.iter('entry'):
@@ -278 +306 @@
            '--non-interactive',
            '--accept','theirs-conflict','--force']
-    s = subprocess.Popen(cmd+['--trust-server-cert'], 
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
-    print out
-    if err:
-        s = subprocess.Popen(cmd,
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        out,err = s.communicate()
-        if err:
-            print(60*"=")
-            print ("****** An error was noted, see below *********")
-            print(60*"=")
-            print err
-            sys.exit()
-
+    if svnVersionNumber() >= 1.6:
+        cmd += ['--trust-server-cert']
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print(60*"=")
+        print ("****** An error was noted, see below *********")
+        print(60*"=")
+        print err
+        sys.exit()
+
+def svnUpgrade(fpath=os.path.split(__file__)[0]):
+    '''This reformats subversion files, which may be needed if an upgrade of subversion is
+    done. 
+
+    :param str fpath: path to repository dictionary, defaults to directory where
+       the current file is located
+    '''
+    import subprocess
+    svn = whichsvn()
+    if not svn: return
+    cmd = [svn,'upgrade',fpath,'--non-interactive']
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print("svn upgrade did not happen (this is probably OK). Messages:")
+        print err
+            
 def svnUpdateProcess(version=None,projectfile=None):
     '''perform an update of GSAS-II in a separate python process'''
@@ -309 +350 @@
     sys.exit()
 
-def svnSwitchDir(rpath,URL,loadpath=None):
+def svnSwitchDir(rpath,filename,baseURL,loadpath=None):
     '''This performs a switch command to move files between subversion trees.
 
@@ -324 +365 @@
     svn = whichsvn()
     if not svn: return
+    URL = baseURL[:]
+    if baseURL[-1] != '/':
+        URL = baseURL + '/' + filename
+    else:
+        URL = baseURL + filename
     if loadpath:
-        fpath = os.path.join(loadpath,rpath)
-    else:
-        fpath = os.path.join(path2GSAS2,rpath)
-    cmd = [svn,'switch','--ignore-ancestry',URL,fpath,
-           '--non-interactive',
+        fpath = os.path.join(loadpath,rpath,filename)
+    else:
+        fpath = os.path.join(path2GSAS2,rpath,filename)
+    cmd = [svn,'switch',URL,fpath,
+           '--non-interactive','--trust-server-cert',
            '--accept','theirs-conflict','--force']
+    if svnVersionNumber() > 1.6: cmd += ['--ignore-ancestry']
     print("Loading files from "+URL)
-    s = subprocess.Popen(cmd+['--trust-server-cert'], 
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
-    if err:
-        s = subprocess.Popen(cmd,
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        out,err = s.communicate()
-        if err:
-            print(60*"=")
-            print ("****** An error was noted, see below *********")
-            print(60*"=")
-            print err
-            return False
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print(60*"=")
+        print ("****** An error was noted, see below *********")
+        print(60*"=")
+        print 'out=',out
+        print 'err=',err
+        return False
     return True
 
@@ -360 +403 @@
         raise Exception("Error: Attempting to create existing directory "+loadpath)
     cmd = [svn,'co',URL,loadpath,'--non-interactive']
+    if svnVersionNumber() >= 1.6: cmd += ['--trust-server-cert']
     print("Loading files from "+URL)
-    s = subprocess.Popen(cmd+['--trust-server-cert'], 
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
-    if err:
-        print out
-        s = subprocess.Popen(cmd,
-                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        out,err = s.communicate()
-        if err:
-            print(60*"=")
-            print ("****** An error was noted, see below *********")
-            print(60*"=")
-            print err
-            return False
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print(60*"=")
+        print ("****** An error was noted, see below *********")
+        print(60*"=")
+        print err
+        return False
     return True
-
             
 def IPyBreak_base():

trunk/config_example.py

@@ -42 +42 @@
 G2 is installed by an administrator, it is a good idea to use something like this:
     import os.path
-    Tutorial_location = os.path.expanduser('~/G2tutorials')
+    Tutorial_location = os.path.join(os.path.expanduser('~'),'G2tutorials')
 This will allow users to download tutorial files into their own file space.
 '''