ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/cbrown/AnalysisFramework/Plotting/Modules/LimitCalculation.C

Comparing UserCode/cbrown/AnalysisFramework/Plotting/Modules/LimitCalculation.C (file contents):
Revision 1.21 by buchmann, Wed Sep 14 12:02:01 2011 UTC vs.
Revision 1.22 by buchmann, Wed Sep 14 13:20:33 2011 UTC

#	Line 170 | Line 170 | ratio_binning.push_back(80);
170
171		}
172
173	<	vector<float> compute_one_upper_limit(float mceff,float mcefferr, int ibin, string mcjzb, string plotfilename, bool doobserved) {
173	>	vector<float> compute_one_upper_limit(float mceff,float mcefferr, int ibin, string mcjzb, string plotfilename, bool doexpected) {
174		float sigma95=-9.9,sigma95A=-9.9;
175		/*
176		USAGE OF ROOSTATS_CL95
#	Line 216 | Line 216 | USAGE OF ROOSTATS_CL95
216		dout << "Calling limit capsule instead of calling : CL95(" << luminosity << "," <<  lumiuncert*luminosity << "," << mceff << "," << mcefferr << "," << Npred[ibin] << "," << Nprederr[ibin] << "," << Nobs[ibin] << "," << false << "," << nuisancemodel<< ") " << endl;
217
218		stringstream command;
219	<	command << PlottingSetup::cbafbasedir << "/DistributedModelCalculations/Limits/LimitCapsule.exec " << repname.str() << " " << luminosity << " " << luminosity*lumiuncert << " " << mceff << " " << mcefferr << " " << Npred[ibin] << " " << Nprederr[ibin] << " " << Nobs[ibin] << " " << -1 << " " << plotfilename;
219	>	command << PlottingSetup::cbafbasedir << "/DistributedModelCalculations/Limits/LimitCapsule.exec " << repname.str() << " " << luminosity << " " << luminosity*lumiuncert << " " << mceff << " " << mcefferr << " " << Npred[ibin] << " " << Nprederr[ibin] << " " << Nobs[ibin] << " " << -1 << " " << plotfilename << " " << doexpected;
220		dout << command.str() << endl;
221
222		int retval = 256;
#	Line 231 | Line 231 | USAGE OF ROOSTATS_CL95
231		limres.readDroplet(repname.str());
232		dout << limres << endl;
233		remove(repname.str().c_str());
234	<	sigma95=limres.expected;
234	>	sigma95=limres.observed;
235
236
237		///------------------------------------------ < /NEW > ----------------------------------------------------------
238	<	//if(doobserved) nlimittoysused=nlimittoys;
238	>	//if(doexpected) nlimittoysused=nlimittoys;
239		//    nlimittoysused=nlimittoys;
240		//  dout << "Now calling : CL95(" << luminosity << "," <<  lumiuncert*luminosity << "," << mceff << "," << mcefferr << "," << Npred[ibin] << "," << Nprederr[ibin] << "," << Nobs[ibin] << "," << false << "," << nuisancemodel<< ") " << endl;
241		//  sigma95 = CL95(luminosity, lumiuncert*luminosity, mceff, mcefferr, Npred[ibin], Nprederr[ibin], Nobs[ibin], false, nuisancemodel);
#	Line 255 | Line 255 | USAGE OF ROOSTATS_CL95
255		sigmas.push_back(limit.GetTwoSigmaLowRange());//expected, 2 down
256		*/
257		//  float limit = roostats_cl95(luminosity,lumiuncert*luminosity,mceff,mcefferr,Npred[ibin],Nprederr[ibin],nlimittoysused,false,nuisancemodel,limitmethod,plotfilename,0);
258	<	if(doobserved) {
259	<	write_warning(__FUNCTION__,"OBSERVED LIMITS HAVE BEEN SWITCHED OFF TEMPORARILY");
258	>	if(doexpected) {
259	>	write_warning(__FUNCTION__,"EXPECTED LIMITS HAVE BEEN SWITCHED OFF TEMPORARILY");
260		//    dout << "Now calling : CLA(" << luminosity << "," <<  lumiuncert*luminosity << "," << mceff << "," << mcefferr << "," << Npred[ibin] << "," << Nprederr[ibin] << "," << nuisancemodel<< ") " << endl;
261		//    sigma95A = CLA(luminosity, lumiuncert*luminosity, mceff, mcefferr, Npred[ibin], Nprederr[ibin], nuisancemodel);
262		}
#	Line 272 | Line 272 | write_warning(__FUNCTION__,"OBSERVED LIM
272		write_warning(__FUNCTION__,"STILL MISSING SIGMAS, LIMITS, EVERYTHING ...");
273		}
274
275	<	void compute_upper_limits_from_counting_experiment(vector<vector<float> > uncertainties,vector<float> jzbcuts, string mcjzb, bool doobserved) {
275	>	void compute_upper_limits_from_counting_experiment(vector<vector<float> > uncertainties,vector<float> jzbcuts, string mcjzb, bool doexpected) {
276		dout << "Doing counting experiment ... " << endl;
277		vector<vector<string> > limits;
278		vector<vector<float> > vlimits;
#	Line 297 | Line 297 | void compute_upper_limits_from_counting_
297		//      float expected=observed/luminosity;
298		string plotfilename=(string)(TString(signalsamples.collection[isample].samplename)+TString("___JZB_geq_")+TString(any2string(JZBcutat))+TString(".png"));
299		dout << "Sample: " << signalsamples.collection[isample].samplename << ", JZB>"<<JZBcutat<< " : " << mceff << " +/- " << staterr << " (stat) +/- " << systerr << " (syst) --> toterr = " << toterr << endl;
300	<	vector<float> sigmas = compute_one_upper_limit(mceff,toterr,ibin,mcjzb,plotfilename,doobserved);
300	>	vector<float> sigmas = compute_one_upper_limit(mceff,toterr,ibin,mcjzb,plotfilename,doexpected);
301
302	<	if(doobserved) {
302	>	if(doexpected) {
303		//      rows.push_back(any2string(sigmas[0])+";"+any2string(sigmas[1])+";"+"("+any2string(expected)+")");
304		rows.push_back(any2string(sigmas[0])+";"+any2string(sigmas[1])+";"+"("+any2string(signalsamples.collection[isample].xs)+")");
305		vrows.push_back(sigmas[0]);
#	Line 333 | Line 333 | void compute_upper_limits_from_counting_
333		dout << endl;
334		}
335
336	<	if(!doobserved) {
336	>	if(!doexpected) {
337		dout << endl << endl << "LIMITS: (Tex)" << endl;
338		tout << "\\begin{table}[hbtp]" << endl;
339		tout << "\\renewcommand{\\arraystretch}{1.3}" << endl;

Diff Legend

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