@@ -143,6 +143,7 @@ def __init__(
143143 self .n_evt = datap ["files_names" ]["namefile_evt" ]
144144 self .n_collcnt = datap ["files_names" ].get ("namefile_collcnt" )
145145 self .n_bccnt = datap ["files_names" ].get ("namefile_bccnt" )
146+ self .n_wgt = datap ["files_names" ].get ("namefile_wgt" , None )
146147 self .n_evtorig = datap ["files_names" ].get ("namefile_evtorig" )
147148 self .n_evt_count_ml = datap ["files_names" ].get ("namefile_evt_count" , "evtcount.yaml" )
148149 self .n_gen = datap ["files_names" ]["namefile_gen" ]
@@ -195,6 +196,7 @@ def __init__(
195196 self .l_evtorig = createlist (self .d_pkl , self .l_path , self .n_evtorig )
196197 self .l_collcnt = createlist (self .d_pkl , self .l_path , self .n_collcnt ) if self .datatype != "fd" else None
197198 self .l_bccnt = createlist (self .d_pkl , self .l_path , self .n_bccnt ) if self .datatype != "fd" else None
199+ self .l_wgt = createlist (self .d_pkl , self .l_path , self .n_wgt ) if self .datatype == "fd" and self .n_wgt else None
198200 self .l_histomass = createlist (self .d_results , self .l_path , self .n_filemass )
199201 self .l_histoeff = createlist (self .d_results , self .l_path , self .n_fileeff )
200202 # self.l_historesp = createlist(self.d_results, self.l_path, self.n_fileresp)
@@ -384,6 +386,8 @@ def dfread(rdir, trees, cols, idx_name=None):
384386 trees = [trees ]
385387 cols = [cols ]
386388 # if all(type(var) is str for var in vars): vars = [vars]
389+ if not all ((name in rdir for name in trees )):
390+ self .logger .critical ("Missing trees: %s" , trees )
387391 df = None
388392 for tree , col in zip ([rdir [name ] for name in trees ], cols ):
389393 try :
@@ -536,10 +540,13 @@ def dfuse(df_spec):
536540 for df_name , df_spec in self .df_write .items ():
537541 if dfuse (df_spec ):
538542 src = df_spec .get ("source" , df_name )
539- dfo = dfquery (dfs [src ], df_spec .get ("filter" , None ))
540- path = os .path .join (self .d_pkl , self .l_path [file_index ], df_spec ["file" ])
541- self .logger .info ("writing %s to %s with info %s" , df_name , path , dfo .info ())
542- write_df (dfo , path )
543+ if src in dfs :
544+ dfo = dfquery (dfs [src ], df_spec .get ("filter" , None ))
545+ path = os .path .join (self .d_pkl , self .l_path [file_index ], df_spec ["file" ])
546+ self .logger .info ("writing %s to %s with info %s" , df_name , path , dfo .info ())
547+ write_df (dfo , path )
548+ else :
549+ self .logger .error ("could not write tree, missing source %s" , src )
543550
544551 def skim (self , file_index ):
545552 dfreco = read_df (self .l_reco [file_index ]) if self .datatype != "fd" else None
0 commit comments