ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/auterman/SusyScan/PlotScript/GlobalFunctions.h
(Generate patch)

Comparing UserCode/auterman/SusyScan/PlotScript/GlobalFunctions.h (file contents):
Revision 1.14 by auterman, Fri May 20 07:39:34 2011 UTC vs.
Revision 1.15 by auterman, Wed Jun 22 15:03:36 2011 UTC

# Line 22 | Line 22 | double Luminosity = 36.0; //[pb^-1]
22   double Mzero(const SusyScan* p){ return p->Mzero; }
23   double Mhalf(const SusyScan* p){ return p->Mhalf; }
24   double MGluino(const SusyScan* p){ return p->MGL; }
25 < double MSquarkL(const SusyScan* p){ return p->MUL; }
25 > double MSquarkL(const SusyScan* p){ return fabs(p->MUL); }
26   double MSquarkR(const SusyScan* p){ return p->MUR; }
27   double MChi1(const SusyScan* p){ return p->MZ1; }
28   double MChi2(const SusyScan* p){ return p->MZ2; }
# Line 34 | Line 34 | double MTAU1(const SusyScan* p){ return
34   double SignalUncertKfactor(const SusyScan* p){return fabs(p->signal_kfactor_UP-p->signal_kfactor_DN)/(2.0*p->signal_kfactor); }
35   double SignalUncertJEC(const SusyScan* p){ return (fabs(p->signal_JEC_UP)+fabs(p->signal_JEC_DN))/(2.0*p->signal); }
36   double SignalUncertMuIso(const SusyScan* p){ return (fabs(p->signal_MuIso_UP)+fabs(p->signal_MuIso_DN))/(2.0*p->signal); }
37 + double SignalUncertPDF(const SusyScan* p){
38 +       double up=sqrt(p->signal_PDF_UP*p->signal_PDF_UP+p->signal_XSPDF_UP*p->signal_XSPDF_UP);
39 +       double dn=sqrt(p->signal_PDF_DN*p->signal_PDF_DN+p->signal_XSPDF_DN*p->signal_XSPDF_DN);
40 +       return (up+dn)/(2.0*p->signal); }
41   double SignalKfactor(const SusyScan* p){return p->signal_kfactor; }
42   double ChargedLSP(const SusyScan* p){ return (fabs(p->MTAU1) < fabs(p->MZ1) ? 0.01 : 1); }
43  
# Line 128 | Line 132 | double NLOSignalContamination(const Susy
132   double Mzero(const GeneratorMasses* p){ return p->Mzero; }
133   double Mhalf(const GeneratorMasses* p){ return p->Mhalf; }
134   double MGluino(const GeneratorMasses* p){ return p->MGL; }
135 < double MSquarkL(const GeneratorMasses* p){ return p->MUL; }
135 > double MSquarkL(const GeneratorMasses* p){ return fabs(p->MUL); }
136   double MSquarkR(const GeneratorMasses* p){ return p->MUR; }
137   double MChi1(const GeneratorMasses* p){ return p->MZ1; }
138   double MChi2(const GeneratorMasses* p){ return p->MZ2; }

Diff Legend

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