diff --git a/higgs_dna/workflows/HHbbgg.py b/higgs_dna/workflows/HHbbgg.py index c761f67391212029e83ebb87f14097ed7e24c497..4386c566981cac0ca89c458dd2a82f19353e0649 100755 --- a/higgs_dna/workflows/HHbbgg.py +++ b/higgs_dna/workflows/HHbbgg.py @@ -47,6 +47,8 @@ class HHbbggProcessor(HggBaseProcessor): apply_trigger: bool = False, output_location: Optional[str] = None, taggers: Optional[List[Any]] = None, + trigger_group=".*DoubleEG.*", + analysis="mainAnalysis", skipCQR: bool = False, skipJetVetoMap: bool = False, year: Dict[str, List[str]] = None, @@ -63,8 +65,8 @@ class HHbbggProcessor(HggBaseProcessor): apply_trigger=apply_trigger, output_location=output_location, taggers=taggers, - trigger_group=".*DoubleEG.*", - analysis="mainAnalysis", + trigger_group=trigger_group, + analysis=analysis, skipCQR=skipCQR, skipJetVetoMap=skipJetVetoMap, year=year, @@ -74,8 +76,6 @@ class HHbbggProcessor(HggBaseProcessor): doFlow_corrections=doFlow_corrections, output_format=output_format ) - self.trigger_group = ".*DoubleEG.*" - self.analysis = "mainAnalysis" self.num_fatjets_to_store = 4 self.num_leptons_to_store = 4 diff --git a/higgs_dna/workflows/Zmmy.py b/higgs_dna/workflows/Zmmy.py index e6008befc0e0f57f4bc752fff269bf63a77ad505..4a2da48755776eac2b6104fb4e38c1238d3ae6f9 100644 --- a/higgs_dna/workflows/Zmmy.py +++ b/higgs_dna/workflows/Zmmy.py @@ -44,6 +44,8 @@ class ZmmyProcessor(HggBaseProcessor): apply_trigger: bool = False, output_location: Optional[str] = None, taggers: Optional[List[Any]] = None, + trigger_group=".*DoubleMuon.*", + analysis="ZmmyAnalysis", skipCQR: bool = False, skipJetVetoMap: bool = False, year: Dict[str, List[str]] = None, @@ -60,8 +62,8 @@ class ZmmyProcessor(HggBaseProcessor): apply_trigger=apply_trigger, output_location=output_location, taggers=taggers, - trigger_group=".*DoubleMuon.*", - analysis="ZmmyAnalysis", + trigger_group=trigger_group, + analysis=analysis, skipCQR=skipCQR, skipJetVetoMap=skipJetVetoMap, year=year, diff --git a/higgs_dna/workflows/dystudies.py b/higgs_dna/workflows/dystudies.py index a1d2667db84a9aaa1c83be88bdfc23edd20c4975..e18357abcaff302f789c1ae1e27a4286844f1d18 100644 --- a/higgs_dna/workflows/dystudies.py +++ b/higgs_dna/workflows/dystudies.py @@ -30,6 +30,8 @@ class DYStudiesProcessor(HggBaseProcessor): apply_trigger: bool = False, output_location: Optional[str] = None, taggers: Optional[List[Any]] = None, + trigger_group: str = ".*DoubleEG.*", + analysis: str = "mainAnalysis", skipCQR: bool = False, skipJetVetoMap: bool = False, year: Dict[str, List[str]] = None, @@ -46,8 +48,8 @@ class DYStudiesProcessor(HggBaseProcessor): apply_trigger=apply_trigger, output_location=output_location, taggers=taggers, - trigger_group=".*DoubleEG.*", - analysis="mainAnalysis", + trigger_group=trigger_group, + analysis=analysis, skipCQR=skipCQR, skipJetVetoMap=skipJetVetoMap, year=year, @@ -57,8 +59,6 @@ class DYStudiesProcessor(HggBaseProcessor): doFlow_corrections=doFlow_corrections, output_format=output_format ) - self.trigger_group = ".*DoubleEG.*" - self.analysis = "mainAnalysis" def process_extra(self, events: ak.Array) -> ak.Array: return events, {} @@ -76,6 +76,8 @@ class TagAndProbeProcessor(HggBaseProcessor): apply_trigger: bool = False, output_location: Optional[str] = None, taggers: Optional[List[Any]] = None, + trigger_group: str = ".*SingleEle.*", + analysis: str = "tagAndProbe", skipCQR: bool = False, skipJetVetoMap: bool = False, year: Optional[Dict[str, List[str]]] = None, @@ -103,8 +105,6 @@ class TagAndProbeProcessor(HggBaseProcessor): doFlow_corrections=doFlow_corrections, output_format=output_format ) - self.trigger_group = ".*SingleEle.*" - self.analysis = "tagAndProbe" self.prefixes = {"tag": "tag", "probe": "probe"} diff --git a/higgs_dna/workflows/particleLevel.py b/higgs_dna/workflows/particleLevel.py index 96246f798b17e2827b575a023182c49052d53439..01a6b9e4a41d5509d980ee4cc4d00f1c0d2a2010 100644 --- a/higgs_dna/workflows/particleLevel.py +++ b/higgs_dna/workflows/particleLevel.py @@ -25,6 +25,8 @@ class ParticleLevelProcessor(HggBaseProcessor): apply_trigger: bool = False, output_location: Optional[str] = None, taggers: Optional[List[Any]] = None, + trigger_group=".*DoubleEG.*", + analysis="mainAnalysis", skipCQR: bool = False, skipJetVetoMap: bool = False, year: Dict[str, List[str]] = None, @@ -41,8 +43,8 @@ class ParticleLevelProcessor(HggBaseProcessor): apply_trigger=apply_trigger, output_location=output_location, taggers=taggers, - trigger_group=".*DoubleEG.*", - analysis="mainAnalysis", + trigger_group=trigger_group, + analysis=analysis, skipCQR=skipCQR, skipJetVetoMap=skipJetVetoMap, year=year, @@ -52,8 +54,6 @@ class ParticleLevelProcessor(HggBaseProcessor): doFlow_corrections=doFlow_corrections, output_format=output_format ) - self.trigger_group = ".*DoubleEG.*" - self.analysis = "mainAnalysis" def process_extra(self, events: awkward.Array) -> awkward.Array: return events, {} diff --git a/higgs_dna/workflows/top.py b/higgs_dna/workflows/top.py index 5593cf7f8b1091ded82ce4376f40bb216b273fc3..e207aeef8cbf5d38104f14d136b474b4553e4d88 100644 --- a/higgs_dna/workflows/top.py +++ b/higgs_dna/workflows/top.py @@ -42,6 +42,8 @@ class TopProcessor(HggBaseProcessor): # type: ignore apply_trigger: bool = False, output_location: Optional[str] = None, taggers: Optional[List[Any]] = None, + trigger_group=".*DoubleEG.*", + analysis="mainAnalysis", skipCQR: bool = False, skipJetVetoMap: bool = False, year: Dict[str, List[str]] = None, @@ -58,8 +60,8 @@ class TopProcessor(HggBaseProcessor): # type: ignore apply_trigger=apply_trigger, output_location=output_location, taggers=taggers, - trigger_group=".*DoubleEG.*", - analysis="mainAnalysis", + trigger_group=trigger_group, + analysis=analysis, skipCQR=skipCQR, skipJetVetoMap=skipJetVetoMap, year=year, @@ -69,8 +71,6 @@ class TopProcessor(HggBaseProcessor): # type: ignore doFlow_corrections=doFlow_corrections, output_format=output_format ) - self.trigger_group = ".*DoubleEG.*" - self.analysis = "mainAnalysis" def process_extra(self, events: ak.Array) -> ak.Array: return events, {} @@ -343,6 +343,7 @@ class TopProcessor(HggBaseProcessor): # type: ignore "btagDeepFlav_CvB": Jets.btagDeepFlavCvB, "btagDeepFlav_CvL": Jets.btagDeepFlavCvL, "btagDeepFlav_QG": Jets.btagDeepFlavQG, + "jetId": Jets.jetId, } ) jets = ak.with_name(jets, "PtEtaPhiMCandidate")