update stx-machinery

configs/dqcd/plots.yml

@@ -46,7 +46,7 @@ contours:
 ROC:
   active: true
   num_bootstrap: 200
-  xmin: 1.0E-5
+  xmin: 1.0E-6
   set_filter: *FILTER
 
 ## Binned ROC plots can be 1D or 2D

configs/dqcd/plots_new.yml

@@ -12,12 +12,12 @@ FILTER: &FILTER
     expand: 'set'    # 'set', 'vetoset' or 'powerset'
     cutset:
       # Latex description is for boolean [0,1] per cut
-      [{cut: 'GEN_mpi == 1  && GEN_mA == 0.33', latex: ['$\neq(m_\pi = 1  & m_A = 0.33)$', '$m_\pi = 1  & m_A = 0.33$']},
-       {cut: 'GEN_mpi == 2  && GEN_mA == 0.67', latex: ['$\neq(m_\pi = 2  & m_A = 0.67)$', '$m_\pi = 2  & m_A = 0.67$']},
-       {cut: 'GEN_mpi == 4  && GEN_mA == 0.40', latex: ['$\neq(m_\pi = 4  & m_A = 0.40)$', '$m_\pi = 4  & m_A = 0.40$']},
-       {cut: 'GEN_mpi == 4  && GEN_mA == 1.33', latex: ['$\neq(m_\pi = 4  & m_A = 1.33)$', '$m_\pi = 4  & m_A = 1.33$']},
-       {cut: 'GEN_mpi == 10 && GEN_mA == 1.00', latex: ['$\neq(m_\pi = 10 & m_A = 1.00)$', '$m_\pi = 10 & m_A = 1.00$']},
-       {cut: 'GEN_mpi == 10 && GEN_mA == 3.33', latex: ['$\neq(m_\pi = 10 & m_A = 3.33)$', '$m_\pi = 10 & m_A = 3.33$']}]
+      [{cut: 'GEN_mpi == 1  && GEN_mA == 0.33', latex: ['$\neq(m_\pi = 1$  & $m_A = 0.33)$', '$m_\pi = 1$  & $m_A = 0.33$']},
+       {cut: 'GEN_mpi == 2  && GEN_mA == 0.67', latex: ['$\neq(m_\pi = 2$  & $m_A = 0.67)$', '$m_\pi = 2$  & $m_A = 0.67$']},
+       {cut: 'GEN_mpi == 4  && GEN_mA == 0.40', latex: ['$\neq(m_\pi = 4$  & $m_A = 0.40)$', '$m_\pi = 4$  & $m_A = 0.40$']},
+       {cut: 'GEN_mpi == 4  && GEN_mA == 1.33', latex: ['$\neq(m_\pi = 4$  & $m_A = 1.33)$', '$m_\pi = 4$  & $m_A = 1.33$']},
+       {cut: 'GEN_mpi == 10 && GEN_mA == 1.00', latex: ['$\neq(m_\pi = 10$ & $m_A = 1.00)$', '$m_\pi = 10$ & $m_A = 1.00$']},
+       {cut: 'GEN_mpi == 10 && GEN_mA == 3.33', latex: ['$\neq(m_\pi = 10$ & $m_A = 3.33)$', '$m_\pi = 10$ & $m_A = 3.33$']}]
 
   set[1]:
     expand: 'set'    # 'set', 'vetoset' or 'powerset'
@@ -46,7 +46,7 @@ contours:
 ROC:
   active: true
   num_bootstrap: 200
-  xmin: 1.0E-5
+  xmin: 1.0E-6
   set_filter: *FILTER
 
 ## Binned ROC plots can be 1D or 2D

configs/eid/mctargets.py

@@ -11,7 +11,7 @@ def target_e(X, ids, xcorr_flow=False):
     """ Classification signal target """
 
     # Define cuts
-    cutlist = [f'BOOL@is_e== True']
+    cutlist = [f'BOOL@is_e == True']
 
     # Construct and apply
     cuts, names = stx.construct_columnar_cuts(X=X, ids=ids, cutlist=cutlist)

icenet/tools/stx.py

@@ -517,6 +517,10 @@ def is_in(a, b):
             f = lambda x : 1.0/x
         elif func_name == 'BOOL':
             f = lambda x : x.astype(bool)
+        elif func_name == 'FLOAT':
+            f = lambda x : x.astype(float)
+        elif func_name == 'INT':
+            f = lambda x : x.astype(int)
         else:
             raise Exception(__name__ + f'.eval_boolean_exptree: Unknown function {func_name}')
 
@@ -525,20 +529,23 @@ def is_in(a, b):
 
     # Middle binary operators g(x,y)
     if   operator == '<':
-        g = lambda x,y : x  < float(y)
+        g = lambda x,y : x  < y
     elif operator == '>':
-        g = lambda x,y : x  > float(y)
+        g = lambda x,y : x  > y
     elif operator == '<=':
-        g = lambda x,y : x <= float(y)
+        g = lambda x,y : x <= y
     elif operator == '>=':
-        g = lambda x,y : x >= float(y)
+        g = lambda x,y : x >= y
     elif operator == '!=':
-        g = lambda x,y : x != int(y)
+        g = lambda x,y : ~np.isclose(x,y) # use default tolerance
     elif operator == '==':
-        g = lambda x,y : x == int(y)
+        g = lambda x,y :  np.isclose(x,y)
     else:
         raise Exception(__name__ + f'.eval_boolean_exptree: Unknown binary operator "{operator}"')
-
+
+    if isinstance(rhs, str):
+        rhs = float(rhs)
+
     # Evaluate
     return g(f(X[:, ind]), rhs)