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.43 by buchmann, Thu Sep 29 07:40:43 2011 UTC vs.
Revision 1.44 by buchmann, Thu Sep 29 09:46:45 2011 UTC

# Line 184 | Line 184 | void establish_SUSY_limits(string mcjzb,
184  
185    int Npoints=0;
186    for(int mglu=mglustart;mglu<=mgluend;mglu+=mglustep) {
187 <    for (int mlsp=mLSPstart;mlsp<=mLSPend&&mlsp<=mglu;mlsp+=mLSPstep) Npoints++;
187 >    for (int mlsp=mLSPstart;mlsp<=mLSPend&&(ismSUGRA||mlsp<=mglu);mlsp+=mLSPstep) Npoints++;
188    }
189    TH2F *mceff     = (TH2F*)fsyst->Get((prefix+"efficiencymap"+any2string(jzb_cut[ibin])).c_str());
190   //write_warning(__FUNCTION__,"Currently the efficiencymap name was switched to Pablo's convention. This NEEDS to be switched BACK!");TH2F *mceff     = (TH2F*)fsyst->Get(("efficiency_jzbdiff"+any2string(jzb_cut[ibin])).c_str());
# Line 212 | Line 212 | void establish_SUSY_limits(string mcjzb,
212  
213    int ipoint=-1;
214    for(int mglu=mglustart;mglu<=mgluend;mglu+=mglustep) {
215 <    for (int mlsp=mLSPstart;mlsp<=mLSPend&&mlsp<=mglu;mlsp+=mLSPstep)
215 >    for (int mlsp=mLSPstart;mlsp<=mLSPend&&(ismSUGRA||mlsp<=mglu);mlsp+=mLSPstep)
216      {
217        ipoint++;
218        if(!runninglocally&&!do_this_point(ipoint,Npoints,jobnumber,njobs)) continue;
# Line 367 | Line 367 | write_warning(__FUNCTION__,"CURRENTLY SW
367    
368    int Npoints=0;
369    for(int mglu=mglustart;mglu<=mgluend;mglu+=mglustep) {
370 <    for (int mlsp=mLSPstart;mlsp<=mLSPend&&mlsp<=mglu;mlsp+=mLSPstep) Npoints++;
370 >    for (int mlsp=mLSPstart;mlsp<=mLSPend&&(ismSUGRA||mlsp<=mglu);mlsp+=mLSPstep) Npoints++;
371    }
372  
373    int ipoint=-1;
374    for(int mglu=mglustart;mglu<=mgluend;mglu+=mglustep) {
375 <    for (int mlsp=mLSPstart;mlsp<=mLSPend&&mlsp<=mglu;mlsp+=mLSPstep)
375 >    for (int mlsp=mLSPstart;mlsp<=mLSPend&&(ismSUGRA||mlsp<=mglu);mlsp+=mLSPstep)
376      {
377        ipoint++;
378        if(!runninglocally&&!do_this_point(ipoint,Npoints,jobnumber,njobs)) continue;

Diff Legend

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