Skip to content

Commit b6d6ba6

Browse files
committed
fix path bugs in RMC
1 parent d4919a5 commit b6d6ba6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

GSASII/GSASIIphsGUI.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6639,8 +6639,9 @@ def OnViewRMC(event):
66396639
'_SQ1partials.csv':[],'_SQ2partials.csv':[],'_FQ1.csv':[],'_FT_XFQ1.csv':[],
66406640
'_FQ1partials.csv':[],'_bragg.csv':[],'.chi2':[]}
66416641
for item in files:
6642-
if os.path.exists(os.path.join(path,pName+item)):
6643-
OutFile = open(pName+item,'r')
6642+
fileName = os.path.join(path,pName+item)
6643+
if os.path.exists(fileName):
6644+
OutFile = open(fileName,'r')
66446645
files[item] = OutFile.readlines()
66456646
OutFile.close()
66466647
print('RMCProfile file %s read'%(pName+item))
@@ -6783,7 +6784,7 @@ def OnViewRMC(event):
67836784
lines=True,names=Names[3:])
67846785

67856786
#get atoms from rmc6f file
6786-
rmc6fName = pName+'.rmc6f'
6787+
rmc6fName = os.path.join(path,pName+'.rmc6f')
67876788
rmc6f = open(rmc6fName,'r')
67886789
rmc6fAtoms = []
67896790
while True:

GSASII/GSASIIplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7364,7 +7364,7 @@ def Draw(caller='',Fade=[],NPkey=False):
73647364
UVMat = np.inner(defCtrls['UVmat'],SGM)
73657365
Npsi,Ngam = 90,45
73667366
PSI,GAM = np.mgrid[0:Npsi,0:Ngam] #[azm,pol]
7367-
PSI = PSI.flatten()*360./Npsi #azimuth 0-360 ncl
7367+
PSI = PSI.flatten()*360./Npsi #azimuth 0-360 incl
73687368
GAM = GAM.flatten()*180./Ngam #polar 0-180 incl
73697369
Rp,PSIp,GAMp = G2mth.RotPolbyM(np.ones_like(PSI),PSI,GAM,UVMat) #TODO: needs symmetry operation for equiv. positions
73707370
P = G2lat.SHarmcal(SytSym,SHC,PSIp,GAMp).reshape((Npsi,Ngam))**2

0 commit comments

Comments
 (0)