Skip to content
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.

Sign up for GitHub

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

[12.5.X] Update to sqrt(s) in the PV alignment validation plotting macros #39566

Merged
merged 2 commits into from
Oct 2, 2022
Merged

[12.5.X] Update to sqrt(s) in the PV alignment validation plotting macros #39566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b179db
update to sqrt(s)=13.6TeV in the PV alignment validation plotting macros
mmusich Sep 30, 2022
41c750e
add name to testPVPlotting test
mmusich Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Alignment/OfflineValidation/macros/CMS_lumi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ TString lumi_13TeV = "20.1 fb^{-1}";
TString lumi_8TeV = "19.7 fb^{-1}";
TString lumi_7TeV = "5.1 fb^{-1}";
TString lumi_0p9TeV = "";
TString lumi_13p6TeV = "";
TString lumi_sqrtS = "";
bool drawLogo = false;

Expand Down Expand Up @@ -92,6 +93,9 @@ void CMS_lumi(TPad* pad, int iPeriod, int iPosX) {
} else if (iPeriod == 5) {
lumiText += lumi_0p9TeV;
lumiText += " (#sqrt{s} = 0.9 TeV)";
} else if (iPeriod == 6) {
lumiText += lumi_13p6TeV;
lumiText += " (#sqrt{s} = 13.6 TeV)";
} else if (iPeriod == 7) {
if (outOfFrame)
lumiText += "#scale[0.85]{";
Expand Down
12 changes: 7 additions & 5 deletions Alignment/OfflineValidation/macros/FitPVResiduals.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2360,7 +2360,7 @@ void arrangeBiasCanvas(TCanvas *canv,
lego->Draw();

TPad *current_pad = static_cast<TPad *>(canv->GetPad(k + 1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);
if (theDate != "")
ptDate->Draw("same");
}
Expand Down Expand Up @@ -2521,7 +2521,7 @@ void arrangeCanvas(TCanvas *canv,
current_pad = static_cast<TPad *>(canv->GetPad(0));
}

CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);
if (theDate != "")
ptDate->Draw("same");

Expand Down Expand Up @@ -2567,7 +2567,7 @@ void arrangeCanvas(TCanvas *canv,
lego->Draw();

TPad *current_pad2 = static_cast<TPad *>(canv->GetPad(2));
CMS_lumi(current_pad2, 4, 33);
CMS_lumi(current_pad2, 6, 33);
if (theDate != "")
ptDate->Draw("same");
}
Expand Down Expand Up @@ -2805,7 +2805,7 @@ void arrangeFitCanvas(TCanvas *canv, TH1F *meanplots[100], Int_t nFiles, TString

//TkAlStyle::drawStandardTitle(Coll0T15);
lego->Draw("same");
CMS_lumi(canv, 4, 33);
CMS_lumi(canv, 6, 33);
if (theDate != "")
ptDate->Draw("same");
//pt->Draw("same");
Expand Down Expand Up @@ -3868,7 +3868,9 @@ void setStyle() {
/*--------------------------------------------------------------------*/

writeExtraText = true; // if extra text
lumi_13TeV = "p-p collisions";
lumi_13p6TeV = "pp collisions";
lumi_13TeV = "pp collisions";
lumi_0p9TeV = "pp collisions";
extraText = "Internal";

TH1::StatOverflows(kTRUE);
Expand Down
41 changes: 21 additions & 20 deletions Alignment/OfflineValidation/macros/FitPVResolution.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
TPad* current_pad = static_cast<TPad*>(c1->GetPad(1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c1->cd(2);
j == 0 ? p_resolY_vsSumPt_[j]->Draw("E1") : p_resolY_vsSumPt_[j]->Draw("E1same");
Expand All @@ -761,7 +761,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c1->GetPad(2));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c1->cd(3);
j == 0 ? p_resolZ_vsSumPt_[j]->Draw("E1") : p_resolZ_vsSumPt_[j]->Draw("E1same");
Expand All @@ -771,7 +771,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c1->GetPad(3));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

// second canvas

Expand All @@ -783,7 +783,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c2->GetPad(1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c2->cd(2);
j == 0 ? p_pullY_vsSumPt_[j]->Draw("E1") : p_pullY_vsSumPt_[j]->Draw("E1same");
Expand All @@ -793,7 +793,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c2->GetPad(2));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c2->cd(3);
j == 0 ? p_pullZ_vsSumPt_[j]->Draw("E1") : p_pullZ_vsSumPt_[j]->Draw("E1same");
Expand All @@ -803,7 +803,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c2->GetPad(3));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

// third canvas

Expand All @@ -815,7 +815,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c3->GetPad(1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c3->cd(2);
j == 0 ? p_resolY_vsNtracks_[j]->Draw("E1") : p_resolY_vsNtracks_[j]->Draw("E1same");
Expand All @@ -825,7 +825,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c3->GetPad(2));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c3->cd(3);
j == 0 ? p_resolZ_vsNtracks_[j]->Draw("E1") : p_resolZ_vsNtracks_[j]->Draw("E1same");
Expand All @@ -835,7 +835,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c3->GetPad(3));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

// fourth canvas

Expand All @@ -847,7 +847,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c4->GetPad(1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c4->cd(2);
j == 0 ? p_pullY_vsNtracks_[j]->Draw("E1") : p_pullY_vsNtracks_[j]->Draw("E1same");
Expand All @@ -857,7 +857,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c4->GetPad(2));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c4->cd(3);
j == 0 ? p_pullZ_vsNtracks_[j]->Draw("E1") : p_pullZ_vsNtracks_[j]->Draw("E1same");
Expand All @@ -867,7 +867,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c4->GetPad(3));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

// fifth canvas

Expand All @@ -879,7 +879,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c5->GetPad(1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c5->cd(2);
j == 0 ? p_resolY_vsNVtx_[j]->Draw("E1") : p_resolY_vsNVtx_[j]->Draw("E1same");
Expand All @@ -889,7 +889,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c5->GetPad(2));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c5->cd(3);
j == 0 ? p_resolZ_vsNVtx_[j]->Draw("E1") : p_resolZ_vsNVtx_[j]->Draw("E1same");
Expand All @@ -899,7 +899,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c5->GetPad(3));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

// sixth canvas

Expand All @@ -911,7 +911,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c6->GetPad(1));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c6->cd(2);
j == 0 ? p_pullY_vsNVtx_[j]->Draw("E1") : p_pullY_vsNVtx_[j]->Draw("E1same");
Expand All @@ -921,7 +921,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c6->GetPad(2));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);

c6->cd(3);
j == 0 ? p_pullZ_vsNVtx_[j]->Draw("E1") : p_pullZ_vsNVtx_[j]->Draw("E1same");
Expand All @@ -931,7 +931,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
if (theDate.Length() != 0)
ptDate->Draw("same");
current_pad = static_cast<TPad*>(c6->GetPad(3));
CMS_lumi(current_pad, 4, 33);
CMS_lumi(current_pad, 6, 33);
}

if (theDate.Length() != 0)
Expand Down Expand Up @@ -1130,8 +1130,9 @@ void setPVResolStyle() {
/*--------------------------------------------------------------------*/

writeExtraText = true; // if extra text
lumi_13TeV = "p-p collisions";
lumi_0p9TeV = "p-p collisions";
lumi_13p6TeV = "pp collisions";
lumi_13TeV = "pp collisions";
lumi_0p9TeV = "pp collisions";
extraText = "Internal";

TH1::StatOverflows(kTRUE);
Expand Down
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<flags TEST_RUNNER_ARGS=" /bin/bash Alignment/OfflineValidation/test testSubmitters.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<bin file="testPVPlotting.cpp">
<bin file="testPVPlotting.cpp" name="testPVPlotting">
<flags PRE_TEST="testPVValidation"/>
<use name="rootmath"/>
<use name="roothistmatrix"/>
Expand Down