Changeset 3577 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
Aug 30, 2018 4:49:24 PM (3 years ago)
Author:
vondreele
Message:

delete MAXMAGN - not using it any more
fix (maybe) mag constraints; works for orthogonal axes
fix bug in ReadPowerInstprm?
spelling of Levenberg!
fixes to mag structure from Bilbao stuff
set dmin to be min 1A for UnitCell? show reflections
fix Latt2text to show '-' & Trans2text
fix ext test in GetHistogramPhaseData? for mag structures

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r3575 r3577  
    308308        self.Mtrans = False
    309309        self.kvec = [0.,0.,0.]
    310         self.Bilbao = ''
    311310        self.Draw()
    312311
     
    527526        self.Phase['General']['SGData'] = self.SGData
    528527        if self.ifMag:
    529             self.Phase['General']['Name'] += ' mag: '+self.Bilbao
     528            self.Phase['General']['Name'] += ' mag: '
    530529        else:
    531530            self.Phase['General']['Name'] += ' %s'%(self.Common)
     
    23692368                if dlg.ShowModal() == wx.ID_OK:
    23702369                    newPhase,Trans,Uvec,Vvec,ifMag,ifConstr,Common = dlg.GetSelection()
     2370                    newPhase['ranId'] = ran.randint(0,sys.maxsize),
    23712371                    if ifMag:
    23722372                        BNSlatt = newPhase['General']['SGData']['BNSlattsym'][0]
     
    24282428        G2frame.GPXtree.SetItemPyData(sub,newPhase)
    24292429        newPhase['Drawing'] = []
    2430        
     2430        print(newPhase)
    24312431        if ifConstr:
    24322432            G2cnstG.TransConstraints(G2frame,data,newPhase,Trans,Vvec,atCodes)     #data is old phase
     
    24542454            sel = dlg.GetSelection()
    24552455            magchoice = magKeep[sel]
    2456             phaseName = '%s mag (%d)'%(data['General']['Name'],sel)
     2456            phaseName = '%s mag_%d'%(data['General']['Name'],sel)
    24572457            newPhase = copy.deepcopy(data)
     2458            newPhase['ranId'] = ran.randint(0,sys.maxsize),
    24582459            del newPhase['magPhases']
    24592460            generalData = newPhase['General']
    24602461            generalData['SGData'] = copy.deepcopy(magchoice['SGData'])           
    2461             generalData['Cell'][1:] = magchoice['Cell']
     2462            generalData['Cell'][1:] = magchoice['Cell'][:]
    24622463            SGData = generalData['SGData']
    24632464            vvec = np.array([0.,0.,0.])
Note: See TracChangeset for help on using the changeset viewer.