Make processor run for incl. jets

Author: qgp

machine_learning_hep/data/data_run3/database_ml_parameters_Jet_pp.yml

@@ -576,55 +576,55 @@ Jet_pp:
                         [-.1, .0, .05, .1, .15, .2, .25, .3, .35, .4, .45, .5]
                     label: "#it{R}_{g}"
                     label_y: "(1/#it{N}_{jet ch}) d#it{N}/d#it{R}_{g}"
-                zpar:
-                    # bins_gen_fix: [10, 0., 1.]
-                    # bins_det_fix: [10, 0., 1.]
-                    bins_gen_var:
-                        [
-                            0.2,
-                            0.25,
-                            0.3,
-                            0.35,
-                            0.4,
-                            0.45,
-                            0.5,
-                            0.55,
-                            0.6,
-                            0.65,
-                            0.7,
-                            0.75,
-                            0.8,
-                            0.85,
-                            0.9,
-                            0.95,
-                            1.,
-                        ]
-                    bins_det_var:
-                        [
-                            0.2,
-                            0.25,
-                            0.3,
-                            0.35,
-                            0.4,
-                            0.45,
-                            0.5,
-                            0.55,
-                            0.6,
-                            0.65,
-                            0.7,
-                            0.75,
-                            0.8,
-                            0.85,
-                            0.9,
-                            0.95,
-                            1.,
-                        ]
-                    label: "#it{z}_{#parallel}"
-                    label_y: "(1/#it{N}_{jet ch}) d#it{N}/d#it{z}_{#parallel}"
-                dr:
-                    bins_gen_fix: [10, 0., 1.]
-                    bins_det_fix: [10, 0., 1.]
-                    label: "#Delta#it{r}"
+                # zpar:
+                #     # bins_gen_fix: [10, 0., 1.]
+                #     # bins_det_fix: [10, 0., 1.]
+                #     bins_gen_var:
+                #         [
+                #             0.2,
+                #             0.25,
+                #             0.3,
+                #             0.35,
+                #             0.4,
+                #             0.45,
+                #             0.5,
+                #             0.55,
+                #             0.6,
+                #             0.65,
+                #             0.7,
+                #             0.75,
+                #             0.8,
+                #             0.85,
+                #             0.9,
+                #             0.95,
+                #             1.,
+                #         ]
+                #     bins_det_var:
+                #         [
+                #             0.2,
+                #             0.25,
+                #             0.3,
+                #             0.35,
+                #             0.4,
+                #             0.45,
+                #             0.5,
+                #             0.55,
+                #             0.6,
+                #             0.65,
+                #             0.7,
+                #             0.75,
+                #             0.8,
+                #             0.85,
+                #             0.9,
+                #             0.95,
+                #             1.,
+                #         ]
+                #     label: "#it{z}_{#parallel}"
+                #     label_y: "(1/#it{N}_{jet ch}) d#it{N}/d#it{z}_{#parallel}"
+                # dr:
+                #     bins_gen_fix: [10, 0., 1.]
+                #     bins_det_fix: [10, 0., 1.]
+                #     label: "#Delta#it{r}"
                 lntheta:
                     bins_gen_fix: [10, 0., 5.]
                     bins_det_fix: [10, 0., 5.]
@@ -963,7 +963,7 @@ Jet_pp:
             efficiency:
                 # extra_cols: ["isd0", "isd0bar", "seld0", "seld0bar"]
                 # filter_det: "(isd0 & seld0) or (isd0bar & seld0bar)"
-                index_match: fIndexArrayD0CMCPJETOS_geo
+                index_match: fIndexArrayCMCPJETOS_geo
                 correction_method: run3
 
             unfolding_iterations: 8 # used, maximum iteration

machine_learning_hep/processer_jet.py

@@ -123,6 +123,12 @@ def _verify_variables(self, dfi):
     def _calculate_variables(self, df, verify=False): # pylint: disable=invalid-name
         self.logger.info('calculating variables')
         if len(df) == 0:
+            df['nsub21'] = None
+            df['zg'] = None
+            df['rg'] = None
+            df['nsd'] = None
+            df['lnkt'] = None
+            df['lntheta'] = None
             return df
         df['nsub21'] = df.fNSub2 / df.fNSub1
         self.logger.debug('zg')
@@ -386,6 +392,7 @@ def process_efficiency_single(self, index):
                 if f := self.cfg('closure.exclude_feeddown_gen'):
                     self.logger.debug('excluding feeddown gen')
                     dfquery(df_mcana, f, inplace=True)
+                self.logger.info("Filling histo from %s", df_mcana)
                 fill_hist(h_mctruth[(cat, var)], df_mcana[['fJetPt_gen', 'fPt_gen', f'{var}_gen']])
 
                 if cat in dfmatch and dfmatch[cat] is not None: