Merge pull request #125 from HEXRD/Material-latticePrameter-setter

Material lattice prameter setter
HEXRD · Sep 29, 2020 · 68aaeca · 68aaeca
2 parents 5457ffa + 7ce1804
commit 68aaeca
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/hexrd/material.py b/hexrd/material.py
@@ -580,21 +580,22 @@ def _get_latticeParameters(self):
 
     def _set_latticeParameters(self, v):
         """Set method for latticeParameters"""
-        v2 = unitcell._rqpDict[self.unitcell.latticeType][1](v)
-        lp = [_angstroms(v2[i]) for i in range(3)]
+        if(len(v) != 6):
+            v = unitcell._rqpDict[self.unitcell.latticeType][1](v)
+        lp = [_angstroms(v[i]) for i in range(3)]
         for i in range(3,6):
-            lp.append(_degrees(v2[i]))
+            lp.append(_degrees(v[i]))
         self._lparms = lp
 
-        # rq_lp = unitcell._rqpDict[self.unitcell.latticeType][0]
+        rq_lp = unitcell._rqpDict[self.unitcell.latticeType][0]
         for i,vv in enumerate(lp):
             if(vv.isLength()):
                 val = vv.value / 10.0
             else:
                 val = vv.value
             setattr(self.unitcell, unitcell._lpname[i], val)
-
-        self.planeData.lparms = v
+        v2 = [lp[x].value for x in rq_lp]
+        self.planeData.lparms = v2
 
         return