diff --git a/macros/runCond/lumiExtract.C b/macros/runCond/lumiExtract.C index 5779912..7f8de62 100644 --- a/macros/runCond/lumiExtract.C +++ b/macros/runCond/lumiExtract.C @@ -81,6 +81,7 @@ 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()))); + v_fn_lumi.push_back(TString(Form("%s/lumi2017.root",dn_lumi.Data()))); double uT2010 = 1262304000.0; @@ -90,6 +91,7 @@ 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); @@ -97,6 +99,7 @@ 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); @@ -105,6 +108,7 @@ v_lumiCorrFac.push_back(1.0e-9); v_lumiCorrFac.push_back(1.0e-9); //v_lumiCorrFac.push_back(1.0e-3); + v_lumiCorrFac.push_back(1.0e-9); std::vector v_color; v_color.push_back(kGreen+3); @@ -112,13 +116,15 @@ v_color.push_back(kRed); v_color.push_back(kOrange); v_color.push_back(kCyan); + v_color.push_back(kBlack); 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); + v_cms.push_back(13.0); + v_cms.push_back(13.0); std::vector v_lumiScale; v_lumiScale.push_back(10.0); @@ -127,6 +133,7 @@ //v_lumiScale.push_back(10.0); v_lumiScale.push_back(1.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()),