Merge branch 'master' into feature/qcd_hist_hook

hbt/weight/default.py

@@ -31,6 +31,8 @@ def default(self: WeightProducer, events: ak.Array, **kwargs) -> ak.Array:
 
 @default.init
 def default_init(self: WeightProducer) -> None:
+    dataset_inst = getattr(self, "dataset_inst", None)
+
     # use the config's auxiliary event_weights, drop some of them based on drop_weights, and on this
     # weight producer instance, store weight_columns, used columns, and shifts
     self.weight_columns = []
@@ -40,13 +42,15 @@ def default_init(self: WeightProducer) -> None:
     do_drop = pattern_matcher(self.drop_weights) if self.drop_weights else (lambda _, /: False)
 
     # collect all possible weight columns and affected shifts
-    all_weights = self.config_inst.x.event_weights | self.dataset_inst.x("event_weights", {})
+    all_weights = self.config_inst.x.event_weights
+    if dataset_inst:
+        all_weights.update(dataset_inst.x("event_weights", {}))
     for weight_name, shift_insts in all_weights.items():
         if not do_keep(weight_name) or do_drop(weight_name):
             continue
 
         # manually skip pdf and scale weights for samples that do not have lhe info
-        if getattr(self, "dataset_inst", None) is not None:
+        if dataset_inst:
             is_lhe_weight = any(shift_inst.has_tag("lhe_weight") for shift_inst in shift_insts)
             if is_lhe_weight and self.dataset_inst.has_tag("no_lhe_weights"):
                 continue