diff --git a/data/lumi/lumi.root b/data/lumi/lumi.root index 9cde56c..b6852fd 100644 --- a/data/lumi/lumi.root +++ b/data/lumi/lumi.root Binary files differ diff --git a/data/lumi/lumi2015.root b/data/lumi/lumi2015.root index bd2127e..1d4b4f9 100644 --- a/data/lumi/lumi2015.root +++ b/data/lumi/lumi2015.root Binary files differ diff --git a/data/lumi/lumi_2015root.root b/data/lumi/lumi_2015root.root new file mode 100644 index 0000000..1d4b4f9 --- /dev/null +++ b/data/lumi/lumi_2015root.root Binary files differ diff --git a/data/lumi/lumi_2015rootPb.root b/data/lumi/lumi_2015rootPb.root new file mode 100644 index 0000000..4871c48 --- /dev/null +++ b/data/lumi/lumi_2015rootPb.root Binary files differ diff --git a/macros/runCond/deplVandLumiExtrac.C b/macros/runCond/deplVandLumiExtrac.C index 6ec06b0..1788229 100755 --- a/macros/runCond/deplVandLumiExtrac.C +++ b/macros/runCond/deplVandLumiExtrac.C @@ -91,15 +91,16 @@ - const char* homeVar = std::getenv ("HOME"); + //const char* homeVar = std::getenv ("HOME"); + const char* homeVar = "/afs/cern.ch/user/e/egraveri/cmtuser/STMonitoring/STAging"; const char* diskVar = std::getenv ("DISK"); - TString dn_lumi(Form("%s/cmtuser/Vetra_v13r2/ST/STAging/data/lumi",homeVar)); + TString dn_lumi(Form("%s/data/lumi",homeVar)); TString fn_lumi(Form("%s/lumi.root", dn_lumi.Data())); - TString dn_out(Form("%s/cmtuser/Vetra_v13r2/ST/STAging/data/db",homeVar)); + TString dn_out(Form("%s/data/db",homeVar)); TString fn_vdepl(Form("%s/vdepl.root", dn_out.Data())); TString fn_flux(Form("%s/lumi.root", @@ -140,7 +141,7 @@ v_sector.push_back(atof(v_line[0].c_str())); v_vdepl.push_back(atof(v_line[6].c_str())); }else{ - Warning("deplVandLumiExtract","Database entry of %s has to few entries",v_line[0].c_str()); + Warning("deplVandLumiExtract","Database entry of %s has too few entries",v_line[0].c_str()); } } @@ -183,6 +184,7 @@ double lumi7 = 0.0; double lumi8 = 0.0; + double lumi13 = 0.0; @@ -194,6 +196,8 @@ lumi7 += (double)(vr_stopTime(i)-vr_fillTime(i))*vr_peakLumi(i); }else if(vr_beamEner(i)==8.0){ lumi8 += (double)(vr_stopTime(i)-vr_fillTime(i))*vr_peakLumi(i); + }else if(vr_beamEner(i)==13.0){ + lumi13 += (double)(vr_stopTime(i)-vr_fillTime(i))*vr_peakLumi(i); }else{ Warning("deplVandLumiExtract","Unknown center of mass energy for %s",ctime(&raw_time)); } @@ -204,9 +208,11 @@ v_fill.push_back((double)iter->first); v_lumi7.push_back(lumi7); v_lumi8.push_back(lumi8); + v_lumi13.push_back(lumi13); Info("deplVandLumiExtract","At fill %d %s",iter->first,ctime(&raw_time)); Printf(" Luminosity @ 7 TeV: %7.2f fb^{-1}",lumi7/1e9); Printf(" Luminosity @ 8 TeV: %7.2f fb^{-1}",lumi8/1e9); + Printf(" Luminosity @ 13 TeV: %7.2f fb^{-1}",lumi13/1e9); v_time.push_back((double)iter->second); timeMap.erase(iter); } @@ -219,9 +225,11 @@ v_fill.push_back((double)iter->first); v_lumi7.push_back(lumi7); v_lumi8.push_back(lumi8); + v_lumi13.push_back(lumi13); Info("deplVandLumiExtract","At fill %d: %s",iter->first,ctime(&fill_time)); Printf(" Luminosity @ 7 TeV: %7.2f fb^{-1}",lumi7/1e9); Printf(" Luminosity @ 8 TeV: %7.2f fb^{-1}",lumi8/1e9); + Printf(" Luminosity @ 13 TeV: %7.2f fb^{-1}",lumi13/1e9); v_time.push_back((double)iter->second); timeMap.erase(iter); } @@ -231,16 +239,19 @@ TVectorD vr_time = getROOTVector(v_time); TVectorD vr_lumi7 = getROOTVector(v_lumi7); TVectorD vr_lumi8 = getROOTVector(v_lumi8); + TVectorD vr_lumi13 = getROOTVector(v_lumi13); TVectorD vr_fill = getROOTVector(v_fill); f_flux->Delete("v_time;*"); f_flux->Delete("v_lumi7;*"); f_flux->Delete("v_lumi8;*"); + f_flux->Delete("v_lumi13;*"); f_flux->Delete("v_fill;*"); vr_time.Write("v_time"); vr_lumi7.Write("v_lumi7"); vr_lumi8.Write("v_lumi8"); + vr_lumi13.Write("v_lumi13"); vr_fill.Write("v_fill"); f_flux->Close(); diff --git a/macros/runCond/lumiExtract b/macros/runCond/lumiExtract index 8094384..eb422a4 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 e279225..c629eba 100644 --- a/macros/runCond/lumiExtract.C +++ b/macros/runCond/lumiExtract.C @@ -88,7 +88,7 @@ v_lumiCorrFac.push_back(1.0); v_lumiCorrFac.push_back(1.0); v_lumiCorrFac.push_back(1.0); - v_lumiCorrFac.push_back(1.0e-6); + v_lumiCorrFac.push_back(1.0e-9); //v_lumiCorrFac.push_back(1.0e-3); std::vector v_color; @@ -108,7 +108,7 @@ v_lumiScale.push_back(1.0); v_lumiScale.push_back(1.0); //v_lumiScale.push_back(10.0); - v_lumiScale.push_back(10.0); + v_lumiScale.push_back(1.0); TFile* f_lumiout = new TFile(Form("%s/lumi.root",dn_lumi.Data()),