ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/cbrown/Development/Plotting/Modules/GeneralToolBox.C

Comparing UserCode/cbrown/Development/Plotting/Modules/GeneralToolBox.C (file contents):
Revision 1.5 by buchmann, Tue Apr 10 13:44:59 2012 UTC vs.
Revision 1.28 by buchmann, Wed Jan 16 17:11:23 2013 UTC

#	Line 17 | Line 17
17		#include <netdb.h>
18		#include <stdio.h>
19		#include <string.h>
20	+	#include <assert.h>
21
22		#include <TFile.h>
23		#include <TTree.h>
#	Line 38 | Line 39
39		#include <TPaveText.h>
40		#include <TRandom.h>
41		#include <TGraphErrors.h>
42	+	#include <TROOT.h>
43	+	#include <TPolyLine.h>
44	+
45		#ifndef Verbosity
46		#define Verbosity 0
47		#endif
#	Line 58 | Line 62 | namespace PlottingSetup {
62		vector<float> global_ratio_binning;
63		int publicmode=0;
64		int PaperMode=0; // PaperMode=true will suppress "Preliminary" in DrawPrelim()
65	+	int Approved=0; // Approved=true will only plot approved plots
66	+	bool is2012=true;
67	+	bool is53reco=true;
68	+	bool openBox = true;
69	+	vector<TH1F*> FakeHistoHeap;
70	+
71		}
72
73		bool dopng=false;
#	Line 119 | Line 129 | string topdir(string child) {
129		return tempdirectory.substr(0,ichar);
130		}
131		}
132	+	return "TOPDIRFAILURE";
133		}
134
135		template < typename CHAR_TYPE,
#	Line 250 | Line 261 | void ensure_directory_exists(string this
261		}
262		}
263
264	+	void DeleteStack(THStack mcstack) {
265	+	TH1F* h;
266	+	TIter nextHist(mcstack.GetHists());
267	+	while ( h = (TH1F*)nextHist() ) {
268	+	h->Delete();
269	+	}
270	+	delete h;
271	+	}
272	+
273	+
274	+	void DeadEnd(string message) {
275	+	dout << endl;
276	+	dout << "\033[1;31m     _                _                  _  " << endl;
277	+	dout << "\033[1;31m  __| | ___  __ _  __| |   ___ _ __   __| | " << endl;
278	+	dout << "\033[1;31m / _` |/ _ \\/ _` |/ _` |  / _ \\ '_ \\ / _` | " << endl;
279	+	dout << "\033[1;31m| (_| |  __/ (_| | (_| | |  __/ | | | (_| | " << endl;
280	+	dout << "\033[1;31m \\__,_|\\___|\\__,_|\\__,_|  \\___|_| |_|\\__,_| " << endl;
281	+	dout << "\033[1;31m                                            " << endl;
282	+	dout << "" << endl;
283	+	dout << " A totally fatal error has occurred: " << endl;
284	+	dout << " " << message << endl;
285	+	dout << endl;
286	+	dout << "If you do not know how to deal with this error message please call Customer Support Mumbai (or Zurich...) \033[0m" << endl;
287	+	dout << "   ... aborting now ... " << endl;
288	+	assert(0);
289	+	}
290	+
291	+
292	+	void SanityChecks() {
293	+	//this function gets called whenever samples are initialized (see ActiveSamples.C)
294	+	//whatever is necessary for the code to run should be put here.
295	+
296	+	if(gROOT->GetVersionInt()<53200) {
297	+	DeadEnd("ROOT version outdated, you are using "+any2string(gROOT->GetVersionInt())+" but the earliest recommended version is 5.32.00");
298	+	}
299	+
300	+
301	+	}
302	+
303		void initialize_log() {
304		if(!PlottingSetup::publicmode) {
305		dout << "____________________________________________________________" << endl;
#	Line 278 | Line 328 | void initialize_log() {
328		dout << "        PUBLIC MODE     " << endl;
329		}
330		time_t rawtime;
281	–	struct tm * timeinfo;
331		time ( &rawtime );
332		dout << "       Analysis run on " << asctime (localtime ( &rawtime ));
333		dout << "____________________________________________________________" << endl;
#	Line 297 | Line 346 | void set_directory(string basedir="") {
346		if(basedir.substr(0,1)=="/") basedir=basedir.substr(1,basedir.length()-1);
347		if(basedir.substr(basedir.length()-1,1)!="/") basedir+="/";
348		char currentpath[1024];
349	<	char *path = getcwd(currentpath,1024);
349	>	getcwd(currentpath,1024);
350		PlottingSetup::basedirectory=(string)currentpath+"/Plots/"+basedir;
351		ensure_directory_exists(PlottingSetup::basedirectory);
352		initialize_log();
#	Line 322 | Line 371 | string extract_directory(string savethis
371		string extract_root_dir(string name) {
372		int position = -1;
373		if(name.substr(0,1)=="/") name=name.substr(1,name.length()-1);
374	<	for(int ipos=0;ipos<name.length();ipos++) {
374	>	for(int ipos=0;ipos<(int)name.length();ipos++) {
375		if(name.substr(ipos,1)=="/") position=ipos;
376		}
377		if(position==-1) return "";
#	Line 332 | Line 381 | string extract_root_dir(string name) {
381		string extract_root_filename(string name) {
382		int position = -1;
383		if(name.substr(0,1)=="/") name=name.substr(1,name.length()-1);
384	<	for(int ipos=0;ipos<name.length();ipos++) {
384	>	for(int ipos=0;ipos<(int)name.length();ipos++) {
385		if(name.substr(ipos,1)=="/") position=ipos;
386		}
387		return name.substr(position+1,name.length()-position-1);
#	Line 390 | Line 439 | void CompleteSave(TVirtualPad *can, stri
439
440
441		void setlumi(float l) {
442	<	generaltoolboxlumi=l;
442	>	generaltoolboxlumi=l;
443		}
444
445		int write_first_line(vector<vector<string> > &entries) {
#	Line 415 | Line 464 | void write_entry(string entry,int width,
464		int currwidth=entry.size();
465		while(currwidth<width) {
466		entry=" "+entry;
467	<	if(entry.size()<width) entry=entry+" ";
467	>	if((int)entry.size()<width) entry=entry+" ";
468		currwidth=entry.size();
469		}
470		bool do_special=false;
#	Line 429 | Line 478 | void write_entry(string entry,int width,
478		void make_nice_table(vector<vector <string> > &entries) {
479		int ncolumns=write_first_line(entries);
480		int cellwidth=(int)(((float)(60-(ncolumns+1)))/(ncolumns));
481	<	for(int iline=0;iline<entries.size();iline++) {
481	>	for(int iline=0;iline<(int)entries.size();iline++) {
482		vector<string> currline = entries[iline];
483		dout << " |";
484	<	for(int ientry=0;ientry<currline.size();ientry++) {
484	>	for(int ientry=0;ientry<(int)currline.size();ientry++) {
485		write_entry(currline[ientry],cellwidth);
486		}
487		dout << endl;
#	Line 444 | Line 493 | void make_nice_table(vector<vector <stri
493		void make_nice_jzb_table(vector<vector <string> > &entries) {
494		int ncolumns=write_first_line(entries);
495		int cellwidth=(int)(((float)(60-(ncolumns+1)))/(ncolumns));
496	<	for(int iline=0;iline<entries.size();iline++) {
496	>	for(int iline=0;iline<(int)entries.size();iline++) {
497		vector<string> currline = entries[iline];
498		dout << " |";
499	<	for(int ientry=0;ientry<currline.size();ientry++) {
499	>	for(int ientry=0;ientry<(int)currline.size();ientry++) {
500		write_entry(currline[ientry],cellwidth,iline,ientry);
501		}
502		dout << endl;
#	Line 548 | Line 597 | void DrawPrelim(float writelumi=generalt
597		string prel=" Preliminary";
598		if(PlottingSetup::PaperMode) prel="";
599		//prelimtext << "CMS Preliminary 2011 , #sqrt{s}= 7 TeV, L= O(1) fb^{-1}"; //temporary replacement
600	+	if(PlottingSetup::is53reco) prel += " 53X";
601	+	string energy="7 TeV";
602	+	if(PlottingSetup::is2012) energy="8 TeV";
603		if(writelumi == 0) {
604	<	if(isMC) prelimtext << "CMS Simulation, #sqrt{s} = 7 TeV";
605	<	else prelimtext << "CMS" << prel << ", #sqrt{s} = 7 TeV";
604	>	if(isMC) prelimtext << "CMS Simulation, #sqrt{s} = " << energy;
605	>	else prelimtext << "CMS" << prel << ", #sqrt{s} = " << energy;
606		} else {
607	<	if(isMC) prelimtext << "CMS Simulation, #sqrt{s} = 7 TeV, L_{int} = " << std::setprecision(2) <<writelumi<<" "<<barn<<"^{-1}";
608	<	else prelimtext << "CMS" << prel << ", #sqrt{s} = 7 TeV, L_{int} = " << std::setprecision(2) <<writelumi<<" "<<barn<<"^{-1}";
607	>	if(isMC) prelimtext << "CMS Simulation, #sqrt{s} = " << energy << ", L_{int} = " << std::setprecision(3) <<writelumi<<" "<<barn<<"^{-1}";
608	>	else prelimtext << "CMS" << prel << ", #sqrt{s} = " << energy << ", L_{int} = " << std::setprecision(3) <<writelumi<<" "<<barn<<"^{-1}";
609		}
610		TPaveText *eventSelectionPaveText = new TPaveText(0.27, 0.93,0.77, 1.0,"blNDC");
611		eventSelectionPaveText->SetFillStyle(4000);
612		eventSelectionPaveText->SetBorderSize(0);
613		eventSelectionPaveText->SetFillColor(kWhite);
614		eventSelectionPaveText->SetTextFont(42);
615	+	//eventSelectionPaveText->SetTextFont(62); // paper style
616		eventSelectionPaveText->SetTextSize(0.042);
617		eventSelectionPaveText->AddText(prelimtext.str().c_str());
618		eventSelectionPaveText->Draw();
#	Line 597 | Line 650 | TGraph* make_nice_ratio(int nbins,float
650		bincontent[i]=0;
651		errors[i]=0;
652		}
653	<	float currlimit=binning[0];
653	>	//  float currlimit=binning[0];
654		int currtoplim=1;
655		for(int ibin=1;ibin<=histo->GetNbinsX();ibin++)
656		{
#	Line 630 | Line 683 | float computeProductError(float a, float
683		return val;
684		}
685
686	+	TGraphAsymmErrors *SysAndStatRatio(TH1F *h1,TH1F *h2, TH1F *sys, int id, vector<float>binning, bool precise=false) {
687	+	int absJZBbinsNumber = binning.size()-1;
688	+	TGraphAsymmErrors* graph = new TGraphAsymmErrors(absJZBbinsNumber);
689	+	for(int i=0;i<absJZBbinsNumber;i++)
690	+	{
691	+	float xCenter=h1->GetBinCenter(i+1);
692	+	float xWidth=(h1->GetBinWidth(i+1))*0.5;
693	+	float nominatorError = h1->GetBinError(i+1);
694	+	float nominator=h1->GetBinContent(i+1);
695	+	float denominatorError=h2->GetBinError(i+1);
696	+	float denominator=h2->GetBinContent(i+1);
697	+	float errorN = 0;
698	+	float errorP = computeRatioError(nominator,nominatorError,denominator,denominatorError);
699	+	float syserr=sys->GetBinContent(i+1);
700	+	float errorsys=0;
701	+	if(id==1) // (is data)
702	+	{
703	+	if(!precise) errorP = computeRatioError(nominator,statErrorP(nominator),denominator,statErrorP(denominator));
704	+	else         errorP = computeRatioError(nominator,nominatorError,denominator,denominatorError);
705	+	errorsys=computeRatioError(nominator,syserr,denominator,0);
706	+	errorP = TMath::Sqrt(errorsys*errorsys+errorP*errorP);
707	+	errorN = errorP; // symmetrize using statErrorP
708	+	} else {
709	+	errorN = computeRatioError(nominator,nominatorError,denominator,denominatorError);
710	+	errorsys=computeRatioError(nominator,syserr,denominator,0);
711	+	errorN = TMath::Sqrt(errorsys*errorsys+errorP*errorP);
712	+	errorP = errorN; // symmetrize using statErrorP
713	+	}
714	+	if(denominator!=0) {
715	+	graph->SetPoint(i, xCenter, nominator/denominator);
716	+	graph->SetPointError(i,xWidth,xWidth,errorN,errorP);
717	+	}
718	+	else {
719	+	graph->SetPoint(i, xCenter, -999);
720	+	graph->SetPointError(i,xWidth,xWidth,errorN,errorP);
721	+	}
722	+	}
723	+	return graph;
724	+	}
725	+
726	+
727		TGraphAsymmErrors *histRatio(TH1F *h1,TH1F *h2, int id, vector<float>binning, bool precise=false)
728		{
729		int absJZBbinsNumber = binning.size()-1;
730		TGraphAsymmErrors* graph = new TGraphAsymmErrors(absJZBbinsNumber);
731
732	<	for(unsigned int i=0;i<absJZBbinsNumber;i++)
732	>	for(int i=0;i<absJZBbinsNumber;i++)
733		{
734		float xCenter=h1->GetBinCenter(i+1);
735		float xWidth=(h1->GetBinWidth(i+1))*0.5;
#	Line 747 | Line 841 | void splitupcut(string incut, vector<str
841		int paranthesis_open=0;
842		int substr_start=0;
843		string currchar="";
844	<	for (int ichar=0;ichar<incut.length();ichar++)
844	>	for (int ichar=0;ichar<(int)incut.length();ichar++)
845		{
846		currchar=incut.substr(ichar,1);
847		//        if(currchar=="(") paranthesis_open++;
#	Line 760 | Line 854 | void splitupcut(string incut, vector<str
854		partvector.push_back(incut.substr(substr_start,incut.length()-substr_start));
855		if(Verbosity>1) {
856		dout << "[ splitupcut() ] : The cut vector now contains the following elements: "<< endl;
857	<	for (int ipart=0;ipart<partvector.size();ipart++)
857	>	for (int ipart=0;ipart<(int)partvector.size();ipart++)
858		{
859		dout << "     - " << partvector[ipart] << endl;
860		}
#	Line 769 | Line 863 | void splitupcut(string incut, vector<str
863
864		int atleastvalue(string expression, int &morethanlessthan) // takes in an expression such as ">2" or ">=3" and returns e.g. 3 (in both examples)
865		{
866	<	int retval=0;
866	>	//  int retval=0;
867		if(expression.substr(0,1)==">"&&expression.substr(1,1)=="=") {
868		//    dout << "The expression " << expression << " is saying that we have at least " << atoi(expression.substr(2,1).c_str()) << " jets" << endl;
869		morethanlessthan=1;
#	Line 795 | Line 889 | int atleastvalue(string expression, int
889		morethanlessthan=-1;
890		return 1+atoi(expression.substr(2,1).c_str());
891		}
892	+
893	+	return -1234567;
894		}
895
896		int do_jet_cut(string incut, int *nJets) {
#	Line 830 | Line 926 | int do_jet_cut(string incut, int *nJets)
926		dout << "Is of type >" << endl;
927		return 0;
928		}
929	+	return -12345;
930		}
931
932		string interpret_cut(string incut, bool &isJetCut, int *permittednJets)
#	Line 863 | Line 960 | string interpret_cut(string incut, bool
960
961		if(incut=="id1==0") return "ee";
962		if(incut=="id1==1") return "#mu#mu";
963	<	if(incut=="abs(mll-91.2)<20") return "|m_{l^{+}l^{-}}-m_{Z}|<20";
963	>	if(incut=="abs(mll-91)<10") return "|m_{l^{+}l^{-}}-m_{Z}|<10";
964		if(incut=="pfJetGoodID[0]") return "";
965		if(incut=="pfJetGoodID[1]") return "";
966		if((int)incut.find("pfJetGoodNum")>-1) {
#	Line 895 | Line 992 | string interpret_cuts(vector<string> &cu
992		int finalJetCut=-1;
993		int permittednJets[20];
994		for(int ijet=0;ijet<20;ijet++) permittednJets[ijet]=1;
995	<	int morethanlessthan=0;//-1: less than, 0: exactly, 1: more than
996	<	for(int icut=0;icut<cutparts.size();icut++)
995	>	//    int morethanlessthan=0;//-1: less than, 0: exactly, 1: more than
996	>	for(int icut=0;icut<(int)cutparts.size();icut++)
997		{
998		if(icut==0) nicecut<<interpret_cut(cutparts[icut],isJetCut,permittednJets);
999		else {
#	Line 961 | Line 1058 | TH1F * makehistofromfunction(TF1 *f1,TH1
1058		histo->SetTitle(histoname.str().c_str());
1059		histo->SetName(histoname.str().c_str());
1060		int nbins=histo->GetNbinsX();
1061	<	float low=histo->GetBinLowEdge(1);
1062	<	float hi=histo->GetBinLowEdge(histo->GetNbinsX())+histo->GetBinWidth(histo->GetNbinsX());
1061	>	//  float low=histo->GetBinLowEdge(1);
1062	>	//  float hi=histo->GetBinLowEdge(histo->GetNbinsX())+histo->GetBinWidth(histo->GetNbinsX());
1063
1064		for(int i=0;i<=nbins;i++) {
1065		histo->SetBinContent(i,(f1->Integral(histo->GetBinLowEdge(i),histo->GetBinLowEdge(i)+histo->GetBinWidth(i)))/histo->GetBinWidth(i));
#	Line 1232 | Line 1329 | Double_t MarcosChi2TestX(const TH1* h1,
1329		return prob;
1330		}
1331
1332	<	void save_with_ratio(TH1F *nominator, TH1F *denominator, TVirtualPad *canvas, string savemeas, bool do_bpred_ratio=false, bool extendrange=false, string yaxistitle="ratio") {
1332	>	void save_with_ratio(TH1F *nominator, TH1F *denominator, TVirtualPad *canvas, string savemeas, bool do_bpred_ratio=false, bool extendrange=false, string yaxistitle="ratio",TH1F *syshisto=NULL) {
1333		//this function saves the pad being passed as well as a new one including the ratio.
1334		CompleteSave(canvas,savemeas);
1335
#	Line 1282 | Line 1379 | void save_with_ratio(TH1F *nominator, TH
1379		TH1F *ratio = (TH1F*)nominator->Clone(GetNumericHistoName().c_str());
1380		ratio->Divide(denominator);
1381
1285	–
1382		TGraphAsymmErrors *eratio;
1383	+	TH1F *SystDown;
1384	+	TH1F *SystUp;
1385	+
1386		if(!do_bpred_ratio) eratio = produce_ratio_graph(ratio);
1387		else {
1388		bool using_data=false;
1389		if((int)savemeas.find("Data")>0) using_data=true;
1390		eratio = histRatio(nominator,denominator,using_data,PlottingSetup::global_ratio_binning,false);
1391	+	if(syshisto!=0) {
1392	+	SystDown = (TH1F*)syshisto->Clone("SystDown");
1393	+	SystUp = (TH1F*)syshisto->Clone("SystUp");
1394	+	for(int i=1;i<=syshisto->GetNbinsX();i++) {
1395	+	SystDown->SetBinContent(i,1-syshisto->GetBinContent(i));
1396	+	SystUp->SetBinContent(i,1+syshisto->GetBinContent(i));
1397	+	}
1398	+	SystDown->SetLineColor(TColor::GetColor("#006DE1"));
1399	+	SystUp->SetLineColor(TColor::GetColor("#006DE1"));
1400	+	}
1401		for(int i=1;i<=ratio->GetNbinsX();i++) {
1402		ratio->SetBinContent(i,0);
1403		ratio->SetBinError(i,0);
1404		}
1405	+
1406	+	}
1407	+
1408	+	if(syshisto && !do_bpred_ratio) {
1409	+	SystDown = (TH1F*)syshisto->Clone("SystDown");
1410	+	SystUp = (TH1F*)syshisto->Clone("SystUp");
1411	+	for(int i=1;i<=syshisto->GetNbinsX();i++) {
1412	+	SystDown->SetBinContent(i,1-syshisto->GetBinContent(i));
1413	+	SystUp->SetBinContent(i,1+syshisto->GetBinContent(i));
1414	+	}
1415	+	SystDown->SetLineColor(TColor::GetColor("#006DE1"));
1416	+	SystUp->SetLineColor(TColor::GetColor("#006DE1"));
1417		}
1418		eratio->SetFillColor(TColor::GetColor("#00ADE1"));
1419
1420		ratio->SetTitle("");
1421	<	ratio->GetYaxis()->SetRangeUser(0.5,1.5);
1421	>	ratio->GetYaxis()->SetRangeUser(0.0,2.0);
1422		if(do_bpred_ratio) ratio->GetYaxis()->SetRangeUser(0.0,2.0);
1423		if(extendrange) ratio->GetYaxis()->SetRangeUser(0.0,4.0);
1424		ratio->GetXaxis()->SetTitle(nominator->GetXaxis()->GetTitle());
#	Line 1314 | Line 1435 | void save_with_ratio(TH1F *nominator, TH
1435		ratio->SetFillColor(TColor::GetColor("#58D3F7"));
1436		ratio->SetMarkerSize(0);
1437		ratio->Draw("e2");
1438	<	eratio->Draw("2");
1438	>
1439	>	TGraphAsymmErrors *ratio_center = (TGraphAsymmErrors*)eratio->Clone("ratio_center");
1440	>	for(int i=0;i<ratio_center->GetN();i++) {
1441	>	ratio_center->SetPointError(i,ratio_center->GetErrorXlow(i),ratio_center->GetErrorXhigh(i),0.005,0.005);
1442	>	}
1443	>
1444	>	ratio_center->SetFillColor(TColor::GetColor("#006381"));
1445	>
1446	>	if(syshisto!=0) {
1447	>	//    sysratio->Draw("2");
1448	>	//    eratio->Draw("2,same");
1449	>	eratio->Draw("2");
1450	>	SystDown->Draw("histo,same");
1451	>	SystUp->Draw("histo,same");
1452	>	} else {
1453	>	eratio->Draw("2");
1454	>	}
1455	>	ratio_center->Draw("2");
1456		ratio->Draw("same,axis");
1457		TLine *oneline = new TLine(ratio->GetXaxis()->GetBinLowEdge(1),1,ratio->GetXaxis()->GetBinLowEdge(ratio->GetNbinsX())+ratio->GetXaxis()->GetBinWidth(ratio->GetNbinsX()),1);
1458		oneline->SetLineStyle(2);
#	Line 1331 | Line 1469 | void save_with_ratio(TH1F *nominator, TH
1469
1470		Double_t chi2;
1471		Int_t ndf,igood;
1472	<	Double_t res=0.0;
1472	>	//  Double_t res=0.0;
1473		Double_t chi2prob = MarcosChi2TestX(nominator,denominator,chi2,ndf,igood,"UW");
1474
1475		stringstream Chi2text;
#	Line 1346 | Line 1484 | void save_with_ratio(TH1F *nominator, TH
1484		chi2probbox->SetTextSize(0.08);
1485		chi2probbox->SetTextAlign(11);
1486		chi2probbox->Draw();
1487	+
1488	+	stringstream CompRatio;
1489	+	CompRatio << "Ratio: " << nominator->Integral() << " / " << denominator->Integral() << " \n " << nominator->Integral()/denominator->Integral();
1490	+	TText *CompleteRatio = write_text(0.98,0.04,CompRatio.str());
1491	+	CompleteRatio->SetTextSize(0.08);
1492	+	CompleteRatio->SetTextAlign(31);
1493	+	CompleteRatio->Draw();
1494	+
1495		CompleteSave(main_canvas,savemeas+"_withratio_and_Chi2");
1496
1497		//  float KS   = nominator->KolmogorovTest(denominator);
#	Line 1353 | Line 1499 | void save_with_ratio(TH1F *nominator, TH
1499		//  Chi2text << "KS = " << KS << endl;
1500		//cout << "Found : " << KStext.str() << endl;
1501
1356	–
1502		delete main_canvas;
1503		}
1504
1505	+	void save_with_ratio_and_sys_band(TH1F *nominator, TH1F *denominator, TVirtualPad *canvas, string savemeas, bool do_bpred_ratio=false, bool extendrange=false, string yaxistitle="ratio",TH1F *syshisto=NULL) {
1506	+	//this function saves the pad being passed as well as a new one including the SysRatio.
1507	+	CompleteSave(canvas,savemeas);
1508	+
1509	+	float bottommargin=gStyle->GetPadBottomMargin();
1510	+	float canvas_height=gStyle->GetCanvasDefH();
1511	+	float canvas_width=gStyle->GetCanvasDefW();
1512	+	float ratiospace=0.25;// space the ratio should take up (relative to original pad)
1513	+
1514	+	float ratiobottommargin=0.3;
1515	+	float ratiotopmargin=0.1;
1516	+
1517	+	float xstretchfactor=((1-ratiospace)*(1-gStyle->GetPadTopMargin()))/((1)*ratiospace);
1518	+
1519	+	TCanvas *main_canvas = new TCanvas("main_canvas","main_canvas",(Int_t)canvas_width,(Int_t)(canvas_height*(1+ratiospace)));
1520	+	TPad *mainpad = new TPad("mainpad","mainpad",0,1-(1.0/(1+ratiospace)),1,1);//top (main) pad
1521	+	TPad *coverpad = new TPad("coverpad","coverpad",gStyle->GetPadLeftMargin()-0.008,1-(1.0/(1+ratiospace))-0.04,1,1-(1.0/(1+ratiospace))+0.103);//pad covering up the x scale
1522	+	TPad *bottompad = new TPad("bottompad", "Ratio Pad",0,0,1,(1-(1-bottommargin)/(1+ratiospace))-0.015); //bottom pad
1523	+
1524	+	main_canvas->Range(0,0,1,1);
1525	+	main_canvas->SetBorderSize(0);
1526	+	main_canvas->SetFrameFillColor(0);
1527	+
1528	+	mainpad->Draw();
1529	+	mainpad->cd();
1530	+	mainpad->Range(0,0,1,1);
1531	+	mainpad->SetFillColor(kWhite);
1532	+	mainpad->SetBorderSize(0);
1533	+	mainpad->SetFrameFillColor(0);
1534	+	canvas->Range(0,0,1,1);
1535	+	canvas->Draw("same");
1536	+	mainpad->Modified();
1537	+	main_canvas->cd();
1538	+	coverpad->Draw();
1539	+	coverpad->cd();
1540	+	coverpad->Range(0,0,1,1);
1541	+	coverpad->SetFillColor(kWhite);
1542	+	coverpad->SetBorderSize(0);
1543	+	coverpad->SetFrameFillColor(0);
1544	+	coverpad->Modified();
1545	+	main_canvas->cd();
1546	+	bottompad->SetTopMargin(ratiotopmargin);
1547	+	bottompad->SetBottomMargin(ratiobottommargin);
1548	+	bottompad->Draw();
1549	+	bottompad->cd();
1550	+	bottompad->Range(0,0,1,1);
1551	+	bottompad->SetFillColor(kWhite);
1552	+	TH1F *ratio = (TH1F*)nominator->Clone(GetNumericHistoName().c_str());
1553	+	ratio->Divide(denominator);
1554	+
1555	+
1556	+	TGraphAsymmErrors *eratio;
1557	+	TGraphAsymmErrors *SysEnvelope = new TGraphAsymmErrors();
1558	+
1559	+	if(syshisto && !do_bpred_ratio) {
1560	+	for(int i=1;i<=syshisto->GetNbinsX();i++) {
1561	+	float dx=syshisto->GetBinWidth(i)/2.0;
1562	+	float dy=syshisto->GetBinContent(i);
1563	+	if(dy<0.01) dy=0.07;
1564	+	SysEnvelope->SetPoint(i-1,syshisto->GetBinCenter(i),1.0);
1565	+	SysEnvelope->SetPointError(i-1,dx,dx,dy,dy);
1566	+	}
1567	+	SysEnvelope->SetFillColor(TColor::GetColor("#006DE1"));
1568	+	}
1569	+
1570	+	ratio->SetTitle("");
1571	+	ratio->GetYaxis()->SetRangeUser(0.0,2.0);
1572	+	if(do_bpred_ratio) ratio->GetYaxis()->SetRangeUser(0.0,2.0);
1573	+	if(extendrange) ratio->GetYaxis()->SetRangeUser(0.0,4.0);
1574	+	ratio->GetXaxis()->SetTitle(nominator->GetXaxis()->GetTitle());
1575	+	ratio->GetXaxis()->CenterTitle();
1576	+	ratio->GetYaxis()->SetTitle(yaxistitle.c_str());
1577	+	ratio->GetYaxis()->SetTitleOffset(0.4);
1578	+	ratio->GetYaxis()->CenterTitle();
1579	+	ratio->SetStats(0);
1580	+	ratio->GetXaxis()->SetLabelSize(xstretchfactor*ratio->GetXaxis()->GetLabelSize());
1581	+	ratio->GetYaxis()->SetLabelSize(xstretchfactor*ratio->GetYaxis()->GetLabelSize());
1582	+	ratio->GetXaxis()->SetTitleSize(xstretchfactor*gStyle->GetTitleSize());
1583	+	ratio->GetYaxis()->SetTitleSize(xstretchfactor*gStyle->GetTitleSize());
1584	+	ratio->GetYaxis()->SetNdivisions(502,false);
1585	+	ratio->SetFillColor(TColor::GetColor("#58D3F7"));
1586	+	ratio->Draw("e1");
1587	+
1588	+	if(syshisto!=0) {
1589	+	SysEnvelope->SetFillColor(TColor::GetColor("#FE9A2E"));
1590	+	SysEnvelope->Draw("2,same");
1591	+	ratio->Draw("e1,same");
1592	+	} else {
1593	+	eratio->Draw("1");
1594	+	}
1595	+	ratio->Draw("same,axis");
1596	+	TLine *oneline = new TLine(ratio->GetXaxis()->GetBinLowEdge(1),1,ratio->GetXaxis()->GetBinLowEdge(ratio->GetNbinsX())+ratio->GetXaxis()->GetBinWidth(ratio->GetNbinsX()),1);
1597	+	oneline->SetLineStyle(2);
1598	+	oneline->SetLineColor(kBlue);
1599	+	oneline->Draw("same");
1600	+
1601	+	main_canvas->cd();
1602	+	main_canvas->Modified();
1603	+	main_canvas->cd();
1604	+	main_canvas->SetSelected(main_canvas);
1605	+
1606	+	CompleteSave(main_canvas,savemeas+"_withSysRatio");
1607	+	bottompad->cd();
1608	+
1609	+	Double_t chi2;
1610	+	Int_t ndf,igood;
1611	+	Double_t chi2prob = MarcosChi2TestX(nominator,denominator,chi2,ndf,igood,"UW");
1612	+
1613	+	stringstream Chi2text;
1614	+	Chi2text << "#chi^{2} / ndf: " << chi2 << " / " << ndf;
1615	+	stringstream Chi2probtext;
1616	+	Chi2probtext << "#chi^{2} prob: " << chi2prob;
1617	+	TText* chi2box = write_text(0.02,0.11,Chi2text.str());
1618	+	chi2box->SetTextSize(0.08);
1619	+	chi2box->SetTextAlign(11);
1620	+	chi2box->Draw();
1621	+	TText* chi2probbox = write_text(0.02,0.04,Chi2probtext.str());
1622	+	chi2probbox->SetTextSize(0.08);
1623	+	chi2probbox->SetTextAlign(11);
1624	+	chi2probbox->Draw();
1625	+
1626	+	stringstream CompRatio;
1627	+	CompRatio << "Ratio: " << nominator->Integral() << " / " << denominator->Integral() << " \n " << nominator->Integral()/denominator->Integral();
1628	+	TText *CompleteRatio = write_text(0.98,0.04,CompRatio.str());
1629	+	CompleteRatio->SetTextSize(0.08);
1630	+	CompleteRatio->SetTextAlign(31);
1631	+	CompleteRatio->Draw();
1632	+
1633	+	CompleteSave(main_canvas,savemeas+"_withSysRatio_and_Chi2");
1634	+	delete main_canvas;
1635	+	}
1636
1637	<	TH1F* CollapseStack(THStack stack) {
1637	>	TH1F* CollapseStack(THStack stack,TString hname="base") {
1638		TH1F *bhist = ((TH1F*)((stack.GetHists())->At(0)));
1639	<	TH1F *basehisto = (TH1F*)bhist->Clone("base");
1639	>	TH1F *basehisto = (TH1F*)bhist->Clone(hname);
1640		TIter next(stack.GetHists());
1641		TH1F *h;
1642		int counter=0;
#	Line 1389 | Line 1665 | void flag_this_change(string function, i
1665		if(checked==2) write_info(function,peakmodificationwarning.str());
1666		}
1667
1668	<	void write_analysis_type(bool isonpeak) {
1668	>	void write_analysis_type(bool isonpeak, bool dobtag) {
1669		//http://www.network-science.de/ascii/, ogre
1670		if(!PlottingSetup::publicmode) {
1671		if(isonpeak) {
1672	+	//font: big
1673		dout << "\033[1;34m" << endl;
1674	<	dout <<  "    //\\\\                                  _                          _           _     " << endl;
1675	<	dout <<  "   //  \\\\     ___  _ __  _ __   ___  __ _| | __     __ _ _ __   __ _| |_   _ ___(_)___" << endl;
1676	<	dout <<  "  //    \\\\   / _ \\| '_ \\| '_ \\ / _ \\/ _` | |/ /    / _` | '_ \\ / _` | | | | / __| / __|" << endl;
1677	<	dout <<  " //      \\\\ | (_) | | | | |_) |  __/ (_| |   <    | (_| | | | | (_| | | |_| \\__ \\ \\__ \\" << endl;
1678	<	dout <<  "//        \\\\ \\___/|_| |_| .__/ \\___|\\__,_|_|\\_\\    \\__,_|_| |_|\\__,_|_|\\__, |___/_|___/" << endl;
1679	<	dout <<  "                        |_|                                            |___/" << endl;
1674	>	dout <<  "                             _ __________                                                         " << endl;
1675	>	dout <<  "                            | |___  /  _ \\                                                       " << endl;
1676	>	dout <<  "       /\\           ___     | |  / /| |_) |                                                       " << endl;
1677	>	dout <<  "      /  \\         /  _|_   | | / / |  _ <                                                         " << endl;
1678	>	dout <<  "     /    \\        | (_| |__| |/ /__| |_) |                                                       " << endl;
1679	>	dout <<  "                   \\___|\\____//_____|____/                                                       " << endl;
1680		} else {
1404	–	dout << "\033[1;33m" << endl;
1405	–	/*      dout <<  "                    __  __                  _                          _           _     " << endl;
1406	–	dout <<  "              ___  / _|/ _|_ __   ___  __ _| | __     __ _ _ __   __ _| |_   _ ___(_)___ " << endl;
1407	–	dout <<  "    /\\       / _ \\| |_| |_| '_ \\ / _ \\/ _` | |/ /    / _` | '_ \\ / _` | | | | / __| / __|" << endl;
1408	–	dout <<  " /\\/  \\__   | (_) |  _|  _| |_) |  __/ (_| |   <    | (_| | | | | (_| | | |_| \\__ \\ \\__ \\" << endl;
1409	–	dout <<  "             \\___/|_| |_| | .__/ \\___|\\__,_|_|\\_\\    \\__,_|_| |_|\\__,_|_|\\__, |___/_|___/" << endl;
1410	–	dout <<  "                          |_|                                            |___/           " << endl;*/
1411	–
1681		//font: big
1682	+	dout << "\033[1;33m" << endl;
1683		dout <<  "                    _      _ __________                                                             " << endl;
1684		dout <<  "                   (_)    | |___  /  _ \\                                                            " << endl;
1685		dout <<  "       /\\           _     | |  / /| |_) |                                                           " << endl;
#	Line 1417 | Line 1687 | void write_analysis_type(bool isonpeak)
1687		dout <<  "   /      \\        | | |__| |/ /__| |_) |                                                           " << endl;
1688		dout <<  "                   |_|\\____//_____|____/                                                            " << endl;
1689		}
1690	<	dout << "\033[0m" << endl;
1690	>
1691	>	if(dobtag) {
1692	>	//font: big
1693	>	dout <<  "\033[1;32m                  \\     /                                                                " << endl;
1694	>	dout <<  "             \\    o ^ o    /                                                             " << endl;
1695	>	dout <<  "               \\ (     ) /                                                               " << endl;
1696	>	dout <<  "    ____________(%%%%%%%)____________        _          _ __________                     " << endl;
1697	>	dout <<  "   (     /   /  )%%%%%%%(  \\   \\     )      | |        | |___  /  _ \\                    " << endl;
1698	>	dout <<  "   (___/___/__/           \\__\\___\\___)      | |__      | |  / /| |_) |                   " << endl;
1699	>	dout <<  "      (     /  /(%%%%%%%)\\  \\     )         | '_ \\ _   | | / / |  _ <                    " << endl;
1700	>	dout <<  "       (__/___/ (%%%%%%%) \\___\\__)          | |_) | |__| |/ /__| |_) |                   " << endl;
1701	>	dout <<  "               /(       )\\                  |_.__/ \\____//_____|____/                    " << endl;
1702	>	dout <<  "             /   (%%%%%)   \\                                                             " << endl;
1703	>	dout <<  "                  (%%%)                                                                  " << endl;
1704	>	dout <<  "                    !                                                                    " << endl;
1705		}
1706	+	} else {
1707	+	//we're in public! don't advertise what we're up to :-)
1708	+	dout << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << endl;
1709	+	dout << "                              Starting the analysis                     " << endl;
1710	+	dout << "                                     i:" << !isonpeak << " , b " << dobtag << endl;
1711	+	dout << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << endl;
1712	+	}
1713	+	dout << "\033[0m" << endl;
1714	+
1715		}
1716
1717
#	Line 1427 | Line 1720 | vector<string> StringSplit(string str, s
1720		vector<string> results;
1721
1722		int cutAt;
1723	<	while( (cutAt = str.find_first_of(delim)) != str.npos )
1723	>	while( (cutAt = str.find_first_of(delim)) != (int)str.npos )
1724		{
1725		if(cutAt > 0)
1726		{
#	Line 1444 | Line 1737 | vector<string> StringSplit(string str, s
1737
1738		void manually_set_jzb_cuts(vector<float> &jzb_cut,string jzbcut_string) {
1739		vector<string> jzbcutvector = StringSplit(jzbcut_string,",");
1740	<	for(int i=0;i<jzbcutvector.size();i++) {
1740	>	for(int i=0;i<(int)jzbcutvector.size();i++) {
1741		jzb_cut.push_back(atoi(jzbcutvector[i].c_str()));
1742		dout << "Added a JZB cut manually at " << atoi(jzbcutvector[i].c_str()) << endl;
1743		}
#	Line 1458 | Line 1751 | void process_directory(TString directory
1751		dp = opendir (directory);
1752		if (dp != NULL)
1753		{
1754	<	while (ep = readdir (dp))
1754	>	while ((ep = readdir (dp)))
1755		{
1756		string filename=(string)ep->d_name;
1757	<	if(filename.find(".root")!=-1)
1757	>	if((int)filename.find(".root")!=-1)
1758		{
1759		files.push_back(string(directory)+filename);
1760		}
#	Line 1472 | Line 1765 | void process_directory(TString directory
1765		perror ("Couldn't open the directory");
1766		}
1767
1768	+	void ClearHisto(TH1* histo) {
1769	+	for(int ix=0;ix<=histo->GetNbinsX()+1;ix++) {//also reset over- and underflow
1770	+	histo->SetBinContent(ix,0);
1771	+	histo->SetBinContent(ix,0);
1772	+	}
1773	+	}
1774	+
1775	+	void AddSquared(TH1F *histo, TH1F *addthis, float weight) {
1776	+	for(int ix=1;ix<=addthis->GetNbinsX()+1;ix++) {//also include over- and underflow
1777	+	float bincenter=addthis->GetBinCenter(ix);
1778	+	int nBinHisto= histo->FindBin(bincenter);
1779	+	float old_content=histo->GetBinContent(nBinHisto);
1780	+	histo->SetBinContent(nBinHisto,old_content+((addthis->GetBinContent(ix))*(addthis->GetBinContent(ix))*weight));
1781	+	}
1782	+	}
1783	+
1784	+	void SQRT(TH1* histo) {
1785	+	for(int ix=0;ix<=histo->GetNbinsX()+1;ix++) {//also include over- and underflow
1786	+	histo->SetBinContent(ix,TMath::Sqrt(histo->GetBinContent(ix)));
1787	+	}
1788	+	}
1789	+
1790		/*string GetCompleteHostname() {
1791		struct addrinfo hints, *info, *p;
1792		int gai_result;
#	Line 1503 | Line 1818 | const char* concatenate (const char* a,
1818		return bla.str().c_str();
1819		}
1820
1821	+
1822	+	string ReplaceCharacter(string originalstring,string replacethis,string replacewiththis)
1823	+	{
1824	+	int pos = originalstring.find(replacethis);
1825	+	while(pos != -1) {
1826	+	originalstring.replace(pos, replacewiththis.length(), replacewiththis);
1827	+	pos = originalstring.find(replacethis);
1828	+	}
1829	+	return originalstring;
1830	+	}
1831	+
1832	+	string removefunnystring(string name) {
1833	+	name=ReplaceCharacter(name,"[","_");
1834	+	name=ReplaceCharacter(name,"]","_");
1835	+	name=ReplaceCharacter(name,"{","_");
1836	+	name=ReplaceCharacter(name,"}","_");
1837	+	name=ReplaceCharacter(name,"(","_");
1838	+	name=ReplaceCharacter(name,")","_");
1839	+	name=ReplaceCharacter(name," ","_");
1840	+	name=ReplaceCharacter(name,".","_");
1841	+	name=ReplaceCharacter(name,",","_");
1842	+	name=ReplaceCharacter(name,";","_");
1843	+	name=ReplaceCharacter(name,":","_");
1844	+	name=ReplaceCharacter(name,"'","_");
1845	+	name=ReplaceCharacter(name,"$","_");
1846	+	name=ReplaceCharacter(name,"@","_");
1847	+	name=ReplaceCharacter(name,"#","_");
1848	+	name=ReplaceCharacter(name,"+","_");
1849	+	name=ReplaceCharacter(name,"-","_");
1850	+	name=ReplaceCharacter(name,"/","_");
1851	+	return name;
1852	+	}
1853	+
1854	+	TPolyLine* GetFitUncertaintyShape(TF1 *fit, float low, float high,float x0,float x1) {
1855	+	int nPoints=1000;
1856	+	double x[nPoints+1];
1857	+	double y[nPoints];
1858	+
1859	+	float par1=fit->GetParameter(0);
1860	+	float dpar1=fit->GetParError(0);
1861	+	float par2=fit->GetParameter(1);
1862	+	float dpar2=fit->GetParError(1);
1863	+
1864	+	float step=(x1-x0)/(nPoints/2.0 -1);
1865	+	for(int i=0;i<nPoints/2.0;i++) {
1866	+	x[i]=x0+i*step;
1867	+	y[i]=(par1+x[i]*par2)    -    sqrt(dpar1*dpar1+dpar2*dpar2*x[i]*x[i]);
1868	+	x[nPoints-1-i]=x[i];
1869	+	y[nPoints-1-i]=(par1+x[i]*par2)    +    sqrt(dpar1*dpar1+dpar2*dpar2*x[i]*x[i]);
1870	+	if(y[i]<low) y[i]=low;
1871	+	if(y[i]>high) y[i]=high;
1872	+	if(y[nPoints-1-i]<low) y[nPoints-1-i]=low;
1873	+	if(y[nPoints-1-i]>high) y[nPoints-1-i]=high;
1874	+	}
1875	+
1876	+	x[nPoints]=x[0];
1877	+	y[nPoints]=y[0];
1878	+
1879	+	TPolyLine *l = new TPolyLine(nPoints+1,x,y);
1880	+	l->SetFillColor(TColor::GetColor("#5858FA"));
1881	+	l->SetLineColor(TColor::GetColor("#5858FA"));
1882	+	l->SetLineWidth(1);
1883	+	return l;
1884	+	}
1885	+
1886	+	//code for ReplaceAll copied from
1887	+	//http://stackoverflow.com/questions/5343190/c-how-do-i-replace-all-instances-of-of-a-string-with-another-string
1888	+	string ReplaceAll(string str, string from, string to) {
1889	+	size_t start_pos = 0;
1890	+	while((start_pos = str.find(from, start_pos)) != std::string::npos) {
1891	+	str.replace(start_pos, from.length(), to);
1892	+	start_pos += to.length(); // ...
1893	+	}
1894	+	return str;
1895	+	}
1896	+
1897	+	TPolyLine* GetFitUncertaintyShape(TH1 *histo, string fitname, float low, float high) {
1898	+	TF1 *fit = (TF1*)histo->GetFunction(fitname.c_str());
1899	+	if(!fit) {
1900	+	cout << "CANNOT PRODUCE FIT UNCERTAINTY AS THERE IS NO FIT CALLED " << fitname << " IN " << histo->GetName() << endl;
1901	+	return NULL;
1902	+	}
1903	+	float x0=histo->GetBinLowEdge(1);
1904	+	float x1=histo->GetBinLowEdge(histo->GetNbinsX())+histo->GetBinWidth(histo->GetNbinsX());
1905	+	return GetFitUncertaintyShape(fit, low, high,x0,x1);
1906	+	}
1907	+
1908	+	TPolyLine* GetFitUncertaintyShape(TGraphErrors *gr, string fitname, float low, float high, float minx=-999, float maxx=-999) {
1909	+	TF1 *fit = (TF1*)gr->GetFunction(fitname.c_str());
1910	+	if(!fit) {
1911	+	cout << "CANNOT PRODUCE FIT UNCERTAINTY AS THERE IS NO FIT CALLED " << fitname << " IN " << gr->GetName() << endl;
1912	+	return NULL;
1913	+	}
1914	+	double x,y;
1915	+	gr->GetPoint(0,x,y);
1916	+	float min=x;
1917	+	gr->GetPoint(gr->GetN()-1,x,y);
1918	+	float max=x;
1919	+	if(minx>-999 && maxx>-999 && minx<maxx) {
1920	+	max=maxx;
1921	+	min=minx;
1922	+	}
1923	+	return GetFitUncertaintyShape(fit, low, high,min,max);
1924	+	}
1925	+
1926		stringstream all_bugs;
1927
1928		void bug_tracker(string function, int line, string description) {
#	Line 1540 | Line 1960 | void bug_tracker(string function, int li
1960		//TODO: Write a bug summary at the end.
1961
1962		float pSTAR(float mglu, float mlsp, float mchi2) {
1963	<	float mz=91.2;
1963	>	float mz=91.0;
1964		float res=((mchi2*mchi2)-(mlsp+mz)*(mlsp+mz));
1965		res*=((mchi2*mchi2)-(mlsp-mz)*(mlsp-mz));
1966		res=TMath::Sqrt(res)/(2*mchi2);
#	Line 1548 | Line 1968 | float pSTAR(float mglu, float mlsp, floa
1968		}
1969
1970		float generalizedpSTAR(float massmother, float massdaughter1, float massdaughter2) {
1551	–	float mz=91.2;
1971		float res=((massmother*massmother)-(massdaughter1+massdaughter2)*(massdaughter1+massdaughter2));
1972		res*=((massmother*massmother)-(massdaughter1-massdaughter2)*(massdaughter1-massdaughter2));
1973		res=TMath::Sqrt(res)/(2*massmother);
1974		return res;
1975		}
1976	+
1977	+	void FindMinMax(TGraphErrors *gr, float &min, float &max) {
1978	+	double x,y;
1979	+	gr->GetPoint(0,x,y);
1980	+	min=500*y;
1981	+	max=0.0002*y;
1982	+	for(int i=0;i<gr->GetN();i++) {
1983	+	gr->GetPoint(i,x,y);
1984	+	cout << "Point at " << x << "/" << y << " with error " << gr->GetErrorY(i) << endl;
1985	+	float potmin=y-1.5*gr->GetErrorY(i); // taking 1.5 times the error to allow for enough space to present the plot
1986	+	float potmax=y+1.5*gr->GetErrorY(i); // taking 1.5 times the error to allow for enough space to present the plot
1987	+	if(potmin<min) min=potmin;
1988	+	if(potmax>max) max=potmax;
1989	+	}
1990	+	}
1991	+
1992	+
1993	+	void CleanLegends() {
1994	+	cout << "----------------------- before deleting anything -----------------------" << endl;
1995	+	gROOT->ls();
1996	+	cout << "---------------------- /before deleting anything -----------------------" << endl;
1997	+
1998	+	for(int ihist=(int)PlottingSetup::FakeHistoHeap.size()-1;ihist>=0;ihist--) {
1999	+	cout << "Deleting item " << ihist << endl;
2000	+	cout << "    " << PlottingSetup::FakeHistoHeap[ihist]->GetName() << " , " << PlottingSetup::FakeHistoHeap[ihist]->GetTitle() << endl;
2001	+	PlottingSetup::FakeHistoHeap[ihist]->Delete();
2002	+	PlottingSetup::FakeHistoHeap.pop_back();
2003	+	}
2004	+	}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines