From 482c774ac88cc784e125a3f9307b5ba55fc296d8 Mon Sep 17 00:00:00 2001 From: Michael Duehrssen <michael.duehrssen@cern.ch> Date: Mon, 17 Feb 2020 12:28:26 +0100 Subject: [PATCH] CaloSamplingFractionAnalysis: implement feedback to MR 30345 --- .../share/LarEMSamplingFraction_analysis.C | 10 ++-------- .../src/LarEMSamplingFraction.cxx | 9 --------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_analysis.C b/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_analysis.C index 6691b1c837b..76d1fb099a3 100644 --- a/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_analysis.C +++ b/Simulation/Tools/CaloSamplingFractionAnalysis/share/LarEMSamplingFraction_analysis.C @@ -12,12 +12,6 @@ void LarEMSamplingFraction_barrel() new TCanvas("ELAr_hit_barrel","ELAr_hit_barrel"); mytree->Draw("(energy_hit[0]+energy_hit[1]+energy_hit[2]+energy_hit[3])"); - //new TCanvas("SF","SF"); - //mytree->Draw("Sum$(energy_active_total)/Sum$(energy_active_total+energy_inactive_total):mc_eta>>SF(14,0,1.4,20,0.15,0.25)","","colz"); - - //new TCanvas("LAr_barrel","LAr_barrel"); - //mytree->Draw("(energy_active_total[0]+energy_active_total[1]+energy_active_total[2]+energy_active_total[3]):mc_eta>>LAr_barrel(56,0,1.4,50,7000,12000)","","colz"); - TCanvas* c; c=new TCanvas("SF_LAr_barrel_calibhit","SF_LAr_barrel_calibhit"); mytree->Draw("(energy_active_total[0]+energy_active_total[1]+energy_active_total[2]+energy_active_total[3])/(energy_active_total[0]+energy_active_total[1]+energy_active_total[2]+energy_active_total[3]+energy_inactive_total[0]+energy_inactive_total[1]+energy_inactive_total[2]+energy_inactive_total[3]):mc_eta>>SF_LAr_barrel_calibhit(56,0,1.4,140,0.18,0.25)","","colz"); @@ -33,7 +27,7 @@ void LarEMSamplingFraction_barrel() c->SetGridy(); c=new TCanvas("SF_LAr_barrel","SF_LAr_barrel"); - mytree->Draw("(energy_hit[0]+energy_hit[1]+energy_hit[2]+energy_hit[3])/(energy_active_total[0]+energy_active_total[1]+energy_active_total[2]+energy_active_total[3]+energy_inactive_total[0]+energy_inactive_total[1]+energy_inactive_total[2]+energy_inactive_total[3]):mc_eta>>SF_LAr_barrel(56,0,1.4,140,0.16,0.23)","","colz",1000); + mytree->Draw("(energy_hit[0]+energy_hit[1]+energy_hit[2]+energy_hit[3])/(energy_active_total[0]+energy_active_total[1]+energy_active_total[2]+energy_active_total[3]+energy_inactive_total[0]+energy_inactive_total[1]+energy_inactive_total[2]+energy_inactive_total[3]):mc_eta>>SF_LAr_barrel(56,0,1.4,140,0.16,0.23)","","colz"); TH2* SF_LAr_barrel=(TH2*)gDirectory->Get("SF_LAr_barrel"); SF_LAr_barrel->SetStats(0); SF_LAr_barrel->SetTitle("Sampling fraction LAr EM barrel"); @@ -57,7 +51,7 @@ void LarEMSamplingFraction_barrel() TF1* func=(TF1*)res->At(i); TString text=Form("%4.2f < #eta < %4.2f = %7.5f +- %7.5f",func->GetXmin(),func->GetXmax(),func->GetParameter(0),func->GetParError(0)); //cout<<"i="<<i<<" "<<res->At(i)->ClassName()<<" : "<<res->At(i)->GetName()<<endl; - cout<<"Sampling fraction : "<<text<<endl; + std::cout<<"Sampling fraction : "<<text<<std::endl; pt->AddText(text); } diff --git a/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx b/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx index 1060cf0b56f..81f7678550f 100644 --- a/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx +++ b/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx @@ -434,15 +434,6 @@ StatusCode LarEMSamplingFraction::execute() ATH_MSG_INFO( "Read "<<hitnumber<<" G4Hits from TileHitVec"); } - - - - - - - - - for(auto& cell:cell_info_map) { m_cell_identifier ->push_back(cell.second.cell_identifier); m_cell_sampling ->push_back(cell.second.cell_sampling); -- GitLab