Changeset 1387
 Timestamp:
 Jun 18, 2014 12:08:07 PM (7 years ago)
 Location:
 trunk
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIimage.py
r1385 r1387 948 948 th,azm = ring['ImtaObs'] 949 949 th0 = np.ones_like(azm)*npasind(wave/(2.*ring['Dset'])) 950 V = np.sum(np.sum(E*calcFij(90.,phi,azm,th0).T/1.e6,axis=2),axis=1)950 V = np.sum(np.sum(E*calcFij(90.,phi,azm,th0).T/1.e6,axis=2),axis=1) 951 951 if StaType == 'True': 952 952 ring['ImtaCalc'] = np.array([np.exp(V)*ring['Dset'],azm]) … … 999 999 dspo,azm,dsp = xyd 1000 1000 th = npasind(wave/(2.0*dspo)) 1001 V = np.sum(np.sum(E*calcFij(90.,phi,azm,th).T/1.e6,axis=2),axis=1)1001 V = np.sum(np.sum(E*calcFij(90.,phi,azm,th).T/1.e6,axis=2),axis=1) 1002 1002 if StaType == 'True': 1003 1003 dspc = dset*np.exp(V) 
trunk/GSASIIobj.py
r1373 r1387 1132 1132 1133 1133 if not l[1]: 1134 l[1] = "(variable needs a definition! )"1134 l[1] = "(variable needs a definition! Set it in CompileVarDesc)" 1135 1135 1136 1136 if len(l) == 3: #SASD variable name! … … 1309 1309 'PkPos': 'Bragg peak position', 1310 1310 'PkSig': 'Bragg peak sigma', 1311 'PkGam': 'Bragg peak gamma', 1311 'PkGam': 'Bragg peak gamma', 1312 # strain vars e11, e22, e12 1313 'e11' : 'strain tensor e11', 1314 'e22' : 'strain tensor e22', 1315 'e12' : 'strain tensor e12', 1312 1316 }.items(): 1313 1317 VarDesc[key] = value
Note: See TracChangeset
for help on using the changeset viewer.