[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6e864b23df2f
branches:  
changeset: 6099:6e864b23df2f
user:      = Jon Butterworth <j.butterworth at cern.ch>
date:      Thu Oct 26 12:03:57 2017 +0200
description:
use prompt leptons, remve explicit test on neutrino flavours

details:   https://rivet.hepforge.org/hg/rivet/rev/913d5be50852
branches:  
changeset: 6100:913d5be50852
user:      = Jon Butterworth <j.butterworth at cern.ch>
date:      Thu Oct 26 12:06:47 2017 +0200
description:
use prompt leptons

details:   https://rivet.hepforge.org/hg/rivet/rev/a73e7ce528b5
branches:  
changeset: 6101:a73e7ce528b5
user:      = Jon Butterworth <j.butterworth at cern.ch>
date:      Thu Oct 26 13:33:03 2017 +0200
description:
fix clash with ZMASS macro

details:   https://rivet.hepforge.org/hg/rivet/rev/ddbe6df0d66c
branches:  
changeset: 6102:ddbe6df0d66c
user:      = Jon Butterworth <j.butterworth at cern.ch>
date:      Thu Oct 26 14:00:21 2017 +0200
description:
restore Andys dressed leptons fix

details:   https://rivet.hepforge.org/hg/rivet/rev/7b1931b5951b
branches:  
changeset: 6103:7b1931b5951b
user:      = Jon Butterworth <j.butterworth at cern.ch>
date:      Thu Oct 26 14:03:20 2017 +0200
description:
remove redundant projection

diffs (truncated from 236 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2012_I1203852.cc	Thu Oct 26 11:54:30 2017 +0200
+++ b/analyses/pluginATLAS/ATLAS_2012_I1203852.cc	Thu Oct 26 14:03:20 2017 +0200
@@ -12,11 +12,8 @@
 #include "Rivet/Projections/MissingMomentum.hh"
 #include "Rivet/Projections/InvMassFinalState.hh"
 
-#define ZMASS 91.1876 // GeV
-
 namespace Rivet {
 
-
   /// Generic Z candidate
   struct Zstate : public ParticlePair {
     Zstate() { }
@@ -27,64 +24,6 @@
   };
 
 
-  /// 4l to ZZ assignment -- algorithm
-  void identifyZstates(Zstate& Z1, Zstate& Z2, const Particles& leptons_sel4l) {
-
-    /////////////////////////////////////////////////////////////////////////////
-    /// ZZ->4l pairing
-    /// - Exactly two same flavour opposite charged leptons
-    /// - Ambiguities in pairing are resolved by choosing the combination
-    ///     that results in the smaller value of the sum |mll - mZ| for the two pairs
-    /////////////////////////////////////////////////////////////////////////////
-
-    Particles part_pos_el, part_neg_el, part_pos_mu, part_neg_mu;
-    foreach (const Particle& l , leptons_sel4l) {
-      if (l.abspid() == PID::ELECTRON) {
-        if (l.pid() < 0) part_neg_el.push_back(l);
-        if (l.pid() > 0) part_pos_el.push_back(l);
-      }
-      else if (l.abspid() == PID::MUON) {
-        if (l.pid() < 0) part_neg_mu.push_back(l);
-        if (l.pid() > 0) part_pos_mu.push_back(l);
-      }
-    }
-
-    // ee/mm channel
-    if ( part_neg_el.size() == 2 || part_neg_mu.size() == 2) {
-
-      Zstate Zcand_1, Zcand_2, Zcand_3, Zcand_4;
-      if (part_neg_el.size() == 2) { // ee
-        Zcand_1 = Zstate( ParticlePair( part_neg_el[0],  part_pos_el[0] ) );
-        Zcand_2 = Zstate( ParticlePair( part_neg_el[0],  part_pos_el[1] ) );
-        Zcand_3 = Zstate( ParticlePair( part_neg_el[1],  part_pos_el[0] ) );
-        Zcand_4 = Zstate( ParticlePair( part_neg_el[1],  part_pos_el[1] ) );
-      } else { // mumu