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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Aug  2 19:39:57 2010
New Revision: 2637

Log:
Analysis tweaks

Modified:
   trunk/src/Analyses/ATLAS_2010_S8591806.cc
   trunk/src/Analyses/CDF_2000_S4155203.cc

Modified: trunk/src/Analyses/ATLAS_2010_S8591806.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2010_S8591806.cc	Mon Aug  2 13:34:22 2010	(r2636)
+++ trunk/src/Analyses/ATLAS_2010_S8591806.cc	Mon Aug  2 19:39:57 2010	(r2637)
@@ -12,7 +12,10 @@
   class ATLAS_2010_S8591806 : public Analysis {
   public:
 
-    ATLAS_2010_S8591806() : Analysis("ATLAS_2010_S8591806"), _Nevt_after_cuts(0.0) {
+    ATLAS_2010_S8591806()
+      : Analysis("ATLAS_2010_S8591806"),
+        _Nevt_after_cuts(0.0)
+    {
       setNeedsCrossSection(false);
     }
 
@@ -32,17 +35,17 @@
       const double weight = event.weight();
 
       const ChargedFinalState& charged = applyProjection<ChargedFinalState>(event, "CFS");
-      if (charged.particles().size()<1) {
+      if (charged.size() < 1) {
         vetoEvent;
       }
       _Nevt_after_cuts += weight;
 
-      _h_dNevt_dNch->fill(charged.particles().size(), weight);
+      _h_dNevt_dNch->fill(charged.size(), weight);
       foreach (const Particle& p, charged.particles()) {
         double pT = p.momentum().pT()/GeV;
         _h_dNch_deta->fill(p.momentum().eta(), weight);
         _h_dNch_dpT->fill(pT, weight/pT);
-        _p_meanpT_Nch->fill(charged.particles().size(), pT, weight);
+        _p_meanpT_Nch->fill(charged.size(), pT, weight);
       }
     }
 
@@ -50,7 +53,7 @@
     void finalize() {
       double deta = 5.0;
       scale(_h_dNch_deta, 1.0/_Nevt_after_cuts);
-      scale(_h_dNch_dpT, 1.0/_Nevt_after_cuts/2.0/M_PI/deta);
+      scale(_h_dNch_dpT, 1.0/_Nevt_after_cuts/TWOPI/deta);
       scale(_h_dNevt_dNch, 1.0/_Nevt_after_cuts);
     }
 

Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc	Mon Aug  2 13:34:22 2010	(r2636)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc	Mon Aug  2 19:39:57 2010	(r2637)
@@ -45,6 +45,11 @@
       }
 
       FourMomentum pZ = zfinder.particles()[0].momentum();
+      if (pZ.mass2() < 0) {
+        getLog() << Log::DEBUG << "Negative Z mass**2 = " << pZ.mass2()/GeV2 << "!" << endl;
+        vetoEvent;
+      }
+
       getLog() << Log::DEBUG << "Dilepton mass = " << pZ.mass()/GeV << " GeV"  << endl;
       getLog() << Log::DEBUG << "Dilepton pT   = " << pZ.pT()/GeV << " GeV" << endl;
       _hist_zpt->fill(pZ.pT()/GeV, e.weight());