Changeset 3886


Ignore:
Timestamp:
Apr 10, 2019 9:33:05 AM (3 years ago)
Author:
vondreele
Message:

change variable SUBGRPUOS --> SubGroups? (avoid possible confusion with SUBGROUPS.py import
fix bug in running Bilbao stuff

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r3876 r3886  
    39063906      doi: 10.1146/annurev-matsci-070214-021008''',caption='Bilbao SUBGROUPS',style=wx.ICON_INFORMATION)
    39073907           
    3908             SUBGROUPS,baseList = kSUB.GetNonStdSubgroups(SGData,kvec[:9],star,Landau)
     3908            SubGroups,baseList = kSUB.GetNonStdSubgroups(SGData,kvec[:9],star,Landau)
    39093909#            SUBGROUPS,baseList = kMAG.GetNonStdSubgroups(SGData,kvec[:9],star,Landau,maximal)
    39103910            wx.EndBusyCursor()
    3911             if SUBGROUPS is None:
     3911            if SubGroups is None:
    39123912                wx.MessageBox('Check your internet connection?',caption='Bilbao SUBGROUPS error',style=wx.ICON_EXCLAMATION)
    39133913                return
    3914             if not SUBGROUPS:
     3914            if not SubGroups:
    39153915                if Landau:
    39163916                    wx.MessageBox('No results from SUBGROUPS, multi k-vectors & Landau not compatible',
     
    39213921                return
    39223922            controls[14] = kvec[:9]
    3923             controls[16] = baseList
    3924             dlg = wx.ProgressDialog('SUBGROUPS results','Processing '+SUBGROUPS[0][0],len(SUBGROUPS),
     3923            try:
     3924                controls[16] = baseList
     3925            except IndexError:
     3926                controls.append(baseList)
     3927            dlg = wx.ProgressDialog('SUBGROUPS results','Processing '+SubGroups[0][0],len(SubGroups),
    39253928                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME)
    3926             for ir,result in enumerate(SUBGROUPS):
     3929            for ir,result in enumerate(SubGroups):
    39273930                dlg.Update(ir,newmsg='Processing '+result[0])
    39283931                Trans = np.array(eval(result[1][0]))
     
    40224025                return
    40234026            controls[14] = kvec[:9]
    4024             controls[16] = baseList
     4027            try:
     4028                controls[16] = baseList
     4029            except IndexError:
     4030                controls.append(baseList)
    40254031            dlg = wx.ProgressDialog('k-SUBGROUPSMAG results','Processing '+MAXMAGN[0][0],len(MAXMAGN),
    40264032                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME)
  • trunk/GSASIIstrIO.py

    r3885 r3886  
    741741    data = cPickleLoad(fp) # first block in file should be Phases
    742742    if data[0][0] != 'Phases':
    743         raise Exception('Unexpected block in {} file. How did this happen?'
    744                             .format(GPXphase))
     743        raise Exception('Unexpected block in {} file. How did this happen?'.format(GPXphase))
    745744    Phases = {}
    746745    for name,vals in data[1:]:
Note: See TracChangeset for help on using the changeset viewer.