[Rivet-svn] r1758 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Aug 17 18:27:08 2009
New Revision: 1758

Log:
Just tidying range checks to use inRange(...)

Modified:
   trunk/src/Analyses/CDF_1990_S2089246.cc

Modified: trunk/src/Analyses/CDF_1990_S2089246.cc
==============================================================================
--- trunk/src/Analyses/CDF_1990_S2089246.cc	Mon Aug 17 18:11:15 2009	(r1757)
+++ trunk/src/Analyses/CDF_1990_S2089246.cc	Mon Aug 17 18:27:08 2009	(r1758)
@@ -41,25 +41,25 @@
     // Event selection based on tracks in VTPC (time projection chambers)
     // Require at least 4 tracks with at least one in each of the forward
     // and backward hemispheres
-    int n_backward= 0;
+    int n_backward = 0;
     int n_forward = 0;
     
     const ChargedFinalState& cfs = applyProjection<ChargedFinalState>(event, "CFSAll");
     foreach (const Particle& p, cfs.particles()) {
          double eta = p.momentum().pseudorapidity();
-         if ( ( -5.9 < eta ) && ( eta < -3.2 ) ) n_trig_1++;
-         else if ( ( 3.2 < eta ) && ( eta < 5.9 ) ) n_trig_2++;
+         if (inRange(eta, -5.9, -3.2)) n_trig_1++;
+         else if (inRange(eta, 3.2, 5.9)) n_trig_2++;
 
-         if ( ( -3.0 < eta ) && ( eta < 0.0 ) ) n_backward++;
-         else if ( ( 0.0 < eta ) && ( eta < 3.0 ) ) n_forward++;
+         if (inRange(eta, -3.0, 0.0)) n_backward++;
+         else if (inRange(eta, 0.0, 3.0)) n_forward++;
     }
         
     // Require at least one coincidence hit in both BBC counters
-    if ( n_trig_1* n_trig_2 < 1. ) vetoEvent; 
+    if (n_trig_1*n_trig_2 < 1) vetoEvent; 
     getLog() << Log::DEBUG << "Trigger 1: " << n_trig_1 << " Trigger 2: " << n_trig_2 << endl;
   
     // Further event selection cut
-    if ( (  n_backward+n_forward < 4 ) || ( n_backward*n_forward < 1.) ) vetoEvent;
+    if ( (n_backward+n_forward < 4) || (n_backward*n_forward < 1) ) vetoEvent;
     getLog() << Log::DEBUG << " Num. forward: " << n_forward  << " Num. backward: " << n_backward << endl;
 
     // Loop over final state charged particles