diff --git a/macros/runCond/flukaExtract b/macros/runCond/flukaExtract index 79fab4c..c4cc251 100755 --- a/macros/runCond/flukaExtract +++ b/macros/runCond/flukaExtract Binary files differ diff --git a/macros/runCond/flukaExtract.C b/macros/runCond/flukaExtract.C index b5f6351..b20aa90 100755 --- a/macros/runCond/flukaExtract.C +++ b/macros/runCond/flukaExtract.C @@ -74,8 +74,8 @@ // Executable method int flukaExtract(int argc, char* argv[]){ - //const char* homeVar = std::getenv ("HOME"); - const char* homeVar = "/afs/cern.ch/user/e/egraveri/cmtuser/STMonitoring/STAging"; + const char* homeVar = std::getenv ("CCEHOME"); + //const char* homeVar = "/afs/cern.ch/user/e/egraveri/cmtuser/STMonitoring/STAging"; TString dn_lumi(Form("%s/data/fluka",homeVar)); @@ -142,13 +142,18 @@ TH2F* h_tt_7 = (TH2F*)h_tt_old->Clone("h_tt_7"); TH2F* h_tt_8 = (TH2F*)h_tt_old->Clone("h_tt_8"); + TH2F* h_tt_14 = (TH2F*)h_tt_old->Clone("h_tt_14"); TH2F* h_it_old = (TH2F*)h_tt_old->Clone("h_it_old"); TH2F* h_it_7 = (TH2F*)h_tt_7->Clone("h_it_7"); TH2F* h_it_8 = (TH2F*)h_tt_8->Clone("h_it_8"); + TH2F* h_it_14 = (TH2F*)h_tt_14->Clone("h_it_14"); writeHisto(fn_TT_old,h_tt_old); writeHisto(fn_T3_old,h_it_old); + writeHisto(fn_TT_old,h_tt_14); + writeHisto(fn_T3_old,h_it_14); + writeHisto(fn_TT_8, h_tt_8); @@ -182,27 +187,36 @@ setUncertainty(h_tt_8); setUncertainty(h_tt_7); setUncertainty(h_tt_old); + setUncertainty(h_tt_14); setUncertainty(h_it_8); setUncertainty(h_it_7); setUncertainty(h_it_old); + setUncertainty(h_it_14); TH2F* h_tt_old_8 = (TH2F*)h_tt_old->Clone("h_tt_old_8"); TH2F* h_tt_old_7 = (TH2F*)h_tt_old->Clone("h_tt_old_7"); + TH2F* h_tt_old_14 = (TH2F*)h_tt_old->Clone("h_tt_old_14"); TH2F* h_it_old_8 = (TH2F*)h_it_old->Clone("h_it_old_8"); TH2F* h_it_old_7 = (TH2F*)h_it_old->Clone("h_it_old_7"); + TH2F* h_it_old_14 = (TH2F*)h_it_old->Clone("h_it_old_14"); scale(h_tt_8,h_tt_old_8); scale(h_it_8,h_it_old_8); scale(h_tt_7,h_tt_old_7); scale(h_it_7,h_it_old_7); + scale(h_tt_14,h_tt_old_14); + scale(h_it_14,h_it_old_14); merge(h_tt_8,h_tt_old_8); merge(h_tt_7,h_tt_old_7); + merge(h_tt_14,h_tt_old_14); storeUncertainty(h_tt_8); storeUncertainty(h_tt_7); + storeUncertainty(h_tt_14); storeUncertainty(h_it_8); storeUncertainty(h_it_7); + storeUncertainty(h_it_14); TH1D* h_xProf_7 = h_tt_7->ProjectionX("h_xProf_7", @@ -219,10 +233,19 @@ h_tt_8->GetNbinsX()/2, h_tt_8->GetNbinsX()/2); + TH1D* h_xProf_14 = h_tt_14->ProjectionX("h_xProf_14", + h_tt_14->GetNbinsY()/2, + h_tt_14->GetNbinsY()/2); + TH1D* h_yProf_14 = h_tt_14->ProjectionY("h_yProf_14", + h_tt_14->GetNbinsX()/2, + h_tt_14->GetNbinsX()/2); + configProfile(h_xProf_7); configProfile(h_yProf_7); + configProfile(h_yProf_14); configProfile(h_xProf_8); configProfile(h_yProf_8); + configProfile(h_yProf_14); TCanvas* c_tt_8 = new TCanvas("c_tt_8","c_tt_8",1000,800); @@ -233,6 +256,10 @@ c_tt_7->SetLogz(); h_tt_7->Draw("colz"); + TCanvas* c_tt_14 = new TCanvas("c_tt_14","c_tt_14",1000,800); + c_tt_14->SetLogz(); + h_tt_14->Draw("colz"); + TCanvas* c_it_8 = new TCanvas("c_it_8","c_it_8",1000,800); c_it_8->SetLogz(); h_it_8->Draw("colz"); @@ -241,6 +268,10 @@ c_it_7->SetLogz(); h_it_7->Draw("colz"); + TCanvas* c_it_14 = new TCanvas("c_it_14","c_it_14",1000,800); + c_it_14->SetLogz(); + h_it_14->Draw("colz"); + gStyle->SetPadLeftMargin(0.20); gStyle->SetPadRightMargin(0.10); @@ -269,6 +300,15 @@ h_xProf_8->Draw("H"); h_yProf_8->Draw("H same"); + TCanvas* c_tt_pX14 = new TCanvas("c_tt_pX14","c_tt_pX14",1000,800); + c_tt_pX14->SetLogy(); + h_yProf_14->SetLineColor(kBlue); + h_yProf_14->SetMarkerColor(kBlue); + h_yProf_14->SetMarkerStyle(25); + h_xProf_14->SetXTitle("#it{x}/#it{y} position [cm]"); + h_xProf_14->Draw("H"); + h_yProf_14->Draw("H same"); + TCanvas* c_tt_pY7 = new TCanvas("c_tt_pY7","c_tt_pY7",1000,800); c_tt_pY7->SetLogy(); h_yProf_7->Draw("H"); @@ -277,15 +317,22 @@ c_tt_pY8->SetLogy(); h_yProf_8->Draw("H"); + TCanvas* c_tt_pY14 = new TCanvas("c_tt_pY14","c_tt_pY14",1000,800); + c_tt_pY14->SetLogy(); + h_yProf_14->Draw("H"); + TFile* f_output = new TFile(fn_output.Data(),"RECREATE"); h_tt_7->Write("h_tt_7"); h_tt_8->Write("h_tt_8"); + h_tt_14->Write("h_tt_13"); h_it_7->Write("h_t3_7"); h_it_8->Write("h_t3_8"); + h_it_14->Write("h_t3_13"); f_output->Close(); + Info("flukaExtract","Data written to %s",fn_output.Data()); TLegend* leg = new TLegend(0.0,0.0,1.0,1.0); diff --git a/macros/runCond/lumiExtract.C b/macros/runCond/lumiExtract.C index c629eba..8255fed 100644 --- a/macros/runCond/lumiExtract.C +++ b/macros/runCond/lumiExtract.C @@ -61,8 +61,10 @@ int lumiExtract(int argc, char* argv[]){ TMultiGraph *mg_lumi = new TMultiGraph("mg_lumi","mg_lumi"); - - TString dn_lumi("/afs/cern.ch/user/e/egraveri/cmtuser/STMonitoring/STAging/data/lumi"); + + const char* homeVar = std::getenv ("CCEHOME"); + + TString dn_lumi(Form("%s/data/lumi",homeVar)); std::vector v_fn_lumi; v_fn_lumi.push_back(TString(Form("%s/lumi2010.root",dn_lumi.Data()))); diff --git a/macros/runCond/tempExtract.C b/macros/runCond/tempExtract.C index 31565ee..0cffe64 100755 --- a/macros/runCond/tempExtract.C +++ b/macros/runCond/tempExtract.C @@ -71,14 +71,14 @@ std::vector > a_tt; std::vector > a_it; - const char* homeVar = std::getenv ("HOME"); + const char* homeVar = std::getenv ("CCEHOME"); double uT2010 = 1262304000.0; double end2012 = uT2010+3*365*86400.0+86400.0*50.0; double endJuly2015 = 1438003626.0; double dec2015 = 1448928000.0; - TString dn_lumi(Form("%s/cmtuser/STMonitoring/STAging/data/temperature",homeVar)); + TString dn_lumi(Form("%s/data/temperature",homeVar)); TString fn_tt(Form("%s/tttemp.txt",dn_lumi.Data())); TString fn_it(Form("%s/ittemp.txt",dn_lumi.Data()));