MNT: Modify cspad intensity function to take bin number parameters

pcdshub · Jun 29, 2020 · d96dea5 · d96dea5
1 parent 055789a
commit d96dea5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/jet_tracking/jet_control.py b/jet_tracking/jet_control.py
@@ -404,7 +404,9 @@ def jet_scan(injector, cspad, gas_det, params):
             # get azav from CSPAD
             # get CSPAD and wave8
             azav, norm = get_azav(cspad)  # call azimuthal average function
-            intensities.append(jt_utils.get_cspad(azav, params.radius.get(), gas_det))
+            intensities.append(jt_utils.get_cspad(azav, gas_det,
+                                                  params.bin_low,
+                                                  params.bin_high))
         hi_intensities.append(max(intensities))
         best_pos.append(positions[intensities.index(max(intensities))])
     # move motor to average of best positions from two sweeps

diff --git a/jet_tracking/jettracking.py b/jet_tracking/jettracking.py
@@ -52,6 +52,7 @@ def run(self, azav, gas_det):
                 sleep(2)
                 continue
 
+            # TODO: Fix the bad call of get_cspad()
             # check CSPAD
             if (jt_utils.get_cspad(self.cspad) < self.params.thresh_lo):
                 # if CSPAD is below lower threshold, move jet
@@ -75,12 +76,16 @@ def run(self, azav, gas_det):
                 # if camera is bypassed or if jet is less than 10 microns away
                 # from x-rays, scan jet across x-rays to find new maximum
                 jet_control.scan(self.injector, self.cspad)
-                intensity = jt_utils.get_cspad(azav, self.params.radius.get(), gas_det)
+                intensity = jt_utils.get_cspad(azav, gas_det,
+                                               self.params.bin_low.get(),
+                                               self.params.bin_high.get())
                 self.params.intensity.put(intensity)
                 sleep(1)  # change to however long it takes for jet to scan
 
                 # if CSPAD is still below upper threshold, stop jet tracking
-                if (jt_utils.get_cspad(azav, self.params.radius.get(), gas_det)
+                if (jt_utils.get_cspad(azav, gas_det,
+                                       self.params.bin_low.get(),
+                                       self.params.bin_high.get())
                         < self.params.thresh_hi):
                     print('CSPAD below threshold - TRACKING STOPPED')
                     self.requestInterruption()

diff --git a/jet_tracking/jt_utils.py b/jet_tracking/jt_utils.py
@@ -111,28 +111,33 @@ def fit_cspad(azav, norm, gas_det):
     return center, intensity
 
 
-def get_cspad(azav, r, gas_det):
+def get_cspad(azav, gas_det, bin_low, bin_high):
     """
     Get the intensity of the diffraction ring on the CSPAD.
 
+    The returned value is normalized to the intensity from the gas detector.
+
     Parameters
     ----------
     azav : ndarray
         Azimuthal average calculated from CSPAD.
 
-    r : int
-        Radius of diffraction ring.
-
     gas_det : float
         Gas detector intensity.
 
+    bin_low : int
+        The bin number of the lower bound of the intensity integration.
+
+    bin_high : int
+        The bin number of the upper bound of the intensity integration.
+
     Returns
     -------
     intensity : float
         Sum of 5 qbins above and below the center, normalized by gas detector.
     """
 
-    intensity = sum(azav[r - 5:r + 5]) / gas_det
+    intensity = sum(azav[bin_low:bin_high]) / gas_det
     return intensity