Update for HF jet derived data

alisw · Feb 28, 2024 · b66319b · b66319b
1 parent d18102f
commit b66319b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/machine_learning_hep/data/data_run3/database_ml_parameters_D0pp_jet.yml b/machine_learning_hep/data/data_run3/database_ml_parameters_D0pp_jet.yml
@@ -14,6 +14,7 @@
 
 D0pp_jet:
   nprongs: 2
+  prongformultsub: [1,1]
   doml: false
   mass: 1.864
   sel_reco_unp: "fPt > 1."
@@ -66,7 +67,7 @@ D0pp_jet:
         index: fIndexHfD0Bases_0
         trees:
           O2hfd0base: [fIndexHfD0CollBases, fPt, fEta, fPhi, fM]
-          O2hfd0mc: [fFlagMcMatchRec, fOriginMcRec]
+            # O2hfd0mc: [fFlagMcMatchRec, fOriginMcRec]
           O2hfd0par: [fCpa, fCpaXY, fChi2PCA,
                       fDecayLength, fDecayLengthXY, fDecayLengthNormalised, fDecayLengthXYNormalised,
                       fImpactParameter0, fImpactParameter1,
@@ -124,20 +125,20 @@ D0pp_jet:
 
       colldata:
         level: data
-        index: fIndexD0ChargedJetCollisionOutputs
+        index: fIndexD0CJetCOs
         trees:
-          O2d0mcdco: [fPosZ, fCentrality, fEventSel]
+          O2d0cjetco: [fPosZ, fCentrality, fEventSel]
       jetdata:
         level: data
-        index: fIndexD0JetOutputs
+        index: fIndexD0CJetOs
         trees:
-          O2d0mcdo: [fIndexD0ChargedJetCollisionOutputs, fIndexHfD0Bases_0,
+          O2d0cjeto: [fIndexD0CJetCOs, fIndexHfD0Bases_0,
                     fJetPt, fJetPhi, fJetEta, fJetNConstituents]
       jetsubdata:
         level: data
         index: fIndexD0JetSubstructures
         trees:
-          O2d0mcdsso: [fIndexD0ChargedJetOutputs, fZg, fRg, fNsd]
+          O2d0cjetsso: [fIndexD0CJetOs, fEnergyMother, fPtLeading, fPtSubLeading, fTheta]
 
     merge:
       - {base: jetgen, ref: collgen}
@@ -237,8 +238,8 @@ D0pp_jet:
       seedmerge: [12] #list of periods
       period: [LHC22o] #list of periods
       select_period: [1]
-      prefix_dir: /data2/MLhep/real/train_131050/
-      unmerged_tree_dir: [alice/cern.ch/user/a/alihyperloop/jobs/0024/] #list of periods
+      prefix_dir: /data2/MLhep/real/train_172207/
+      unmerged_tree_dir: [alice/cern.ch/user/a/alihyperloop/jobs/0032/] #list of periods
       pkl: [d0jet/pkl] #list of periods
       pkl_skimmed: [d0jet/pklsk] #list of periods
       pkl_skimmed_merge_for_ml: [d0jet/pklskml] #list of periods

diff --git a/machine_learning_hep/processer.py b/machine_learning_hep/processer.py
@@ -297,7 +297,8 @@ def dfread(rdir, trees, cols, idx_name=None):
                         dfnew = pd.DataFrame(columns=col, data=data)
                         df = pd.concat([df, dfnew], axis=1)
                     except Exception as e: # pylint: disable=broad-except
-                        self.logger.critical('Failed to read data frame from tree %s', str(e))
+                        tree.show()
+                        self.logger.critical('Failed to read data frame from tree %s: %s', tree.name, str(e))
                         sys.exit()
                 df['df'] = int(df_no)
                 if idx_name: