Merge pull request #332 from jonwright/master

Monitor for normalisation of a pk2d or cf2d

ImageD11/sinograms/dataset.py

@@ -56,6 +56,7 @@ class DataSet:
         "detector",
         "omegamotor",
         "dtymotor",
+        "monitorname",
         "pksfile",
         "sparsefile",
         "parfile",
@@ -131,6 +132,8 @@ def __init__(
         self.shape = (0, 0)
         self.omega = None
         self.dty = None
+        self.monitor = None
+        self.monitorname = None
 
         self._peaks_table = None
         self._pk2d = None
@@ -524,6 +527,18 @@ def get_monitor(self, name="fpico6"):
                 monitor.append(mon)
         self.monitor = np.concatenate(monitor).reshape(self.shape)
         return self.monitor
+
+    def get_monitor_pk2d(self, pk2d, name='fpico6'):
+        """
+        To be used to normalise the peaks 2d
+        """
+        if self.monitor is None :
+            self.get_monitor( name )
+        iy = np.digitize( pk2d['dty'], self.ybinedges ) - 1
+        io = np.digitize( pk2d['omega'], self.obinedges ) - 1 
+        #pk2d['iy'] = iy  # cache these too ?
+        #pk2d['io'] = io
+        return self.monitor[ iy, io ]
 
     def guess_detector(self):
         """Guess which detector we are using from the masterfile"""

ImageD11/sinograms/sinogram.py

@@ -170,6 +170,7 @@ def build_sinogram(self, columns=('omega',)):
         order = np.lexsort((np.arange(npks), sinoangles))
         self.sinoangles = sinoangles[order]
         self.ssino = self.sino[order].T
+        self.proj_scale = self.proj_scale[order]
         if len(columns)>1:
             self.angle_wt_sinos = { name : angs[name][order].T for name in columns }
         self.hkle = pkindices[:, order]  # dims are [ (h,k,l,sign(eta)) , nprojections ]