[Rivet-svn] r3702 - in branches/2011-07-aida2yoda: bin src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Mon Apr 23 16:41:42 2012
New Revision: 3702

Log:
merge c3699-3701 from trunk

Modified:
   branches/2011-07-aida2yoda/bin/rivet-rmgaps
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc

Modified: branches/2011-07-aida2yoda/bin/rivet-rmgaps
==============================================================================
--- branches/2011-07-aida2yoda/bin/rivet-rmgaps	Mon Apr 23 09:39:05 2012	(r3701)
+++ branches/2011-07-aida2yoda/bin/rivet-rmgaps	Mon Apr 23 16:41:42 2012	(r3702)
@@ -99,10 +99,11 @@
         self.write_datapointset_header(f)
         for bin, bindata in enumerate(self.data):
             xval = 0.5*(bindata['UpEdge'] + bindata['LowEdge'])
-            if bindata['UpEdge'] == bindata['LowEdge']:
-                xerr = 0.5
-            else:
-                xerr = 0.5*(bindata['UpEdge'] - bindata['LowEdge'])
+            #if bindata['UpEdge'] == bindata['LowEdge']:
+            #    xerr = 0.5
+            #else:
+            #    xerr = 0.5*(bindata['UpEdge'] - bindata['LowEdge'])
+            xerr = 0.5*(bindata['UpEdge'] - bindata['LowEdge'])
             yval = bindata['Content']
             yerr = bindata['Error']
             self.write_datapoint(f, xval, xerr, yval, yerr)
@@ -125,6 +126,8 @@
             logging.info("Stripping %d bin%s from %s" % (numrm, plural, self.description['AidaPath']))
             newdata = []
             for i in xrange(len(self.data)):
+                if (len(refhist.data) == i):  ## MC has additional bins above the upper edge of the refdata
+                    break
                 if self.data[i]['LowEdge'] == refhist.data[i]['LowEdge'] and \
                    self.data[i]['UpEdge'] == refhist.data[i]['UpEdge']:
                     newdata.append(self.data[i])

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc	Mon Apr 23 09:39:05 2012	(r3701)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc	Mon Apr 23 16:41:42 2012	(r3702)
@@ -167,7 +167,8 @@
       foreach (const Jet& j, cand_jets) {
 	if(fabs( j.momentum().eta() ) <= 2.8) {
 	  recon_jets.push_back(j);
-	  if ( j.containsBottom() && rand()/static_cast<double>(RAND_MAX) < 0.5 )
+	  if ( fabs( j.momentum().eta() ) <= 2.5 && j.momentum().perp()>50. &&
+	       j.containsBottom() && rand()/static_cast<double>(RAND_MAX) < 0.5 )
 	    bjets.push_back(j);
 	}
       }