Prepare for further jet types (alisw#964)

* Prepare for inclusive and JPsi jets

* Fixes for inclusive jets

* Update for inclusive jets

* Make processor run for incl. jets

* Update for inclusive jets

* Generalize changes for inclusive jets

* Update

* Fix pylint

Author: qgp

machine_learning_hep/analysis/analyzer_jets.py

@@ -404,6 +404,9 @@ def _fit_mass(self, hist, filename = None):
 
     # pylint: disable=too-many-branches,too-many-statements
     def fit(self):
+        if not self.cfg('hfjet', True):
+            self.logger.info("Not fitting mass distributions for inclusive jets")
+            return
         self.logger.info("Fitting inclusive mass distributions")
         gStyle.SetOptFit(1111)
         for level in self.fit_levels:
@@ -738,7 +741,9 @@ def _analyze(self, method = 'sidesub'):
                             # Signal extraction
                             self.logger.info("Signal extraction (method %s): obs. %s, %s, ipt %d",
                                              method, var, mcordata, ipt)
-                            if method == 'sidesub':
+                            if not self.cfg('hfjet', True):
+                                h = project_hist(h_in, axes_proj[1:], {})
+                            elif method == 'sidesub':
                                 h = self._subtract_sideband(h_in, var, mcordata, ipt)
                             elif method == 'sigextr':
                                 h = self._extract_signal(h_in, var, mcordata, ipt)