diff --git a/macros/runCond/deplVandLumiExtrac.C b/macros/runCond/deplVandLumiExtrac.C index 05cc5e9..5334bc3 100755 --- a/macros/runCond/deplVandLumiExtrac.C +++ b/macros/runCond/deplVandLumiExtrac.C @@ -130,6 +130,7 @@ std::vector v_lumi7; std::vector v_lumi8; std::vector v_lumi13; + std::vector v_lumi14; std::vector v_time; std::vector v_fill; @@ -196,6 +197,7 @@ double lumi7 = 0.0; double lumi8 = 0.0; double lumi13 = 0.0; + double lumi14 = 0.0; @@ -207,8 +209,10 @@ 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 || vr_beamEner(i)==14.0){ + }else if(vr_beamEner(i)==13.0){ lumi13 += (double)(vr_stopTime(i)-vr_fillTime(i))*vr_peakLumi(i); + }else if(vr_beamEner(i)==14.0){ + lumi14 += (double)(vr_stopTime(i)-vr_fillTime(i))*vr_peakLumi(i); }else{ Warning("deplVandLumiExtract","Unknown center of mass energy for %s",ctime(&raw_time)); } @@ -220,10 +224,12 @@ v_lumi7.push_back(lumi7); v_lumi8.push_back(lumi8); v_lumi13.push_back(lumi13); + v_lumi14.push_back(lumi14); 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); + Printf(" Luminosity @ 14 TeV: %7.2f fb^{-1}",lumi14/1e9); v_time.push_back((double)iter->second); timeMap.erase(iter); } @@ -237,10 +243,12 @@ v_lumi7.push_back(lumi7); v_lumi8.push_back(lumi8); v_lumi13.push_back(lumi13); + v_lumi14.push_back(lumi14); 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); + Printf(" Luminosity @ 14 TeV: %7.2f fb^{-1}",lumi14/1e9); v_time.push_back((double)iter->second); timeMap.erase(iter); } @@ -251,18 +259,21 @@ TVectorD vr_lumi7 = getROOTVector(v_lumi7); TVectorD vr_lumi8 = getROOTVector(v_lumi8); TVectorD vr_lumi13 = getROOTVector(v_lumi13); + TVectorD vr_lumi14 = getROOTVector(v_lumi14); 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_lumi14;*"); 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_lumi14.Write("v_lumi14"); vr_fill.Write("v_fill"); f_flux->Close();