Small cleanup and removal of pyarrow dependency (#836)

* Remove clashing pyarrow from dependencies * Small code fixes * Remove unused variables from multiprocesser
alisw · Nov 29, 2023 · c025c0a · c025c0a
1 parent e9fc860
commit c025c0a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/machine_learning_hep/multiprocesser.py b/machine_learning_hep/multiprocesser.py
@@ -105,8 +105,6 @@ def __init__(self, case, proc_class, datap, typean, run_param, mcordata):
         self.d_results = [self.d_prefix_res + p for p in dp["results"]]
         self.d_resultsallp = self.d_prefix_res + dp["resultsallp"]
 
-        self.lpt_probcutpre = datap["mlapplication"]["probcutpresel"]
-        self.lpt_probcut = datap["mlapplication"]["probcutoptimal"]
         self.f_evt_mergedallp = os.path.join(self.d_pklevt_mergedallp, self.n_evt)
         self.f_evtorig_mergedallp = \
                  os.path.join(self.d_pklevt_mergedallp, self.n_evtorig)

diff --git a/machine_learning_hep/steer_analysis.py b/machine_learning_hep/steer_analysis.py
@@ -341,8 +341,7 @@ def do_entire_analysis(data_config: dict, data_param: dict, data_param_overwrite
 
     if doml is True:
         from machine_learning_hep.optimiser import Optimiser # pylint: disable=import-outside-toplevel
-        index = 0
-        for binmin, binmax in zip(binminarray, binmaxarray):
+        for index, (binmin, binmax) in enumerate(zip(binminarray, binmaxarray)):
             myopt = Optimiser(data_param[case], case, typean,
                               data_model[mltype], binmin, binmax,
                               raahp[index], training_vars[index], index)
@@ -380,7 +379,6 @@ def do_entire_analysis(data_config: dict, data_param: dict, data_param_overwrite
                 myopt.do_significance()
             if doscancuts is True:
                 myopt.do_scancuts()
-            index = index + 1
 
     if doapplydata is True:
         mymultiprocessdata.multi_apply_allperiods()

diff --git a/requirements.txt b/requirements.txt
@@ -54,7 +54,6 @@ Pillow==9.4.0
 platformdirs==3.1.1
 protobuf==3.19.6
 py4j==0.10.9.7
-pyarrow==11.0.0
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pylint==2.17.0

diff --git a/setup.py b/setup.py
@@ -73,7 +73,7 @@
                      "seaborn>=0.11.1", "uproot>=3.4.18", "scikit-learn>=0.20.3", "xgboost>=0.90",
                      "keras>=2.3.1", "tensorflow>=2.3.1", "PyYaml>=5.1", "pylint",
                      "twisted>=19.2.0", "klein>=17.10.0", "Jinja2>=2.10.3", "numba>=0.48.0",
-                     "pyarrow>=0.13.0", "lz4>=2.1.10", "hyperopt>=0.2.3", "shap>=v0.23.0"],
+                     "lz4>=2.1.10", "hyperopt>=0.2.3", "shap>=v0.23.0"],
 
   python_requires='>=3.6',