initial commit 2

src/pygama/flow/data_loader.py

@@ -605,16 +605,22 @@ def build_entry_list(
 
             # Perform cuts specified for child or parent level, in that order
             for level in [child, parent]:
-                if self.cuts is None or level not in self.cuts.keys():
-                    continue
-                cut = self.cuts[level]
+                # Extract the cut condition if given, otherwise set to ""
+                cut = ""
+                if self.cuts is not None:
+                    if level in self.cuts.keys():
+                        cut = self.cuts[level]
+
                 col_tiers = self.get_tiers_for_col(cut_cols[level], merge_files=False)
 
                 # Tables in first tier of event should be the same for all tiers in one level
                 tables = self.filedb.df.loc[file, f"{self.tiers[level][0]}_tables"]
                 if self.table_list is not None:
                     if level in self.table_list.keys():
                         tables = self.table_list[level]
+                    else:
+                        continue
+
                 # Cut any rows of TCM not relating to requested tables
                 if level == parent:
                     f_entries.query(f"{level}_table in {tables}", inplace=True)