Changeset 3022

Timestamp:

Aug 23, 2017 10:17:15 AM (6 years ago)

Author:

odonnell

Message:

new pId/hId setters, factor out hist/phase linking code

File:

• trunk/GSASIIscriptable.py (modified) (7 diffs)

trunk/GSASIIscriptable.py

@@ -694 +694 @@
             self.filename = os.path.abspath(os.path.expanduser(gpxfile))
             self.data, self.names = LoadDictFromProjFile(gpxfile)
+            self.update_ids()
             self.index_ids()
         else:
@@ -758 +759 @@
                 self.names.append(new_names)
         self.data[histname] = pwdrdata
+        self.update_ids()
         return self.histogram(histname)
 
@@ -811 +813 @@
         UseList = data['Histograms']
 
-        for histname in histograms:
-            if histname.startswith('HKLF '):
-                raise NotImplementedError("Does not support HKLF yet")
-            elif histname.startswith('PWDR '):
-                hist = self.histogram(histname)
-                hist['Reflection Lists'][generalData['Name']] = {}
-                UseList[histname] = SetDefaultDData('PWDR', histname, NShkl=NShkl, NDij=NDij)
-                for key, val in [('Use', True), ('LeBail', False),
-                                 ('newLeBail', True),
-                                 ('Babinet', {'BabA': [0.0, False],
-                                              'BabU': [0.0, False]})]:
-                    if key not in UseList[histname]:
-                        UseList[histname][key] = val
-            else:
-                raise NotImplementedError("Unexpected histogram" + histname)
+        for hist in histograms:
+            self.link_histogram_phase(hist, phasename)
+            # if histname.startswith('HKLF '):
+            #     raise NotImplementedError("Does not support HKLF yet")
+            # elif histname.startswith('PWDR '):
+            #     hist = self.histogram(histname)
+            #     hist['Reflection Lists'][generalData['Name']] = {}
+            #     UseList[histname] = SetDefaultDData('PWDR', histname, NShkl=NShkl, NDij=NDij)
+            #     for key, val in [('Use', True), ('LeBail', False),
+            #                      ('newLeBail', True),
+            #                      ('Babinet', {'BabA': [0.0, False],
+            #                                   'BabU': [0.0, False]})]:
+            #         if key not in UseList[histname]:
+            #             UseList[histname][key] = val
+            # else:
+            #     raise NotImplementedError("Unexpected histogram" + histname)
 
         for obj in self.names:
@@ -840 +843 @@
         self.index_ids()
 
+        self.update_ids()
         return self.phase(phasename)
+
+    def link_histogram_phase(self, histogram, phase):
+        """Associates a given histogram and phase.
+
+        .. seealso::
+
+            :func:`~G2Project.histogram`
+            :func:`~G2Project.phase`"""
+        hist = self.histogram(histogram)
+        phase = self.phase(phase)
+
+        generalData = phase['General']
+
+        if hist.name.startswith('HKLF '):
+            raise NotImplementedError("HKLF not yet supported")
+        elif hist.name.startswith('PWDR '):
+            hist['Reflection Lists'][generalData['Name']] = {}
+            UseList = phase['Histograms']
+            SGData = generalData['SGData']
+            NShkl = len(G2spc.MustrainNames(SGData))
+            NDij = len(G2spc.HStrainNames(SGData))
+            UseList[hist.name] = SetDefaultDData('PWDR', hist.name, NShkl=NShkl, NDij=NDij)
+            UseList[hist.name]['hId'] = hist.id
+            for key, val in [('Use', True), ('LeBail', False),
+                             ('newLeBail', True),
+                             ('Babinet', {'BabA': [0.0, False],
+                                          'BabU': [0.0, False]})]:
+                if key not in UseList[hist.name]:
+                    UseList[hist.name][key] = val
+        else:
+            raise RuntimeError("Unexpected histogram" + hist.name)
+
 
     def reload(self):
@@ -935 +971 @@
                 return [self.phase(p) for p in obj[1:]]
         return []
+
+    def update_ids(self):
+        """Makes sure all phases and histograms have proper hId and pId"""
+        # Translated from GetUsedHistogramsAndPhasesfromTree,
+        #   GSASIIdataGUI.py:4107
+        for i, h in enumerate(self.histograms()):
+            h.id = i
+        for i, p in enumerate(self.phases()):
+            p.id = i
 
     def do_refinements(self, refinements, histogram='all', phase='all',
@@ -1268 +1313 @@
     @property
     def id(self):
+        self.proj.update_ids()
         return self.data['data'][0]['hId']
+
+    @id.setter
+    def id(self, val):
+        self.data['data'][0]['hId'] = val
 
     def fit_fixed_points(self):
@@ -1527 +1577 @@
     def id(self):
         return self.data['pId']
+
+    @id.setter
+    def id(self, val):
+        self.data['pId'] = val
 
     def get_cell(self):