ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/cbrown/AnalysisFramework/Plotting/Modules/SUSYScan.C
(Generate patch)

Comparing UserCode/cbrown/AnalysisFramework/Plotting/Modules/SUSYScan.C (file contents):
Revision 1.32 by buchmann, Wed Sep 7 06:30:25 2011 UTC vs.
Revision 1.33 by buchmann, Wed Sep 7 06:37:47 2011 UTC

# Line 155 | Line 155 | void establish_SUSY_limits(string mcjzb,
155    
156    TH2F *fullerr   = (TH2F*)fsyst->Get((prefix+"systotmap"+any2string(jzb_cut[ibin])).c_str());
157    TH2F *mceff     = (TH2F*)fsyst->Get((prefix+"efficiencymap"+any2string(jzb_cut[ibin])).c_str());
158 <  TH2F *NEvents   = (TH2F*)fsyst->Get((prefix+"Nevents"+any2string(jzb_cut[ibin])).c_str());
158 >  TH2F *NEvents   = (TH2F*)fsyst->Get((prefix+"Neventsmap"+any2string(jzb_cut[ibin])).c_str());
159    
160    TH2F *limitmap  = new TH2F((prefix+"limitmap"+any2string(jzb_cut[ibin])).c_str(), "",(mgluend-mglustart)/mglustep+1,mglustart-0.5*mglustep,mgluend+0.5*mglustep,(mLSPend-mLSPstart)/mLSPstep+1,mLSPstart-0.5*mLSPstep,mLSPend+0.5*mLSPstep);
161    TH2F *exclmap  = new TH2F((prefix+"exclusionmap"+any2string(jzb_cut[ibin])).c_str(), "",(mgluend-mglustart)/mglustep+1,mglustart-0.5*mglustep,mgluend+0.5*mglustep,(mLSPend-mLSPstart)/mLSPstep+1,mLSPstart-0.5*mLSPstep,mLSPend+0.5*mLSPstep);
# Line 174 | Line 174 | void establish_SUSY_limits(string mcjzb,
174        ipoint++;
175        if(!runninglocally&&!do_this_point(ipoint,Npoints,jobnumber,njobs)) continue;
176        float currmceff=mceff->GetBinContent(mceff->FindBin(mglu,mlsp));
177 <      float currtoterr=fullerr->GetBinContent(fullerr->FindBin(mglu,mlsp));
177 >      float currtoterr=(fullerr->GetBinContent(fullerr->FindBin(mglu,mlsp)))*currmceff;
178        float nevents=NEvents->GetBinContent(NEvents->FindBin(mglu,mlsp));
179        dout << "Looking at point " << ipoint << " with masses " << massgluname << " = " << mglu << " and " << massLSPname << " = " << mlsp << endl;
180        dout << "Found : systerr=" << currtoterr << " and eff=" << currmceff << " and nevents=" << nevents << endl;
# Line 360 | Line 360 | write_warning(__FUNCTION__,"CURRENTLY SW
360              syspdfmap->Fill(mglu,mlsp,sys_pdf);
361              systotmap->Fill(mglu,mlsp,toterr/mceff);//total relative (!) error
362              sysstatmap->Fill(mglu,mlsp,mcefferr);//total relative (!) error
363 –            efficiencymap->Fill(mglu,mlsp,result);
363              dout << "A limit has been added at " << sigmas[0] << " for m_{glu}="<<mglu << " and m_{lsp}="<<mlsp<<endl;
364            } //end of if sigma is positive
365          //end of not systematics only condition
# Line 372 | Line 371 | write_warning(__FUNCTION__,"CURRENTLY SW
371              syspdfmap->Fill(mglu,mlsp,sys_pdf);
372              systotmap->Fill(mglu,mlsp,toterr/mceff);//total relative (!) error
373              sysstatmap->Fill(mglu,mlsp,mcefferr);//total relative (!) error
375 –            efficiencymap->Fill(mglu,mlsp,mceff);
374          }
375        }//efficiency is valid
376      }

Diff Legend

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