Changeset 3717
- Timestamp:
- Nov 4, 2018 12:59:50 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIconstrGUI.py
r3716 r3717 1393 1393 # parm = SetUniqAj(npId,As[ia],nSGData['SGLaue']) 1394 1394 # DepConsDict[Aid[2]].append([nA,G2obj.G2VarObj(parm)]) 1395 conStrings = []1396 for iA,Asi in enumerate(As):1397 parm = SetUniqAj(opId,Asi,oSGData['SGLaue'])1398 parmDict[parm] = oAcof[iA]1399 varyList.append(parm)1400 IndpCon = [1.0,G2obj.G2VarObj(parm)]1401 conStr = str([IndpCon,DepConsDict[Asi]])1402 if conStr in conStrings:1403 continue1404 conStrings.append(conStr)1405 if len(DepConsDict[Asi]) == 1:1406 if DepConsDict[Asi][0]:1407 constraints['Phase'].append([IndpCon,DepConsDict[Asi][0],None,None,'e'])1408 elif len(DepConsDict[Asi]) > 1:1409 for Dep in DepConsDict[Asi]:1410 Dep[0] *= -11411 constraints['Phase'].append([IndpCon]+DepConsDict[Asi]+[0.0,None,'c'])1395 # conStrings = [] 1396 # for iA,Asi in enumerate(As): 1397 # parm = SetUniqAj(opId,Asi,oSGData['SGLaue']) 1398 # parmDict[parm] = oAcof[iA] 1399 # varyList.append(parm) 1400 # IndpCon = [1.0,G2obj.G2VarObj(parm)] 1401 # conStr = str([IndpCon,DepConsDict[Asi]]) 1402 # if conStr in conStrings: 1403 # continue 1404 # conStrings.append(conStr) 1405 # if len(DepConsDict[Asi]) == 1: 1406 # if DepConsDict[Asi][0]: 1407 # constraints['Phase'].append([IndpCon,DepConsDict[Asi][0],None,None,'e']) 1408 # elif len(DepConsDict[Asi]) > 1: 1409 # for Dep in DepConsDict[Asi]: 1410 # Dep[0] *= -1 1411 # constraints['Phase'].append([IndpCon]+DepConsDict[Asi]+[0.0,None,'c']) 1412 1412 for hId,hist in enumerate(UseList): #HAP - seems OK 1413 1413 ohapkey = '%d:%d:'%(opId,hId)
Note: See TracChangeset
for help on using the changeset viewer.