[Rivet-svn] r4158 - in trunk: data/anainfo src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Feb 14 13:49:53 2013
New Revision: 4158

Log:
merge c4074-4076 and c4089 from branches/2012-06-aidarivet

Modified:
   trunk/data/anainfo/ATLAS_2011_I894867.info
   trunk/src/Analyses/ATLAS_2011_I894867.cc

Modified: trunk/data/anainfo/ATLAS_2011_I894867.info
==============================================================================
--- trunk/data/anainfo/ATLAS_2011_I894867.info	Thu Feb 14 13:45:30 2013	(r4157)
+++ trunk/data/anainfo/ATLAS_2011_I894867.info	Thu Feb 14 13:49:53 2013	(r4158)
@@ -7,7 +7,8 @@
 InspireID: 894867
 Status: VALIDATED
 Authors:
- - Sercan Sen <ssen at cern.ch>
+ - Anton Karneyeu <Anton.Karneyeu at cern.ch>
+ - Sercan Sen <Sercan.Sen at cern.ch>
 References:
  - arXiv:1104.0326 [hep-ex]
 RunInfo:
@@ -16,9 +17,9 @@
 Beams: [p+, p+]
 Energies: [7000]
 Description:
-    Inelastic cross-section is measured for $\xi > 5 \times 10^{-6}$, where
+    'Inelastic cross-section is measured for $\xi > 5 \times 10^{-6}$, where
     $\xi=M_X^2/s$ is calculated from the invariant mass, $M_X$,
-    of hadrons selected using the largest rapidity gap in the event.
+    of hadrons selected using the largest rapidity gap in the event.'
 BibKey: Aad:2011eu
 BibTeX: '@Article{Aad:2011eu,
       author         = "Aad, Georges and others",

Modified: trunk/src/Analyses/ATLAS_2011_I894867.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_I894867.cc	Thu Feb 14 13:45:30 2013	(r4157)
+++ trunk/src/Analyses/ATLAS_2011_I894867.cc	Thu Feb 14 13:49:53 2013	(r4158)
@@ -16,7 +16,7 @@
   public:
 
     void init() {
-      addProjection(FinalState(),"FS");
+      addProjection(FinalState(), "FS");
       _h_sigma = bookHisto1D(1, 1, 1);
     }
 
@@ -25,6 +25,7 @@
       const double weight = event.weight();
 
       const FinalState& fs = applyProjection<FinalState>(event, "FS");
+      if (fs.size() < 2) vetoEvent; // need at least two particles to calculate gaps
 
       double gapcenter = 0.;
       double LRG = 0.;
@@ -45,27 +46,20 @@
         }
       }
 
-      FourMomentum MxFourVector(0.,0.,0.,0.);
-      FourMomentum MyFourVector(0.,0.,0.,0.);
 
+      FourMomentum mxFourVector, myFourVector;
       foreach(const Particle& p, fs.particlesByEta()) {
         if (p.momentum().eta() > gapcenter) {
-          MxFourVector += p.momentum();
+          mxFourVector += p.momentum();
         } else {
-          MyFourVector += p.momentum();
+          myFourVector += p.momentum();
         }
       }
+      const double M2 = max(mxFourVector.mass2(), myFourVector.mass2());
+      const double xi = M2/sqr(sqrtS()); // sqrt(s)=7000 GeV, note that units cancel
+      if (xi < 5e-6) vetoEvent;
 
-      double Mx2 = MxFourVector.mass2();
-      double My2 = MyFourVector.mass2();
-
-      const double M2 = (Mx2 > My2 ? Mx2 : My2);
-      const double xi = M2/(7000*7000); // sqrt(s)=7000 GeV
-
-      if (xi < 5*10e-6) vetoEvent;
-
-      _h_sigma->fill(7000/GeV, weight);
-
+      _h_sigma->fill(sqrtS()/GeV, weight);
     }