diff --git a/data/lumi/lumi.root b/data/lumi/lumi.root index c7a5d30..615072a 100644 --- a/data/lumi/lumi.root +++ b/data/lumi/lumi.root Binary files differ diff --git a/macros/runCond/lumiExtract b/macros/runCond/lumiExtract index bcff021..364bd13 100755 --- a/macros/runCond/lumiExtract +++ b/macros/runCond/lumiExtract Binary files differ diff --git a/macros/runCond/lumiExtract.C b/macros/runCond/lumiExtract.C index 98b13f8..5779912 100644 --- a/macros/runCond/lumiExtract.C +++ b/macros/runCond/lumiExtract.C @@ -80,6 +80,7 @@ v_fn_lumi.push_back(TString(Form("%s/lumi2011.root",dn_lumi.Data()))); v_fn_lumi.push_back(TString(Form("%s/lumi2012.root",dn_lumi.Data()))); v_fn_lumi.push_back(TString(Form("%s/lumi2015.root",dn_lumi.Data()))); + v_fn_lumi.push_back(TString(Form("%s/lumi2016.root",dn_lumi.Data()))); double uT2010 = 1262304000.0; @@ -88,18 +89,21 @@ v_timeCorrFac.push_back(1.0); v_timeCorrFac.push_back(1.0); v_timeCorrFac.push_back(1.0); + v_timeCorrFac.push_back(1.0); std::vector v_timeCorrScale; v_timeCorrScale.push_back(uT2010); v_timeCorrScale.push_back(0.0); v_timeCorrScale.push_back(0.0); v_timeCorrScale.push_back(0.0); + v_timeCorrScale.push_back(0.0); std::vector v_lumiCorrFac; v_lumiCorrFac.push_back(1.0); v_lumiCorrFac.push_back(1.0); v_lumiCorrFac.push_back(1.0); v_lumiCorrFac.push_back(1.0e-9); + v_lumiCorrFac.push_back(1.0e-9); //v_lumiCorrFac.push_back(1.0e-3); std::vector v_color; @@ -107,12 +111,14 @@ v_color.push_back(kBlue); v_color.push_back(kRed); v_color.push_back(kOrange); + v_color.push_back(kCyan); std::vector v_cms; v_cms.push_back(7.0); v_cms.push_back(7.0); v_cms.push_back(8.0); v_cms.push_back(13.0); + v_cms.push_back(14.0); std::vector v_lumiScale; v_lumiScale.push_back(10.0); @@ -120,6 +126,7 @@ v_lumiScale.push_back(1.0); //v_lumiScale.push_back(10.0); v_lumiScale.push_back(1.0); + v_lumiScale.push_back(1.0); TFile* f_lumiout = new TFile(Form("%s/lumi.root",dn_lumi.Data()), @@ -289,7 +296,7 @@ mg_peak->GetXaxis()->SetTimeDisplay(1); mg_peak->GetXaxis()->SetTimeOffset(0.0); mg_peak->GetXaxis()->SetTimeFormat("%b/%Y"); - mg_peak->GetXaxis()->SetLimits(uT2010,uT2010+6*365*86400.0+100.0); + mg_peak->GetXaxis()->SetLimits(uT2010,uT2010+7*365*86400.0+100.0); mg_peak->GetYaxis()->SetTitle("Peak Inst Luminosity [10^{30} cm^{-2}s^{-1}]"); mg_peak->GetYaxis()->SetTitleOffset(1.0);