Merge pull request #1920 from HEXRD/texture-fixes

pass sample rotation matrix instead of sample normal

Author: psavery

hexrdgui/calibration/wppf_options_dialog.py

@@ -2024,6 +2024,9 @@ def _copy_texture_figs(self, obj1, obj2):
         if obj1 is None or obj2 is None:
             return
 
+        if any(not hasattr(x, 'texture_model') for x in (obj1, obj2)):
+            return
+
         for model_key, model1 in obj1.texture_model.items():
             model2 = obj2.texture_model[model_key]
             if model1 is None or model2 is None:
@@ -2242,7 +2245,7 @@ def texture_model_dict(self) -> dict[str, HarmonicModel]:
                 'material': Material_Rietveld(material_obj=mat),
                 'bvec': HexrdConfig().beam_vector,
                 'evec': ct.eta_vec,
-                'sample_normal': HexrdConfig().sample_normal,
+                'sample_rmat': HexrdConfig().sample_rmat,
                 **kwargs,
             })
         return ret