Merge pull request #1280 from slava77/comparisons-25Mar2020

updates in reco Comparisons: monitor PUPPI jets
cms-sw · Mar 26, 2020 · d410c81 · d410c81
2 parents 7e1a676 + e769a82
commit d410c81
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/comparisons/matrix_RE.txt b/comparisons/matrix_RE.txt
@@ -266,6 +266,10 @@ QCD13TeVFlatPt15s3000in2018wf10871p0 10871.0_QCD_FlatPt_15_3000HS_13+QCDForPF_13
 QCD13TeVFlatPt15s3000in2018nanoEDMwf10871p0 10871.0_QCD_FlatPt_15_3000HS_13+QCDForPF_13TeV_*_2018*_GenSimFull*+*/step6.root NANO
 RSKKGl3000in2018wf10873p0 10873.0_RSKKGluon_m3000GeV_13+RSKKGluon_m3000GeV_13TeV_*_2018*_GenSimFull*+*/step3.root RECO
 RSKKGl3000in2018nanoEDMwf10873p0 10873.0_RSKKGluon_m3000GeV_13+RSKKGluon_m3000GeV_13TeV_*_2018*_GenSimFull*+*/step6.root NANO
+ProdZEE13TeV2018wf1304p18 1304.18_ProdZEE_13UP18*/step3.root RECO
+ProdZEE13TeV2018miniAODwf1304p18 1304.18_ProdZEE_13UP18*/step4.root PAT
+ProdZEE13TeV2018bPwf1304p181 1304.181_ProdZEE_13UP18*bParking*/step3.root RECO
+ProdZEE13TeV2018bPminiAODwf1304p181 1304.181_ProdZEE_13UP18*bParking*/step4.root PAT
 #
 #  2018 MC with PU
 #
@@ -286,6 +290,8 @@ ProdTTbar13TeVPUpmx2018wf250202p118 250202.118_ProdTTbar_13*/step3.root RECO
 TTbar13TeV2019wf11624p0 11624.0_TTbar_13+TTbar_13TeV_*_2019*/step3.root RECO
 TTbar13TeV2021wf11624p0 11624.0_TTbar_13+TTbar_13TeV_*_2021_*/step3.root RECO
 TTbar14TeV2021wf11634p0 11634.0_TTbar_14TeV+TTbar_14TeV_*_2021_*/step3.root RECO
+ProdTTbar14TeV2021wf11634p21 11634.21_TTbar_14TeV*ProdLike_2021*/step3.root RECO
+ProdTTbar14TeV2021miniAODwf11634p21 11634.21_TTbar_14TeV*ProdLike_2021*/step4.root PAT
 TTbar14TeV2021wf11634p7 11634.7_TTbar_14TeV+TTbar_14TeV_*_2021_*/step3.root RECO
 TTbar14TeVPU2021wf11834p0 11834.0_TTbar_14TeV+TTbar_14TeV_*_2021PU_*/step3.root RECO
 TTbar14TeVPU2021nanoEDMwf11834p0 11834.0_TTbar_14TeV+TTbar_14TeV_*_2021PU_*/step5.root NANO
@@ -758,6 +764,8 @@ SingleMuPt10in2026D41wf20407p0 20407.0_SingleMuPt10+SingleMuPt10_pythia8_2026D41
 SingleMuPt1000in2026D41wf20409p0 20409.0_SingleMuPt1000+SingleMuPt1000_pythia8_2026D41_GenSim*+*/step3.root RECO
 TenMuExtendedE2026D41wf20411p0 20411.0_TenMuExtendedE_0_200+TenMuExtendedE_0_200_pythia8_2026D41_GenSim*+*/step3.root RECO
 TTbar14TeV2026D41wf20434p0 20434.0_TTbar_14TeV+TTbar_14TeV_*_2026D41_GenSim*+*/step3.root RECO
+ProdTTbar14TeV2026D41wf20434p21 20434.21_TTbar_14TeV+*ProdLike_2026D41*/step3.root RECO
+ProdTTbar14TeV2026D41miniAODwf20434p21 20434.21_TTbar_14TeV+*ProdLike_2026D41*/step4.root PAT
 ZEE14TeV2026D41wf20446p0 20446.0_ZEE_14+ZEE_14TeV_*_2026D41_GenSim*+*/step3.root RECO
 QCD600to800in14TeV2026D41wf20453p0 20453.0_QCD_Pt_600_800_14+QCD_Pt_600_800_14TeV_*_2026D41_GenSim*+*/step3.root RECO
 CloseByPhoton2026D41wf20493p52 20493.52_CloseByParticleGun+CloseByParticle_Photon_ERZRanges_2026D41_*/step3.root RECO

diff --git a/comparisons/validate.C b/comparisons/validate.C
@@ -332,17 +332,23 @@ void jets(TString type,TString algo){
 
   if (type == "patJets"){    
     PlotStats res = jet(type, algo, "userFloats_@.size");
+    TString jetBName = type+"_"+algo+(algo.Contains("_")? "_" : "__")+recoS;
     for (int i = 0; i< maxSize(res); ++i){
-      plotvar(type+"_"+algo+(algo.Contains("_")? "_" : "__")+recoS+Form(".obj[].userFloats_[%d]",i), "", true);
+      plotvar(jetBName+Form(".obj[].userFloats_[%d]",i), "", true);
     }
     res = jet(type, algo, "userInts_@.size");
     for (int i = 0; i< maxSize(res); ++i){
-      plotvar(type+"_"+algo+(algo.Contains("_")? "_" : "__")+recoS+Form(".obj[].userInts_[%d]",i), "", true);
+      plotvar(jetBName+Form(".obj[].userInts_[%d]",i), "", true);
     }
     jet(type, algo, "userCands_@.size");
     res = jet(type, algo, "pairDiscriVector_@.size");
     for (int i = 0; i< maxSize(res); ++i){
-      plotvar("min(2,max(-2,"+type+"_"+algo+(algo.Contains("_")? "_" : "__")+recoS+Form(".obj[].pairDiscriVector_[%d].second))",i), "", true);
+      plotvar("min(2,max(-2,"+jetBName+Form(".obj[].pairDiscriVector_[%d].second))",i), "", true);
+    }
+    if (algo.Contains("AK8")){//many discriminants are valid only for high pt
+      for (int i = 0; i< maxSize(res); ++i){
+        plotvar("min(2,max(-2,"+jetBName+Form(".obj[].pairDiscriVector_[%d].second))",i), jetBName+".obj[].pt()>200", true);
+      }
     }
   }
 }
@@ -3504,6 +3510,8 @@ void validateEvents(TString step, TString file, TString refFile, TString r="RECO
     }
 
     if (stepContainsNU(step, "all") || stepContainsNU(step, "jet")){
+      ///puppi info
+      plotvar("floatedmValueMap_puppi__"+recoS+".obj.values_");
 
       ///jet plots
       jets("recoCaloJets","iterativeCone5CaloJets");
@@ -3520,20 +3528,28 @@ void validateEvents(TString step, TString file, TString refFile, TString r="RECO
 
       jets("recoPFJets", "ak4PFJets");
       jets("recoPFJets", "ak4PFJetsCHS");
+      jets("recoPFJets", "ak4PFJetsPuppi");
       jets("recoPFJets", "ak8PFJets");
       jets("recoPFJets", "ak8PFJetsCHS");
-      jets("recoPFJets", "ak8PFJetsCHSSoftDrop");
+      jets("recoPFJets", "ak8PFJetsPuppi");
       jets("recoPFJets", "ca8PFJetsCHS");
 
       jets("recoPFJets", "ca8PFJetsCHSPruned_SubJets");
       jets("recoPFJets", "ak8PFJetsCHSPruned_SubJets");
+      jets("recoPFJets", "ak8PFJetsCHSSoftDrop_SubJets");
+      jets("recoPFJets", "ak8PFJetsPuppiSoftDrop_SubJets");
       jets("recoPFJets", "cmsTopTagPFJetsCHS_caTopSubJets");
 
       jets("recoBasicJets","ak7BasicJets"); //Castor jets
+      jets("recoBasicJets","ak5CastorJets");
+      jets("recoBasicJets","ak7CastorJets");
       jets("recoBasicJets","ca8PFJetsCHSPruned");
       jets("recoBasicJets","ak8PFJetsCHSPruned");
+      jets("recoBasicJets","ak8PFJetsCHSSoftDrop");
+      jets("recoBasicJets","ak8PFJetsPuppiSoftDrop");
       jets("recoBasicJets","cmsTopTagPFJetsCHS");
 
+
       jets("recoGenJets", "ak4GenJets");
       jets("recoGenJets", "slimmedGenJets");