Fix for trigger matching #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

valeriadamante wants to merge 49 commits into cms-flaf:main from valeriadamante:fix_for_triggerMatching

Analysis/H_mumu.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -156,15 +156,12 @@ def SaveVarsForNNInput(variables): @@
         return variables
-    def GetWeight(channel, process_name, muID_WP_for_SF, muIso_WP_for_SF):
+    def GetWeight(
+        channel, process_name, muID_WP_for_SF, muIso_WP_for_SF, enable_ID, enable_trigger
+    ):
         weights_to_apply = [
             "weight_base",
-            # "weight_XS",
-            # "newDYWeight_ptLL_nano"
-            # "newDYWeight_ptLL_bsConstrained"
-            # "weight_DYw_DYWeightCentral",
-            # "weight_EWKCorr_VptCentral",
-        ]  # ,"weight_EWKCorr_ewcorrCentral"] #
+        ]
         # quick fix for DY weights. In future should pass the full dataset and process info to DefineWeightForHistograms
         if process_name.startswith("DY"):
             weights_to_apply.extend(
@@ Expand All @@
         }
         # should be moved to config
-        weights_to_apply.extend(ID_weights_dict[channel])
-        weights_to_apply.extend(trg_weights_dict[channel])
+        if enable_ID:
+            weights_to_apply.extend(ID_weights_dict[channel])
+        if enable_trigger:
+            weights_to_apply.extend(trg_weights_dict[channel])
         total_weight = "*".join(weights_to_apply)
         # print(total_weight)
@@ Expand Down @@

Analysis/MuonRelatedFunctions.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -97,16 +97,18 @@ def GetMuMuMassResolution(df, pt_to_use): @@
     def GetMuMuP4Observables(df):
         for mu_idx in [1, 2]:  # tmp patch for back compatibility with old AnaTuples
             if f"mu{mu_idx}_bsConstrainedPt" in df.GetColumnNames():
-                if f"mu{mu_idx}_pt_bsConstrained" not in df.GetColumnNames():
+                if f"mu{mu_idx}_pt_bsConstrainedPt" not in df.GetColumnNames():
+                    # print(f"defining mu{mu_idx}_pt_bsConstrainedPt" )
                     df = df.Define(
-                        f"mu{mu_idx}_pt_bsConstrained", f"mu{mu_idx}_bsConstrainedPt"
+                        f"mu{mu_idx}_pt_bsConstrainedPt", f"mu{mu_idx}_bsConstrainedPt"
                     )
         pt_def = [col for col in df.GetColumnNames() if f"mu1_pt_" in col]
         # print(f"pt defined are: {pt_def}")
         muon_p4_to_define = list(set(["_".join(pt.split("_")[2:]) for pt in pt_def]))
         # print(f"suffixes are : {muon_p4_to_define}")
         for pt_suffix in muon_p4_to_define:
             for idx in [0, 1]:
+                # print(f"defining mu{idx+1}_p4_{pt_suffix}")
                 df = df.Define(
                     f"mu{idx+1}_p4_{pt_suffix}",
                     f"ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double>>(mu{idx+1}_pt_{pt_suffix},mu{idx+1}_eta,mu{idx+1}_phi,mu{idx+1}_mass)",
@@ Expand Down @@

Analysis/histTupleDef.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -104,10 +104,10 @@ def DefineWeightForHistograms(
  
                return_variations=is_central and global_params["compute_unc_histograms"],

                use_genWeight_sign_only=True,

            )

            defineTriggerWeights(

                dfw, global_params.get("mu_pt_for_triggerMatchingAndSF", "pt_nano")

            )

            if "trigger" in corrections.to_apply.keys():

                defineTriggerWeights(

                    dfw, global_params.get("mu_pt_for_triggerMatchingAndSF", "pt_nano")

                )

            if (

                df_is_central

                and global_params["compute_unc_histograms"]

    @@ -126,9 +126,17 @@ def DefineWeightForHistograms(
  
        isCentral = uncName == "Central"

        muID_WP_for_SF = global_params.get("muIDWP", "Loose")

        muIso_WP_for_SF = global_params.get("muIsoWP", "Medium")

        enable_trigger = "trigger" in corrections.to_apply.keys()

        enable_ID = "mu" in corrections.to_apply.keys()

        total_weight_expression = (

            analysis.GetWeight("muMu", process_name, muID_WP_for_SF, muIso_WP_for_SF)

            analysis.GetWeight(

                "muMu",

                process_name,

                muID_WP_for_SF,

                muIso_WP_for_SF,

                enable_trigger=enable_trigger,

                enable_ID=enable_ID,

            )

            if process_group != "data"

            else "1"

        )  # are we sure?

config/global.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -263,7 +263,7 @@ corrections: @@
         extraFormat:
           pt: "bsConstrainedPt"
       muScaRe:
-        stage: AnaTuple # later it will become anaTuple.
+        stage: AnaTuple
         # stage: HistTuple # later it will become anaTuple.
         mu_pt_for_ScaReApplication: "bsConstrainedPt"
       lumi: { stage: AnaTuple }
@@ Expand Down @@

config/processes.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,17 +3,15 @@
  
        module: FLAF.Processors.MCStitching

        class: MCStitcher

        config: FLAF/config/Processors/stitching_DY_amcatnlo_Vpt_NpNLO_allFlavors.yaml

        stages: [ AnaCache, AnaTuple ]

        stages: [ AnaTuple, AnaTupleMerge ]

        dependency_level:

          AnaCache: dataset

          AnaTuple: process

    .DY_processors_singleFlavor: &DY_processors_singleFlavor

      - name: Stitcher

        module: FLAF.Processors.MCStitching

        class: MCStitcher

        config: FLAF/config/Processors/stitching_DY_amcatnlo_Vpt_NpNLO_singleFlavor.yaml

        stages: [ AnaCache, AnaTuple ]

        config: FLAF/config/Processors/stitching_DY_amcatnlo_Vpt_NpNLO.yaml

        stages: [ AnaTuple, AnaTupleMerge ]

        dependency_level:

          AnaCache: dataset

          AnaTuple: process

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix for trigger matching #39

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Fix for trigger matching #39

Are you sure you want to change the base?

Uh oh!

Fix for trigger matching #39

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing