diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.cc b/analyses/pluginATLAS/ATLAS_2013_I1217863.cc
rename from analyses/pluginATLAS/ATLAS_2013_I1217863_Z.cc
rename to analyses/pluginATLAS/ATLAS_2013_I1217863.cc
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.cc
+++ b/analyses/pluginATLAS/ATLAS_2013_I1217863.cc
@@ -1,195 +1,290 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 #include "Rivet/Projections/LeadingParticlesFinalState.hh"
 
 namespace Rivet {
 
 
-  class ATLAS_2013_I1217863_Z : public Analysis {
+  class ATLAS_2013_I1217863 : public Analysis {
   public:
 
+
     /// Constructor
-    ATLAS_2013_I1217863_Z(string name="ATLAS_2013_I1217863_Z")
-      : Analysis(name)
-    {
-      // the electron mode is used by default
-      _mode = 1;
-    }
-
+    ///@brief: Electroweak Wjj production at 8 TeV
+    DEFAULT_RIVET_ANALYSIS_CTOR(ATLAS_2013_I1217863);
+    //@}
 
     /// @name Analysis methods
     //@{
 
     /// Book histograms and initialise projections before the run
     void init() {
 
+      // Get options from the new option system
+      _mode = 2;
+      _doZ  = true;
+      _doW  = true;
+      if ( getOption("LMODE") == "EL" ) { _mode = 2;}
+      if ( getOption("LMODE") == "MU" ) _mode = 3;
+      if ( getOption("LMODE") == "ZEL" ) {
+	_mode = 2;
+	_doW  = false;
+      }
+      if ( getOption("LMODE") == "ZMU" ) {
+	_mode = 3;
+	_doW  = false;
+      }
+      if ( getOption("LMODE") == "WEL" ) {
+	_mode = 2;
+	_doZ  = false;
+      }
+      if ( getOption("LMODE") == "WMU" ) {
+	_mode = 3;
+	_doZ  = false;
+      }
+
       FinalState fs;
       declare(fs, "FS");
 
       Cut cuts = Cuts::abseta < 2.47 && Cuts::pT > 25*GeV;
 
       // Z finder
-      ZFinder zf(fs, cuts, _mode==3? PID::MUON : PID::ELECTRON, 40.0*GeV, 1000.0*GeV, 0.1, ZFinder::CLUSTERNODECAY, ZFinder::NOTRACK);
-      declare(zf, "ZF");
+      if (_doZ) {
+	ZFinder zf(fs, cuts, _mode==3? PID::MUON : PID::ELECTRON, 40.0*GeV, 1000.0*GeV, 0.1, ZFinder::CLUSTERNODECAY, ZFinder::NOTRACK);
+	declare(zf, "ZF");
+      }
+
+      if (_doW) {
+	// W finder for electrons and muons
+	WFinder wf(fs, cuts, _mode==3? PID::MUON : PID::ELECTRON, 0.0*GeV, 1000.0*GeV, 35.0*GeV, 0.1,
+                                     WFinder::CLUSTERNODECAY, WFinder::NOTRACK, WFinder::TRANSMASS);
+	declare(wf, "WF");
+      }
 
       // leading photon
       LeadingParticlesFinalState photonfs(FinalState(Cuts::abseta < 2.37 && Cuts::pT > 15*GeV));
       photonfs.addParticleId(PID::PHOTON);
       declare(photonfs, "LeadingPhoton");
 
       // jets
       VetoedFinalState jet_fs(fs);
-      jet_fs.addVetoOnThisFinalState(getProjection<ZFinder>("ZF"));
+      if (_doZ) { jet_fs.addVetoOnThisFinalState(getProjection<ZFinder>("ZF")); }
+      if (_doW) { jet_fs.addVetoOnThisFinalState(getProjection<WFinder>("WF")); }
       jet_fs.addVetoOnThisFinalState(getProjection<LeadingParticlesFinalState>("LeadingPhoton"));
       FastJets jets(jet_fs, FastJets::ANTIKT, 0.4);
       jets.useInvisibles(true);
       declare(jets, "Jets");
 
       // FS excluding the leading photon
       VetoedFinalState vfs(fs);
       vfs.addVetoOnThisFinalState(photonfs);
       declare(vfs, "isolatedFS");
 
 
       // Book histograms
-      _hist_EgammaT_incl   = bookHisto1D(11, 1, _mode); // dSigma / dE^gamma_T for Njet >= 0
-      _hist_EgammaT_excl   = bookHisto1D(12, 1, _mode); // dSigma / dE^gamma_T for Njet = 0
-      _hist_Njet_EgammaT15 = bookHisto1D(17, 1, _mode); // dSigma / dNjet for E^gamma_T >= 15
-      _hist_Njet_EgammaT60 = bookHisto1D(18, 1, _mode); // dSigma / dNjet for E^gamma_T >= 60
-      _hist_mZgamma        = bookHisto1D(20, 1, _mode); // dSigma / dm^{Zgamma}
+      if (_doZ) {
+	_hist_EgammaT_inclZ   = bookHisto1D(11, 1, _mode); // dSigma / dE^gamma_T for Njet >= 0
+	_hist_EgammaT_exclZ   = bookHisto1D(12, 1, _mode); // dSigma / dE^gamma_T for Njet = 0
+	_hist_Njet_EgammaT15Z = bookHisto1D(17, 1, _mode); // dSigma / dNjet for E^gamma_T >= 15
+	_hist_Njet_EgammaT60Z = bookHisto1D(18, 1, _mode); // dSigma / dNjet for E^gamma_T >= 60
+	_hist_mZgamma        = bookHisto1D(20, 1, _mode); // dSigma / dm^{Zgamma}
+      }
+
+      if (_doW){
+	// Book histograms
+	_hist_EgammaT_inclW   = bookHisto1D( 7, 1, _mode); // dSigma / dE^gamma_T for Njet >= 0
+	_hist_EgammaT_exclW   = bookHisto1D( 8, 1, _mode); // dSigma / dE^gamma_T for Njet = 0
+	_hist_Njet_EgammaT15W = bookHisto1D(15, 1, _mode); // dSigma / dNjet for E^gamma_T > 15
+	_hist_Njet_EgammaT60W = bookHisto1D(16, 1, _mode); // dSigma / dNjet for E^gamma_T > 60
+	_hist_mWgammaT        = bookHisto1D(19, 1, _mode); // dSigma / dm^{Wgamma}_T
+      }
 
     }
 
 
     /// Perform the per-event analysis
     void analyze(const Event& event) {
 
       const double weight = event.weight();
 
       // retrieve leading photon
       Particles photons = apply<LeadingParticlesFinalState>(event, "LeadingPhoton").particles();
       if (photons.size() != 1)  vetoEvent;
       const Particle& leadingPhoton = photons[0];
       if (leadingPhoton.Et() < 15.0*GeV) vetoEvent;
       if (leadingPhoton.abseta() > 2.37) vetoEvent;
 
       // check photon isolation
       double coneEnergy(0.0);
       Particles fs = apply<VetoedFinalState>(event, "isolatedFS").particles();
       for (const Particle& p : fs) {
         if ( deltaR(leadingPhoton, p) < 0.4 )  coneEnergy += p.E();
       }
       if (coneEnergy / leadingPhoton.E() >= 0.5 )  vetoEvent;
 
-      // retrieve Z boson candidate
-      const ZFinder& zf = apply<ZFinder>(event, "ZF");
-      if ( zf.bosons().size() != 1 )  vetoEvent; // only one Z boson candidate
-      const Particle& Zboson  = zf.boson();
-      if ( !(Zboson.mass() > 40.0*GeV) )  vetoEvent;
-
-      // check charge of constituent leptons
-      const ParticleVector& leptons = zf.constituents();
-      if (leptons.size() != 2 || leptons[0].charge() * leptons[1].charge() > 0.)  vetoEvent;
-
-      // check photon-lepton overlap
-      for (const Particle& p : leptons) {
-        if ( !(p.pT() > 25.0*GeV && p.abseta() < 2.47 && deltaR(leadingPhoton, p) > 0.7) )  vetoEvent;
+      if (_doW) {
+	// retrieve W boson candidate
+	const WFinder& wf = apply<WFinder>(event, "WF");
+	if ( wf.bosons().size() == 1 ) { 
+	  
+	  // retrieve constituent neutrino
+	  const Particle& neutrino = wf.constituentNeutrino();
+	  if ( (neutrino.pT() > 35.0*GeV) ) {
+	    
+	    // retrieve constituent lepton
+	    const Particle& lepton = wf.constituentLepton();
+	    if ( lepton.pT() > 25.0*GeV && lepton.abseta() < 2.47 ) {
+	      
+	      // check photon-lepton overlap
+	      if ( deltaR(leadingPhoton, lepton) > 0.7 ) {
+		
+		// count jets
+		const FastJets& jetfs = apply<FastJets>(event, "Jets");
+		Jets jets = jetfs.jets(cmpMomByEt);
+		int goodJets = 0;
+		for (const Jet& j : jets) {
+		  if ( !(j.Et() > 30.0*GeV) )  break;
+		  if ( (j.abseta() < 4.4) &&				\
+		       (deltaR(leadingPhoton, j) > 0.3) &&		\
+		       (deltaR(lepton,        j) > 0.3) )  ++goodJets;
+		}
+		
+		double Njets = double(goodJets) + 0.5;
+		double photonEt = leadingPhoton.Et()*GeV;
+		
+		const FourMomentum& lep_gamma = lepton.momentum() + leadingPhoton.momentum();
+		double term1 = sqrt(lep_gamma.mass2() + lep_gamma.pT2()) + neutrino.Et();
+		double term2 = (lep_gamma + neutrino.momentum()).pT2();
+		double mWgammaT = sqrt(term1 * term1 - term2) * GeV;
+		
+		_hist_EgammaT_inclW->fill(photonEt, weight);
+		
+		_hist_Njet_EgammaT15W->fill(Njets, weight);
+		
+		if ( !goodJets )  _hist_EgammaT_exclW->fill(photonEt, weight);
+		
+		if (photonEt > 40.0*GeV) {
+		  _hist_mWgammaT->fill(mWgammaT, weight);
+		  if (photonEt > 60.0*GeV)  _hist_Njet_EgammaT60W->fill(Njets, weight);
+		}
+	      }
+	    }
+	  }
+	}
       }
 
-      // count jets
-      const FastJets& jetfs = apply<FastJets>(event, "Jets");
-      Jets jets = jetfs.jets(cmpMomByEt);
-      int goodJets = 0;
-      foreach (const Jet& j, jets) {
-        if ( !(j.Et() > 30.0*GeV) )  break;
-        if ( (j.abseta() < 4.4) && \
-             (deltaR(leadingPhoton, j) > 0.3) &&    \
-             (deltaR(leptons[0],    j) > 0.3) &&            \
-             (deltaR(leptons[1],    j) > 0.3) )  ++goodJets;
+      if (_doZ ){
+
+	// retrieve Z boson candidate
+	const ZFinder& zf = apply<ZFinder>(event, "ZF");
+	if ( zf.bosons().size() == 1 ) {
+	  const Particle& Zboson  = zf.boson();
+	  if ( (Zboson.mass() > 40.0*GeV) ) {
+	    
+	    // check charge of constituent leptons
+	    const ParticleVector& leptons = zf.constituents();
+	    if (leptons.size() == 2 && leptons[0].charge() * leptons[1].charge() < 0.) {
+	      
+	      bool lpass = true;
+	      // check photon-lepton overlap
+	      for (const Particle& p : leptons) {
+		if ( !(p.pT() > 25.0*GeV && p.abseta() < 2.47 && deltaR(leadingPhoton, p) > 0.7) )  lpass = false;
+	      }
+	      if ( lpass ) {
+		
+		// count jets
+		const FastJets& jetfs = apply<FastJets>(event, "Jets");
+		Jets jets = jetfs.jets(cmpMomByEt);
+		int goodJets = 0;
+		foreach (const Jet& j, jets) {
+		  if ( !(j.Et() > 30.0*GeV) )  break;
+		  if ( (j.abseta() < 4.4) &&		    \
+		       (deltaR(leadingPhoton, j) > 0.3) &&  \
+		       (deltaR(leptons[0],    j) > 0.3) &&		\
+		       (deltaR(leptons[1],    j) > 0.3) )  ++goodJets;
+		}
+		
+		double Njets = double(goodJets) + 0.5;
+		double photonEt = leadingPhoton.Et()*GeV;
+		double mZgamma = (Zboson.momentum() + leadingPhoton.momentum()).mass() * GeV;
+		
+		_hist_EgammaT_inclZ->fill(photonEt, weight);
+		
+		_hist_Njet_EgammaT15Z->fill(Njets, weight);
+		
+		if ( !goodJets )   _hist_EgammaT_exclZ->fill(photonEt, weight);
+		
+		if (photonEt >= 40.0*GeV) {
+		  _hist_mZgamma->fill(mZgamma, weight);
+		  if (photonEt >= 60.0*GeV)  _hist_Njet_EgammaT60Z->fill(Njets, weight);
+		}
+	      }
+	    }
+	  }
+	}
       }
-
-      double Njets = double(goodJets) + 0.5;
-      double photonEt = leadingPhoton.Et()*GeV;
-      double mZgamma = (Zboson.momentum() + leadingPhoton.momentum()).mass() * GeV;
-
-      _hist_EgammaT_incl->fill(photonEt, weight);
-
-      _hist_Njet_EgammaT15->fill(Njets, weight);
-
-      if ( !goodJets )   _hist_EgammaT_excl->fill(photonEt, weight);
-
-      if (photonEt >= 40.0*GeV) {
-        _hist_mZgamma->fill(mZgamma, weight);
-        if (photonEt >= 60.0*GeV)  _hist_Njet_EgammaT60->fill(Njets, weight);
-      }
-
     }
 
-
     /// Normalise histograms etc., after the run
     void finalize() {
 
       const double xs_fb = crossSection()/femtobarn;
       const double sumw = sumOfWeights();
       const double sf = xs_fb / sumw;
 
-      scale(_hist_EgammaT_excl, sf);
-      scale(_hist_EgammaT_incl, sf);
+      if (_doZ) {
+	scale(_hist_EgammaT_exclZ, sf);
+	scale(_hist_EgammaT_inclZ, sf);
+	normalize(_hist_Njet_EgammaT15Z);
+	normalize(_hist_Njet_EgammaT60Z);
+	normalize(_hist_mZgamma);
+      }
 
-      normalize(_hist_Njet_EgammaT15);
-      normalize(_hist_Njet_EgammaT60);
-      normalize(_hist_mZgamma);
+      if (_doW) {
+	scale(_hist_EgammaT_exclW, sf);
+	scale(_hist_EgammaT_inclW, sf);
+	normalize(_hist_Njet_EgammaT15W);
+	normalize(_hist_Njet_EgammaT60W);
+	normalize(_hist_mWgammaT);
+      }
 
     }
 
     //@}
 
   protected:
 
     size_t _mode;
+    bool _doW;
+    bool _doZ;
 
   private:
 
     /// @name Histograms
     //@{
 
-    Histo1DPtr _hist_EgammaT_incl;
-    Histo1DPtr _hist_EgammaT_excl;
-    Histo1DPtr _hist_Njet_EgammaT15;
-    Histo1DPtr _hist_Njet_EgammaT60;
+    Histo1DPtr _hist_EgammaT_inclZ;
+    Histo1DPtr _hist_EgammaT_exclZ;
+    Histo1DPtr _hist_Njet_EgammaT15Z;
+    Histo1DPtr _hist_Njet_EgammaT60Z;
     Histo1DPtr _hist_mZgamma;
 
+    Histo1DPtr _hist_EgammaT_inclW;
+    Histo1DPtr _hist_EgammaT_exclW;
+    Histo1DPtr _hist_Njet_EgammaT15W;
+    Histo1DPtr _hist_Njet_EgammaT60W;
+    Histo1DPtr _hist_mWgammaT;
+
     //@}
 
   };
 
-
-  class ATLAS_2013_I1217863_Z_EL : public ATLAS_2013_I1217863_Z {
-  public:
-    ATLAS_2013_I1217863_Z_EL()
-      : ATLAS_2013_I1217863_Z("ATLAS_2013_I1217863_Z_EL")
-    {
-      _mode = 2;
-    }
-  };
-
-
-  class ATLAS_2013_I1217863_Z_MU : public ATLAS_2013_I1217863_Z {
-  public:
-    ATLAS_2013_I1217863_Z_MU()
-      : ATLAS_2013_I1217863_Z("ATLAS_2013_I1217863_Z_MU")
-    {
-      _mode = 3;
-    }
-  };
-
-
-  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863_Z);
-  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863_Z_EL);
-  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863_Z_MU);
+  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863);
 
 }
+
+
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.info b/analyses/pluginATLAS/ATLAS_2013_I1217863.info
rename from analyses/pluginATLAS/ATLAS_2013_I1217863_Z.info
rename to analyses/pluginATLAS/ATLAS_2013_I1217863.info
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.info
+++ b/analyses/pluginATLAS/ATLAS_2013_I1217863.info
@@ -1,45 +1,47 @@
-Name: ATLAS_2013_I1217863_Z
+Name: ATLAS_2013_I1217863
 Year: 2013
 Summary: Z + gamma production at 7 TeV
 Experiment: ATLAS
 Collider: LHC
 InspireID: 1217863
 Status: VALIDATED
 Authors:
  - Chritian Gutschow <chris.g@cern.ch>
 References:
  - Phys.Rev. D87 (2013) 112003
  - doi:10.1103/PhysRevD.87.112003
  - arXiv:1302.1283 [hep-ex]
 RunInfo:
   Z+gamma in the electron channel
 NumEvents: 1000000
 Beams: [p+, p+]
 Energies: [7000]
 PtCuts: [25,15]
 NeedCrossSection: True
+Options:
+ - LMODE=EL,MU,ZEL,ZMU,WEL,WMU
 Description:
   Measurements of the differential fiducial cross sections for the production of a Z boson in association with a high-energy
   photon are measured using pp collisions at $\sqrt{s}=7~\TeV$. The analysis uses a data sample with an integrated luminosity of
   4.6/fb collected by the ATLAS detector during the 2011 LHC data-taking period. Events are selected using leptonic decays
   of the Z bosons with the requirement of an associated isolated photon. The default routine will consider the electron decay
-  channel of the Z boson. Use ATLAS_2013_I1217863_Z_EL and ATLAS_2013_I1217863_Z_MU to specify the decay channel directly.
+  channel of the Z boson. Use LMODE to specify the decay channel directly.
 BibKey: Aad:2013iz
 BibTeX: '@article{Aad:2013izg,
       author         = "Aad, Georges and others",
       title          = "{Measurements of $W\gamma$ and $Z\gamma$ production in $pp$ collisions
                         at $\sqrt{s}$=7  TeV with the ATLAS detector at the
                         LHC}",
       collaboration  = "ATLAS Collaboration",
       journal        = "Phys.Rev.",
       number         = "11",
       volume         = "D87",
       pages          = "112003",
       doi            = "10.1103/PhysRevD.87.112003",
       year           = "2013",
       eprint         = "1302.1283",
       archivePrefix  = "arXiv",
       primaryClass   = "hep-ex",
       reportNumber   = "CERN-PH-EP-2012-345",
       SLACcitation   = "%%CITATION = ARXIV:1302.1283;%%",
 }'
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863.plot
new file mode 100644
--- /dev/null
+++ b/analyses/pluginATLAS/ATLAS_2013_I1217863.plot
@@ -0,0 +1,139 @@
+# BEGIN PLOT /ATLAS_2013_I1217863/d..-x..-y..
+LogY=1
+LegendYPos=0.90
+LegendXPos=0.90
+LegendAlign=r
+RatioPlotYMax=1.5
+RatioPlotYMin=0.5
+XTwosidedTicks=1
+YTwosidedTicks=1
+ErrorBars=1
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d1[1-2]-x01-y..
+LogX=1
+RatioPlotYMax=2.0
+RatioPlotYMin=0.0
+XLabel=$E^\gamma_\text{T}$ [GeV]
+YLabel=$\text{d}\sigma(pp \rightarrow \ell^+ \ell^- \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d1[7-8]-x01-y..
+XLabel=Jet multiplicity
+YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} N_\text{jet}$
+# END PLOT
+
+# Z electron
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d20-x01-y..
+XLabel=$m^{Z\gamma}$ [GeV]
+YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} m^{Z\gamma}$
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d11-x01-y01
+Title=$N_\text{jet} \geq 0$, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d12-x01-y01
+Title=$N_\text{jet} = 0$, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d17-x01-y01
+Title=$E^\gamma_\text{T} \geq 15$ GeV, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d18-x01-y01
+Title=$E^\gamma_\text{T} \geq 60$ GeV, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d20-x01-y01
+Title=$E^\gamma_\text{T} > 40$ GeV, using electrons, dressed level
+# END PLOT
+
+
+# W electron
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d0[7-8]-x01-y..
+LogX=1
+RatioPlotYMax=2.0
+RatioPlotYMin=0.0
+XLabel=$E^\gamma_\text{T}$ [GeV]
+YLabel=$\text{d}\sigma(pp \rightarrow \ell \nu \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d1[5-6]-x01-y..
+XLabel=Jet multiplicity
+YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} N_\text{jet}$
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d07-x01-y02
+Title=$N_\text{jet} \geq 0$, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d08-x01-y01
+Title=$N_\text{jet} = 0$, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d15-x01-y01
+Title=$E^\gamma_\text{T} \geq 15$ GeV, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d16-x01-y01
+Title=$E^\gamma_\text{T} \geq 60$ GeV, using electrons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d19-x01-y01
+Title=$E^\gamma_\text{T} > 40$ GeV, using electrons, dressed level
+# END PLOT
+
+
+# Z, muon
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d11-x01-y01
+Title=$N_\text{jet} \geq 0$, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d12-x01-y01
+Title=$N_\text{jet} = 0$, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d17-x01-y01
+Title=$E^\gamma_\text{T} \geq 15$ GeV, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d18-x01-y01
+Title=$E^\gamma_\text{T} \geq 60$ GeV, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d20-x01-y01
+Title=$E^\gamma_\text{T} > 40$ GeV, using muons, dressed level
+# END PLOT
+
+
+# W, muon
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d19-x01-y..
+XLabel=$m^{W\gamma}_\text{T}$ [GeV]
+YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} m^{W\gamma}_\text{T}$
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d07-x01-y01
+Title=$N_\text{jet} \geq 0$, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d08-x01-y01
+Title=$N_\text{jet} = 0$, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d15-x01-y01
+Title=$E^\gamma_\text{T} \geq 15$ GeV, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d16-x01-y01
+Title=$E^\gamma_\text{T} \geq 60$ GeV, using muons, dressed level
+# END PLOT
+
+# BEGIN PLOT /ATLAS_2013_I1217863/d19-x01-y01
+Title=$E^\gamma_\text{T} > 40$ GeV, using muons, dressed level
+# END PLOT
+
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863.yoda
new file mode 100644
--- /dev/null
+++ b/analyses/pluginATLAS/ATLAS_2013_I1217863.yoda
@@ -0,0 +1,278 @@
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d07-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d07-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.947072e+02	3.245120e+01	3.245120e+01
+2.500000e+01	5.000000e+00	5.000000e+00	8.518440e+01	1.115510e+01	1.115510e+01
+3.500000e+01	5.000000e+00	5.000000e+00	4.360630e+01	5.070500e+00	5.070500e+00
+5.000000e+01	1.000000e+01	1.000000e+01	1.409599e+01	1.825380e+00	1.825380e+00
+8.000000e+01	2.000000e+01	2.000000e+01	5.070500e+00	5.070500e-01	5.070500e-01
+5.500000e+02	4.500000e+02	4.500000e+02	9.126900e-02	1.216920e-02	1.216920e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d08-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d08-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.379176e+02	2.231020e+01	2.231020e+01
+2.500000e+01	5.000000e+00	5.000000e+00	5.526845e+01	7.200110e+00	7.200110e+00
+3.500000e+01	5.000000e+00	5.000000e+00	2.393276e+01	3.346530e+00	3.346530e+00
+5.000000e+01	1.000000e+01	1.000000e+01	6.997290e+00	1.216920e+00	1.216920e+00
+8.000000e+01	2.000000e+01	2.000000e+01	2.129610e+00	3.042300e-01	3.042300e-01
+5.500000e+02	4.500000e+02	4.500000e+02	3.042300e-02	6.084600e-03	6.084600e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d15-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d15-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	5.800000e-01	3.000000e-02	3.000000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	3.300000e-01	3.000000e-02	3.000000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.000000e-02	1.000000e-02
+3.500000e+00	5.000000e-01	5.000000e-01	3.700000e-02	8.000000e-03	8.000000e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d16-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d16-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	3.300000e-01	3.300000e-02	3.300000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	4.000000e-01	2.600000e-02	2.600000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	1.600000e-01	1.800000e-02	1.800000e-02
+3.500000e+00	5.000000e-01	5.000000e-01	1.100000e-01	2.400000e-02	2.400000e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d19-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d19-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+7.500000e+01	2.500000e+01	2.500000e+01	7.400000e-04	1.980000e-04	1.980000e-04
+1.250000e+02	2.500000e+01	2.500000e+01	5.400000e-03	4.400000e-04	4.400000e-04
+1.750000e+02	2.500000e+01	2.500000e+01	6.400000e-03	4.800000e-04	4.800000e-04
+2.500000e+02	5.000000e+01	5.000000e+01	2.400000e-03	1.500000e-04	1.500000e-04
+3.500000e+02	5.000000e+01	5.000000e+01	7.900000e-04	8.700000e-05	8.700000e-05
+7.000000e+02	3.000000e+02	3.000000e+02	8.333333e-05	1.416667e-05	1.416667e-05
+END YODA_SCATTER2D_V2
+
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d07-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d07-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.947072e+02	3.245120e+01	3.245120e+01
+2.500000e+01	5.000000e+00	5.000000e+00	8.518440e+01	1.115510e+01	1.115510e+01
+3.500000e+01	5.000000e+00	5.000000e+00	4.360630e+01	5.070500e+00	5.070500e+00
+5.000000e+01	1.000000e+01	1.000000e+01	1.409599e+01	1.825380e+00	1.825380e+00
+8.000000e+01	2.000000e+01	2.000000e+01	5.070500e+00	5.070500e-01	5.070500e-01
+5.500000e+02	4.500000e+02	4.500000e+02	9.126900e-02	1.216920e-02	1.216920e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d08-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d08-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.379176e+02	2.231020e+01	2.231020e+01
+2.500000e+01	5.000000e+00	5.000000e+00	5.526845e+01	7.200110e+00	7.200110e+00
+3.500000e+01	5.000000e+00	5.000000e+00	2.393276e+01	3.346530e+00	3.346530e+00
+5.000000e+01	1.000000e+01	1.000000e+01	6.997290e+00	1.216920e+00	1.216920e+00
+8.000000e+01	2.000000e+01	2.000000e+01	2.129610e+00	3.042300e-01	3.042300e-01
+5.500000e+02	4.500000e+02	4.500000e+02	3.042300e-02	6.084600e-03	6.084600e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d15-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d15-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	5.800000e-01	3.000000e-02	3.000000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	3.300000e-01	3.000000e-02	3.000000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.000000e-02	1.000000e-02
+3.500000e+00	5.000000e-01	5.000000e-01	3.700000e-02	8.000000e-03	8.000000e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d16-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d16-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	3.300000e-01	3.300000e-02	3.300000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	4.000000e-01	2.600000e-02	2.600000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	1.600000e-01	1.800000e-02	1.800000e-02
+3.500000e+00	5.000000e-01	5.000000e-01	1.100000e-01	2.400000e-02	2.400000e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d19-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d19-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+7.500000e+01	2.500000e+01	2.500000e+01	7.400000e-04	1.980000e-04	1.980000e-04
+1.250000e+02	2.500000e+01	2.500000e+01	5.400000e-03	4.400000e-04	4.400000e-04
+1.750000e+02	2.500000e+01	2.500000e+01	6.400000e-03	4.800000e-04	4.800000e-04
+2.500000e+02	5.000000e+01	5.000000e+01	2.400000e-03	1.500000e-04	1.500000e-04
+3.500000e+02	5.000000e+01	5.000000e+01	7.900000e-04	8.700000e-05	8.700000e-05
+7.000000e+02	3.000000e+02	3.000000e+02	8.333333e-05	1.416667e-05	1.416667e-05
+END YODA_SCATTER2D_V2
+
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d11-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d11-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.216920e+02	1.216920e+01	1.216920e+01
+2.500000e+01	5.000000e+00	5.000000e+00	4.309925e+01	4.259220e+00	4.259220e+00
+3.500000e+01	5.000000e+00	5.000000e+00	1.318330e+01	1.419740e+00	1.419740e+00
+5.000000e+01	1.000000e+01	1.000000e+01	5.009654e+00	6.186010e-01	6.186010e-01
+8.000000e+01	2.000000e+01	2.000000e+01	1.419740e+00	1.926790e-01	1.926790e-01
+5.500000e+02	4.500000e+02	4.500000e+02	1.825380e-02	7.098700e-03	7.098700e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d12-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d12-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.074946e+02	1.115510e+01	1.115510e+01
+2.500000e+01	5.000000e+00	5.000000e+00	3.478363e+01	4.157810e+00	4.157810e+00
+3.500000e+01	5.000000e+00	5.000000e+00	9.431130e+00	1.115510e+00	1.115510e+00
+5.000000e+01	1.000000e+01	1.000000e+01	3.285684e+00	4.766270e-01	4.766270e-01
+8.000000e+01	2.000000e+01	2.000000e+01	1.024241e+00	1.622560e-01	1.622560e-01
+5.500000e+02	4.500000e+02	4.500000e+02	7.098700e-03	4.056400e-03	4.056400e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d17-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d17-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	8.000000e-01	2.700000e-02	2.700000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	1.500000e-01	1.600000e-02	1.600000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	5.200000e-02	1.100000e-02	1.100000e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d18-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d18-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	6.000000e-01	3.800000e-02	3.800000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	2.800000e-01	2.600000e-02	2.600000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.900000e-02	1.900000e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d20-x01-y02
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d20-x01-y02
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.000000e+02	5.000000e+01	5.000000e+01	1.400000e-03	1.800000e-04	1.800000e-04
+1.750000e+02	2.500000e+01	2.500000e+01	8.800000e-03	4.800000e-04	4.800000e-04
+2.500000e+02	5.000000e+01	5.000000e+01	3.200000e-03	2.200000e-04	2.200000e-04
+6.500000e+02	3.500000e+02	3.500000e+02	1.571429e-04	2.142857e-05	2.142857e-05
+END YODA_SCATTER2D_V2
+
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d11-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d11-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.216920e+02	1.216920e+01	1.216920e+01
+2.500000e+01	5.000000e+00	5.000000e+00	4.309925e+01	4.259220e+00	4.259220e+00
+3.500000e+01	5.000000e+00	5.000000e+00	1.318330e+01	1.419740e+00	1.419740e+00
+5.000000e+01	1.000000e+01	1.000000e+01	5.009654e+00	6.186010e-01	6.186010e-01
+8.000000e+01	2.000000e+01	2.000000e+01	1.419740e+00	1.926790e-01	1.926790e-01
+5.500000e+02	4.500000e+02	4.500000e+02	1.825380e-02	7.098700e-03	7.098700e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d12-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d12-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.750000e+01	2.500000e+00	2.500000e+00	1.074946e+02	1.115510e+01	1.115510e+01
+2.500000e+01	5.000000e+00	5.000000e+00	3.478363e+01	4.157810e+00	4.157810e+00
+3.500000e+01	5.000000e+00	5.000000e+00	9.431130e+00	1.115510e+00	1.115510e+00
+5.000000e+01	1.000000e+01	1.000000e+01	3.285684e+00	4.766270e-01	4.766270e-01
+8.000000e+01	2.000000e+01	2.000000e+01	1.024241e+00	1.622560e-01	1.622560e-01
+5.500000e+02	4.500000e+02	4.500000e+02	7.098700e-03	4.056400e-03	4.056400e-03
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d17-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d17-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	8.000000e-01	2.700000e-02	2.700000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	1.500000e-01	1.600000e-02	1.600000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	5.200000e-02	1.100000e-02	1.100000e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d18-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d18-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+5.000000e-01	5.000000e-01	5.000000e-01	6.000000e-01	3.800000e-02	3.800000e-02
+1.500000e+00	5.000000e-01	5.000000e-01	2.800000e-01	2.600000e-02	2.600000e-02
+2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.900000e-02	1.900000e-02
+END YODA_SCATTER2D_V2
+
+BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863/d20-x01-y03
+IsRef: 1
+Path: /REF/ATLAS_2013_I1217863/d20-x01-y03
+Title: ~
+Type: Scatter2D
+---
+# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
+1.000000e+02	5.000000e+01	5.000000e+01	1.400000e-03	1.800000e-04	1.800000e-04
+1.750000e+02	2.500000e+01	2.500000e+01	8.800000e-03	4.800000e-04	4.800000e-04
+2.500000e+02	5.000000e+01	5.000000e+01	3.200000e-03	2.200000e-04	2.200000e-04
+6.500000e+02	3.500000e+02	3.500000e+02	1.571429e-04	2.142857e-05	2.142857e-05
+END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.cc b/analyses/pluginATLAS/ATLAS_2013_I1217863_W.cc
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// -*- C++ -*-
-#include "Rivet/Analysis.hh"
-#include "Rivet/Projections/FinalState.hh"
-#include "Rivet/Projections/FastJets.hh"
-#include "Rivet/Projections/WFinder.hh"
-#include "Rivet/Projections/VetoedFinalState.hh"
-#include "Rivet/Projections/LeadingParticlesFinalState.hh"
-
-namespace Rivet {
-
-
-  class ATLAS_2013_I1217863_W : public Analysis {
-  public:
-
-    /// Constructor
-    ATLAS_2013_I1217863_W(string name="ATLAS_2013_I1217863_W")
-      : Analysis(name)
-    {
-      // the electron mode is used by default
-      _mode = 1;
-    }
-
-
-    /// @name Analysis methods
-    //@{
-
-    /// Book histograms and initialise projections before the run
-    void init() {
-
-      FinalState fs;
-      declare(fs, "FS");
-
-      Cut cuts = Cuts::abseta < 2.47 && Cuts::pT > 25*GeV;
-
-      // W finder for electrons and muons
-      WFinder wf(fs, cuts, _mode==3? PID::MUON : PID::ELECTRON, 0.0*GeV, 1000.0*GeV, 35.0*GeV, 0.1,
-                                     WFinder::CLUSTERNODECAY, WFinder::NOTRACK, WFinder::TRANSMASS);
-      declare(wf, "WF");
-
-      // leading photon
-      LeadingParticlesFinalState photonfs(FinalState(Cuts::abseta < 2.37 && Cuts::pT > 15*GeV));
-      photonfs.addParticleId(PID::PHOTON);
-      declare(photonfs, "LeadingPhoton");
-
-      // jets
-      VetoedFinalState jet_fs(fs);
-      jet_fs.addVetoOnThisFinalState(getProjection<WFinder>("WF"));
-      jet_fs.addVetoOnThisFinalState(getProjection<LeadingParticlesFinalState>("LeadingPhoton"));
-      FastJets jets(jet_fs, FastJets::ANTIKT, 0.4);
-      jets.useInvisibles(true);
-      declare(jets, "Jets");
-
-      // FS excluding the leading photon
-      VetoedFinalState vfs(fs);
-      vfs.addVetoOnThisFinalState(photonfs);
-      declare(vfs, "isolatedFS");
-
-
-      // Book histograms
-      _hist_EgammaT_incl   = bookHisto1D( 7, 1, _mode); // dSigma / dE^gamma_T for Njet >= 0
-      _hist_EgammaT_excl   = bookHisto1D( 8, 1, _mode); // dSigma / dE^gamma_T for Njet = 0
-      _hist_Njet_EgammaT15 = bookHisto1D(15, 1, _mode); // dSigma / dNjet for E^gamma_T > 15
-      _hist_Njet_EgammaT60 = bookHisto1D(16, 1, _mode); // dSigma / dNjet for E^gamma_T > 60
-      _hist_mWgammaT       = bookHisto1D(19, 1, _mode); // dSigma / dm^{Wgamma}_T
-
-    }
-
-
-    /// Perform the per-event analysis
-    void analyze(const Event& event) {
-
-      const double weight = event.weight();
-
-      // retrieve leading photon
-      Particles photons = apply<LeadingParticlesFinalState>(event, "LeadingPhoton").particles();
-      if (photons.size() != 1)  vetoEvent;
-      const Particle& leadingPhoton = photons[0];
-      if (leadingPhoton.Et() < 15.0*GeV) vetoEvent;
-      if (leadingPhoton.abseta() > 2.37) vetoEvent;
-
-      // check photon isolation
-      double coneEnergy(0.0);
-      Particles fs = apply<VetoedFinalState>(event, "isolatedFS").particles();
-      for (const Particle& p : fs) {
-        if ( deltaR(leadingPhoton, p) < 0.4 )  coneEnergy += p.E();
-      }
-      if ( coneEnergy / leadingPhoton.E() >= 0.5 )  vetoEvent;
-
-      // retrieve W boson candidate
-      const WFinder& wf = apply<WFinder>(event, "WF");
-      if ( wf.bosons().size() != 1 )  vetoEvent; // only one W boson candidate
-      //const Particle& Wboson  = wf.boson();
-
-      // retrieve constituent neutrino
-      const Particle& neutrino = wf.constituentNeutrino();
-      if ( !(neutrino.pT() > 35.0*GeV) )  vetoEvent;
-
-      // retrieve constituent lepton
-      const Particle& lepton = wf.constituentLepton();
-      if ( !(lepton.pT() > 25.0*GeV && lepton.abseta() < 2.47) )  vetoEvent;
-
-      // check photon-lepton overlap
-      if ( !(deltaR(leadingPhoton, lepton) > 0.7) )  vetoEvent;
-
-      // count jets
-      const FastJets& jetfs = apply<FastJets>(event, "Jets");
-      Jets jets = jetfs.jets(cmpMomByEt);
-      int goodJets = 0;
-      for (const Jet& j : jets) {
-        if ( !(j.Et() > 30.0*GeV) )  break;
-        if ( (j.abseta() < 4.4) && \
-             (deltaR(leadingPhoton, j) > 0.3) &&            \
-             (deltaR(lepton,        j) > 0.3) )  ++goodJets;
-      }
-
-      double Njets = double(goodJets) + 0.5;
-      double photonEt = leadingPhoton.Et()*GeV;
-
-      const FourMomentum& lep_gamma = lepton.momentum() + leadingPhoton.momentum();
-      double term1 = sqrt(lep_gamma.mass2() + lep_gamma.pT2()) + neutrino.Et();
-      double term2 = (lep_gamma + neutrino.momentum()).pT2();
-      double mWgammaT = sqrt(term1 * term1 - term2) * GeV;
-
-      _hist_EgammaT_incl->fill(photonEt, weight);
-
-      _hist_Njet_EgammaT15->fill(Njets, weight);
-
-      if ( !goodJets )  _hist_EgammaT_excl->fill(photonEt, weight);
-
-      if (photonEt > 40.0*GeV) {
-        _hist_mWgammaT->fill(mWgammaT, weight);
-        if (photonEt > 60.0*GeV)  _hist_Njet_EgammaT60->fill(Njets, weight);
-      }
-
-    }
-
-
-    /// Normalise histograms etc., after the run
-    void finalize() {
-
-      const double xs_fb = crossSection()/femtobarn;
-      const double sumw = sumOfWeights();
-      const double sf = xs_fb / sumw;
-
-      scale(_hist_EgammaT_excl, sf);
-      scale(_hist_EgammaT_incl, sf);
-
-      normalize(_hist_Njet_EgammaT15);
-      normalize(_hist_Njet_EgammaT60);
-      normalize(_hist_mWgammaT);
-
-    }
-
-    //@}
-
-  protected:
-
-    size_t _mode;
-
-  private:
-
-    /// @name Histograms
-    //@{
-
-    Histo1DPtr _hist_EgammaT_incl;
-    Histo1DPtr _hist_EgammaT_excl;
-    Histo1DPtr _hist_Njet_EgammaT15;
-    Histo1DPtr _hist_Njet_EgammaT60;
-    Histo1DPtr _hist_mWgammaT;
-
-    //@}
-
-  };
-
-
-  class ATLAS_2013_I1217863_W_EL : public ATLAS_2013_I1217863_W {
-  public:
-    ATLAS_2013_I1217863_W_EL()
-      : ATLAS_2013_I1217863_W("ATLAS_2013_I1217863_W_EL")
-    {
-      _mode = 2;
-    }
-  };
-
-
-  class ATLAS_2013_I1217863_W_MU : public ATLAS_2013_I1217863_W {
-  public:
-    ATLAS_2013_I1217863_W_MU()
-      : ATLAS_2013_I1217863_W("ATLAS_2013_I1217863_W_MU")
-    {
-      _mode = 3;
-    }
-  };
-
-
-  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863_W);
-  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863_W_EL);
-  DECLARE_RIVET_PLUGIN(ATLAS_2013_I1217863_W_MU);
-
-}
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.info b/analyses/pluginATLAS/ATLAS_2013_I1217863_W.info
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.info
+++ /dev/null
@@ -1,45 +0,0 @@
-Name: ATLAS_2013_I1217863_W
-Year: 2013
-Summary: W + gamma production at 7 TeV
-Experiment: ATLAS
-Collider: LHC
-InspireID: 1217863
-Status: VALIDATED
-Authors:
- - Chritian Gutschow <chris.g@cern.ch>
-References:
- - Phys.Rev. D87 (2013) 112003
- - doi:10.1103/PhysRevD.87.112003
- - arXiv:1302.1283 [hep-ex]
-RunInfo:
-  W+gamma in the electron channel
-NumEvents: 1000000
-Beams: [p+, p+]
-Energies: [7000]
-PtCuts: [25,15]
-NeedCrossSection: True
-Description:
-  Measurements of the differential fiducial cross sections for the production of a W boson in association with a high-energy
-  photon are measured using pp collisions at $\sqrt{s}=7~\TeV$. The analysis uses a data sample with an integrated luminosity of
-  4.6/fb collected by the ATLAS detector during the 2011 LHC data-taking period. Events are selected using leptonic decays
-  of the W bosons with the requirement of an associated isolated photon. The default routine will consider the electron decay
-  channel of the W boson. Use ATLAS_2013_I1217863_W_EL and ATLAS_2013_I1217863_W_MU to specify the decay channel directly.
-BibKey: Aad:2013iz
-BibTeX: '@article{Aad:2013izg,
-      author         = "Aad, Georges and others",
-      title          = "{Measurements of $W\gamma$ and $Z\gamma$ production in $pp$ collisions
-                        at $\sqrt{s}$=7  TeV with the ATLAS detector at the
-                        LHC}",
-      collaboration  = "ATLAS Collaboration",
-      journal        = "Phys.Rev.",
-      number         = "11",
-      volume         = "D87",
-      pages          = "112003",
-      doi            = "10.1103/PhysRevD.87.112003",
-      year           = "2013",
-      eprint         = "1302.1283",
-      archivePrefix  = "arXiv",
-      primaryClass   = "hep-ex",
-      reportNumber   = "CERN-PH-EP-2012-345",
-      SLACcitation   = "%%CITATION = ARXIV:1302.1283;%%",
-}'
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863_W.plot
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.plot
+++ /dev/null
@@ -1,50 +0,0 @@
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d..-x..-y..
-LogY=1
-LegendYPos=0.90
-LegendXPos=0.90
-LegendAlign=r
-RatioPlotYMax=1.5
-RatioPlotYMin=0.5
-XTwosidedTicks=1
-YTwosidedTicks=1
-ErrorBars=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d0[7-8]-x01-y..
-LogX=1
-RatioPlotYMax=2.0
-RatioPlotYMin=0.0
-XLabel=$E^\gamma_\text{T}$ [GeV]
-YLabel=$\text{d}\sigma(pp \rightarrow \ell \nu \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d1[5-6]-x01-y..
-XLabel=Jet multiplicity
-YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} N_\text{jet}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d19-x01-y..
-XLabel=$m^{W\gamma}_\text{T}$ [GeV]
-YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} m^{W\gamma}_\text{T}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d07-x01-y01
-Title=$N_\text{jet} \geq 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d08-x01-y01
-Title=$N_\text{jet} = 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d15-x01-y01
-Title=$E^\gamma_\text{T} \geq 15$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d16-x01-y01
-Title=$E^\gamma_\text{T} \geq 60$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W/d19-x01-y01
-Title=$E^\gamma_\text{T} > 40$ GeV, electron channel, dressed level
-# END PLOT
-
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863_W.yoda
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W.yoda
+++ /dev/null
@@ -1,70 +0,0 @@
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W/d07-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W/d07-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.947072e+02	3.245120e+01	3.245120e+01
-2.500000e+01	5.000000e+00	5.000000e+00	8.518440e+01	1.115510e+01	1.115510e+01
-3.500000e+01	5.000000e+00	5.000000e+00	4.360630e+01	5.070500e+00	5.070500e+00
-5.000000e+01	1.000000e+01	1.000000e+01	1.409599e+01	1.825380e+00	1.825380e+00
-8.000000e+01	2.000000e+01	2.000000e+01	5.070500e+00	5.070500e-01	5.070500e-01
-5.500000e+02	4.500000e+02	4.500000e+02	9.126900e-02	1.216920e-02	1.216920e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W/d08-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W/d08-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.379176e+02	2.231020e+01	2.231020e+01
-2.500000e+01	5.000000e+00	5.000000e+00	5.526845e+01	7.200110e+00	7.200110e+00
-3.500000e+01	5.000000e+00	5.000000e+00	2.393276e+01	3.346530e+00	3.346530e+00
-5.000000e+01	1.000000e+01	1.000000e+01	6.997290e+00	1.216920e+00	1.216920e+00
-8.000000e+01	2.000000e+01	2.000000e+01	2.129610e+00	3.042300e-01	3.042300e-01
-5.500000e+02	4.500000e+02	4.500000e+02	3.042300e-02	6.084600e-03	6.084600e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W/d15-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W/d15-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	5.800000e-01	3.000000e-02	3.000000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	3.300000e-01	3.000000e-02	3.000000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.000000e-02	1.000000e-02
-3.500000e+00	5.000000e-01	5.000000e-01	3.700000e-02	8.000000e-03	8.000000e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W/d16-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W/d16-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	3.300000e-01	3.300000e-02	3.300000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	4.000000e-01	2.600000e-02	2.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.600000e-01	1.800000e-02	1.800000e-02
-3.500000e+00	5.000000e-01	5.000000e-01	1.100000e-01	2.400000e-02	2.400000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W/d19-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W/d19-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-7.500000e+01	2.500000e+01	2.500000e+01	7.400000e-04	1.980000e-04	1.980000e-04
-1.250000e+02	2.500000e+01	2.500000e+01	5.400000e-03	4.400000e-04	4.400000e-04
-1.750000e+02	2.500000e+01	2.500000e+01	6.400000e-03	4.800000e-04	4.800000e-04
-2.500000e+02	5.000000e+01	5.000000e+01	2.400000e-03	1.500000e-04	1.500000e-04
-3.500000e+02	5.000000e+01	5.000000e+01	7.900000e-04	8.700000e-05	8.700000e-05
-7.000000e+02	3.000000e+02	3.000000e+02	8.333333e-05	1.416667e-05	1.416667e-05
-END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.info b/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.info
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.info
+++ /dev/null
@@ -1,45 +0,0 @@
-Name: ATLAS_2013_I1217863_W_EL
-Year: 2013
-Summary: W + gamma production at 7 TeV
-Experiment: ATLAS
-Collider: LHC
-InspireID: 1217863
-Status: VALIDATED
-Authors:
- - Chritian Gutschow <chris.g@cern.ch>
-References:
- - Phys.Rev. D87 (2013) 112003
- - doi:10.1103/PhysRevD.87.112003
- - arXiv:1302.1283 [hep-ex]
-RunInfo:
-  W+gamma in the electron channel
-NumEvents: 1000000
-Beams: [p+, p+]
-Energies: [7000]
-PtCuts: [25,15]
-NeedCrossSection: True
-Description:
-  Measurements of the differential fiducial cross sections for the production of a W boson in association with a high-energy
-  photon are measured using pp collisions at $\sqrt{s}=7~\TeV$. The analysis uses a data sample with an integrated luminosity of
-  4.6/fb collected by the ATLAS detector during the 2011 LHC data-taking period. Events are selected using leptonic decays
-  of the W bosons with the requirement of an associated isolated photon. The default routine will consider the electron decay
-  channel of the W boson. Use ATLAS_2013_I1217863_W_EL and ATLAS_2013_I1217863_W_MU to specify the decay channel directly.
-BibKey: Aad:2013iz
-BibTeX: '@article{Aad:2013izg,
-      author         = "Aad, Georges and others",
-      title          = "{Measurements of $W\gamma$ and $Z\gamma$ production in $pp$ collisions
-                        at $\sqrt{s}$=7  TeV with the ATLAS detector at the
-                        LHC}",
-      collaboration  = "ATLAS Collaboration",
-      journal        = "Phys.Rev.",
-      number         = "11",
-      volume         = "D87",
-      pages          = "112003",
-      doi            = "10.1103/PhysRevD.87.112003",
-      year           = "2013",
-      eprint         = "1302.1283",
-      archivePrefix  = "arXiv",
-      primaryClass   = "hep-ex",
-      reportNumber   = "CERN-PH-EP-2012-345",
-      SLACcitation   = "%%CITATION = ARXIV:1302.1283;%%",
-}'
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.plot
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.plot
+++ /dev/null
@@ -1,50 +0,0 @@
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d..-x..-y..
-LogY=1
-LegendYPos=0.90
-LegendXPos=0.90
-LegendAlign=r
-RatioPlotYMax=1.5
-RatioPlotYMin=0.5
-XTwosidedTicks=1
-YTwosidedTicks=1
-ErrorBars=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d0[7-8]-x01-y..
-LogX=1
-RatioPlotYMax=2.0
-RatioPlotYMin=0.0
-XLabel=$E^\gamma_\text{T}$ [GeV]
-YLabel=$\text{d}\sigma(pp \rightarrow \ell \nu \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d1[5-6]-x01-y..
-XLabel=Jet multiplicity
-YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} N_\text{jet}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d19-x01-y..
-XLabel=$m^{W\gamma}_\text{T}$ [GeV]
-YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} m^{W\gamma}_\text{T}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d07-x01-y01
-Title=$N_\text{jet} \geq 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d08-x01-y01
-Title=$N_\text{jet} = 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d15-x01-y01
-Title=$E^\gamma_\text{T} \geq 15$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d16-x01-y01
-Title=$E^\gamma_\text{T} \geq 60$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_EL/d19-x01-y01
-Title=$E^\gamma_\text{T} > 40$ GeV, electron channel, dressed level
-# END PLOT
-
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.yoda
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_EL.yoda
+++ /dev/null
@@ -1,70 +0,0 @@
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_EL/d07-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_EL/d07-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.947072e+02	3.245120e+01	3.245120e+01
-2.500000e+01	5.000000e+00	5.000000e+00	8.518440e+01	1.115510e+01	1.115510e+01
-3.500000e+01	5.000000e+00	5.000000e+00	4.360630e+01	5.070500e+00	5.070500e+00
-5.000000e+01	1.000000e+01	1.000000e+01	1.409599e+01	1.825380e+00	1.825380e+00
-8.000000e+01	2.000000e+01	2.000000e+01	5.070500e+00	5.070500e-01	5.070500e-01
-5.500000e+02	4.500000e+02	4.500000e+02	9.126900e-02	1.216920e-02	1.216920e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_EL/d08-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_EL/d08-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.379176e+02	2.231020e+01	2.231020e+01
-2.500000e+01	5.000000e+00	5.000000e+00	5.526845e+01	7.200110e+00	7.200110e+00
-3.500000e+01	5.000000e+00	5.000000e+00	2.393276e+01	3.346530e+00	3.346530e+00
-5.000000e+01	1.000000e+01	1.000000e+01	6.997290e+00	1.216920e+00	1.216920e+00
-8.000000e+01	2.000000e+01	2.000000e+01	2.129610e+00	3.042300e-01	3.042300e-01
-5.500000e+02	4.500000e+02	4.500000e+02	3.042300e-02	6.084600e-03	6.084600e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_EL/d15-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_EL/d15-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	5.800000e-01	3.000000e-02	3.000000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	3.300000e-01	3.000000e-02	3.000000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.000000e-02	1.000000e-02
-3.500000e+00	5.000000e-01	5.000000e-01	3.700000e-02	8.000000e-03	8.000000e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_EL/d16-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_EL/d16-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	3.300000e-01	3.300000e-02	3.300000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	4.000000e-01	2.600000e-02	2.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.600000e-01	1.800000e-02	1.800000e-02
-3.500000e+00	5.000000e-01	5.000000e-01	1.100000e-01	2.400000e-02	2.400000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_EL/d19-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_EL/d19-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-7.500000e+01	2.500000e+01	2.500000e+01	7.400000e-04	1.980000e-04	1.980000e-04
-1.250000e+02	2.500000e+01	2.500000e+01	5.400000e-03	4.400000e-04	4.400000e-04
-1.750000e+02	2.500000e+01	2.500000e+01	6.400000e-03	4.800000e-04	4.800000e-04
-2.500000e+02	5.000000e+01	5.000000e+01	2.400000e-03	1.500000e-04	1.500000e-04
-3.500000e+02	5.000000e+01	5.000000e+01	7.900000e-04	8.700000e-05	8.700000e-05
-7.000000e+02	3.000000e+02	3.000000e+02	8.333333e-05	1.416667e-05	1.416667e-05
-END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.info b/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.info
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.info
+++ /dev/null
@@ -1,45 +0,0 @@
-Name: ATLAS_2013_I1217863_W_MU
-Year: 2013
-Summary: W + gamma production at 7 TeV
-Experiment: ATLAS
-Collider: LHC
-InspireID: 1217863
-Status: VALIDATED
-Authors:
- - Chritian Gutschow <chris.g@cern.ch>
-References:
- - Phys.Rev. D87 (2013) 112003
- - doi:10.1103/PhysRevD.87.112003
- - arXiv:1302.1283 [hep-ex]
-RunInfo:
-  W+gamma in the muon channel
-NumEvents: 1000000
-Beams: [p+, p+]
-Energies: [7000]
-PtCuts: [25,15]
-NeedCrossSection: True
-Description:
-  Measurements of the differential fiducial cross sections for the production of a W boson in association with a high-energy
-  photon are measured using pp collisions at $\sqrt{s}=7~\TeV$. The analysis uses a data sample with an integrated luminosity of
-  4.6/fb collected by the ATLAS detector during the 2011 LHC data-taking period. Events are selected using leptonic decays
-  of the W bosons with the requirement of an associated isolated photon. The default routine will consider the electron decay
-  channel of the W boson. Use ATLAS_2013_I1217863_W_EL and ATLAS_2013_I1217863_W_MU to specify the decay channel directly.
-BibKey: Aad:2013iz
-BibTeX: '@article{Aad:2013izg,
-      author         = "Aad, Georges and others",
-      title          = "{Measurements of $W\gamma$ and $Z\gamma$ production in $pp$ collisions
-                        at $\sqrt{s}$=7  TeV with the ATLAS detector at the
-                        LHC}",
-      collaboration  = "ATLAS Collaboration",
-      journal        = "Phys.Rev.",
-      number         = "11",
-      volume         = "D87",
-      pages          = "112003",
-      doi            = "10.1103/PhysRevD.87.112003",
-      year           = "2013",
-      eprint         = "1302.1283",
-      archivePrefix  = "arXiv",
-      primaryClass   = "hep-ex",
-      reportNumber   = "CERN-PH-EP-2012-345",
-      SLACcitation   = "%%CITATION = ARXIV:1302.1283;%%",
-}'
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.plot
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.plot
+++ /dev/null
@@ -1,50 +0,0 @@
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d..-x..-y..
-LogY=1
-LegendYPos=0.90
-LegendXPos=0.90
-LegendAlign=r
-RatioPlotYMax=1.5
-RatioPlotYMin=0.5
-XTwosidedTicks=1
-YTwosidedTicks=1
-ErrorBars=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d0[7-8]-x01-y..
-LogX=1
-RatioPlotYMax=2.0
-RatioPlotYMin=0.0
-XLabel=$E^\gamma_\text{T}$ [GeV]
-YLabel=$\text{d}\sigma(pp \rightarrow \ell \nu \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d1[5-6]-x01-y..
-XLabel=Jet multiplicity
-YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} N_\text{jet}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d19-x01-y..
-XLabel=$m^{W\gamma}_\text{T}$ [GeV]
-YLabel=$1/\sigma_{W\gamma} \times \text{d}\sigma_{W\gamma} / \text{d} m^{W\gamma}_\text{T}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d07-x01-y01
-Title=$N_\text{jet} \geq 0$, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d08-x01-y01
-Title=$N_\text{jet} = 0$, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d15-x01-y01
-Title=$E^\gamma_\text{T} \geq 15$ GeV, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d16-x01-y01
-Title=$E^\gamma_\text{T} \geq 60$ GeV, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_W_MU/d19-x01-y01
-Title=$E^\gamma_\text{T} > 40$ GeV, muon channel, dressed level
-# END PLOT
-
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.yoda
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_W_MU.yoda
+++ /dev/null
@@ -1,70 +0,0 @@
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_MU/d07-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_MU/d07-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.947072e+02	3.245120e+01	3.245120e+01
-2.500000e+01	5.000000e+00	5.000000e+00	8.518440e+01	1.115510e+01	1.115510e+01
-3.500000e+01	5.000000e+00	5.000000e+00	4.360630e+01	5.070500e+00	5.070500e+00
-5.000000e+01	1.000000e+01	1.000000e+01	1.409599e+01	1.825380e+00	1.825380e+00
-8.000000e+01	2.000000e+01	2.000000e+01	5.070500e+00	5.070500e-01	5.070500e-01
-5.500000e+02	4.500000e+02	4.500000e+02	9.126900e-02	1.216920e-02	1.216920e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_MU/d08-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_MU/d08-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.379176e+02	2.231020e+01	2.231020e+01
-2.500000e+01	5.000000e+00	5.000000e+00	5.526845e+01	7.200110e+00	7.200110e+00
-3.500000e+01	5.000000e+00	5.000000e+00	2.393276e+01	3.346530e+00	3.346530e+00
-5.000000e+01	1.000000e+01	1.000000e+01	6.997290e+00	1.216920e+00	1.216920e+00
-8.000000e+01	2.000000e+01	2.000000e+01	2.129610e+00	3.042300e-01	3.042300e-01
-5.500000e+02	4.500000e+02	4.500000e+02	3.042300e-02	6.084600e-03	6.084600e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_MU/d15-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_MU/d15-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	5.800000e-01	3.000000e-02	3.000000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	3.300000e-01	3.000000e-02	3.000000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.000000e-02	1.000000e-02
-3.500000e+00	5.000000e-01	5.000000e-01	3.700000e-02	8.000000e-03	8.000000e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_MU/d16-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_MU/d16-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	3.300000e-01	3.300000e-02	3.300000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	4.000000e-01	2.600000e-02	2.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.600000e-01	1.800000e-02	1.800000e-02
-3.500000e+00	5.000000e-01	5.000000e-01	1.100000e-01	2.400000e-02	2.400000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_W_MU/d19-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_W_MU/d19-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-7.500000e+01	2.500000e+01	2.500000e+01	7.400000e-04	1.980000e-04	1.980000e-04
-1.250000e+02	2.500000e+01	2.500000e+01	5.400000e-03	4.400000e-04	4.400000e-04
-1.750000e+02	2.500000e+01	2.500000e+01	6.400000e-03	4.800000e-04	4.800000e-04
-2.500000e+02	5.000000e+01	5.000000e+01	2.400000e-03	1.500000e-04	1.500000e-04
-3.500000e+02	5.000000e+01	5.000000e+01	7.900000e-04	8.700000e-05	8.700000e-05
-7.000000e+02	3.000000e+02	3.000000e+02	8.333333e-05	1.416667e-05	1.416667e-05
-END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.plot
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.plot
+++ /dev/null
@@ -1,50 +0,0 @@
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d..-x..-y..
-LogY=1
-LegendYPos=0.90
-LegendXPos=0.90
-LegendAlign=r
-RatioPlotYMax=1.5
-RatioPlotYMin=0.5
-XTwosidedTicks=1
-YTwosidedTicks=1
-ErrorBars=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d1[1-2]-x01-y..
-LogX=1
-RatioPlotYMax=2.0
-RatioPlotYMin=0.0
-XLabel=$E^\gamma_\text{T}$ [GeV]
-YLabel=$\text{d}\sigma(pp \rightarrow \ell^+ \ell^- \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d1[7-8]-x01-y..
-XLabel=Jet multiplicity
-YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} N_\text{jet}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d20-x01-y..
-XLabel=$m^{Z\gamma}$ [GeV]
-YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} m^{Z\gamma}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d11-x01-y01
-Title=$N_\text{jet} \geq 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d12-x01-y01
-Title=$N_\text{jet} = 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d17-x01-y01
-Title=$E^\gamma_\text{T} \geq 15$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d18-x01-y01
-Title=$E^\gamma_\text{T} \geq 60$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z/d20-x01-y01
-Title=$E^\gamma_\text{T} > 40$ GeV, electron channel, dressed level
-# END PLOT
-
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.yoda
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z.yoda
+++ /dev/null
@@ -1,66 +0,0 @@
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z/d11-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z/d11-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.216920e+02	1.216920e+01	1.216920e+01
-2.500000e+01	5.000000e+00	5.000000e+00	4.309925e+01	4.259220e+00	4.259220e+00
-3.500000e+01	5.000000e+00	5.000000e+00	1.318330e+01	1.419740e+00	1.419740e+00
-5.000000e+01	1.000000e+01	1.000000e+01	5.009654e+00	6.186010e-01	6.186010e-01
-8.000000e+01	2.000000e+01	2.000000e+01	1.419740e+00	1.926790e-01	1.926790e-01
-5.500000e+02	4.500000e+02	4.500000e+02	1.825380e-02	7.098700e-03	7.098700e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z/d12-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z/d12-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.074946e+02	1.115510e+01	1.115510e+01
-2.500000e+01	5.000000e+00	5.000000e+00	3.478363e+01	4.157810e+00	4.157810e+00
-3.500000e+01	5.000000e+00	5.000000e+00	9.431130e+00	1.115510e+00	1.115510e+00
-5.000000e+01	1.000000e+01	1.000000e+01	3.285684e+00	4.766270e-01	4.766270e-01
-8.000000e+01	2.000000e+01	2.000000e+01	1.024241e+00	1.622560e-01	1.622560e-01
-5.500000e+02	4.500000e+02	4.500000e+02	7.098700e-03	4.056400e-03	4.056400e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z/d17-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z/d17-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	8.000000e-01	2.700000e-02	2.700000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	1.500000e-01	1.600000e-02	1.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	5.200000e-02	1.100000e-02	1.100000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z/d18-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z/d18-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	6.000000e-01	3.800000e-02	3.800000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	2.800000e-01	2.600000e-02	2.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.900000e-02	1.900000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z/d20-x01-y01
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z/d20-x01-y01
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.000000e+02	5.000000e+01	5.000000e+01	1.400000e-03	1.800000e-04	1.800000e-04
-1.750000e+02	2.500000e+01	2.500000e+01	8.800000e-03	4.800000e-04	4.800000e-04
-2.500000e+02	5.000000e+01	5.000000e+01	3.200000e-03	2.200000e-04	2.200000e-04
-6.500000e+02	3.500000e+02	3.500000e+02	1.571429e-04	2.142857e-05	2.142857e-05
-END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.info b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.info
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.info
+++ /dev/null
@@ -1,45 +0,0 @@
-Name: ATLAS_2013_I1217863_Z_EL
-Year: 2013
-Summary: Z + gamma production at 7 TeV
-Experiment: ATLAS
-Collider: LHC
-InspireID: 1217863
-Status: VALIDATED
-Authors:
- - Chritian Gutschow <chris.g@cern.ch>
-References:
- - Phys.Rev. D87 (2013) 112003
- - doi:10.1103/PhysRevD.87.112003
- - arXiv:1302.1283 [hep-ex]
-RunInfo:
-  Z+gamma in the electron channel
-NumEvents: 1000000
-Beams: [p+, p+]
-Energies: [7000]
-PtCuts: [25,15]
-NeedCrossSection: True
-Description:
-  Measurements of the differential fiducial cross sections for the production of a Z boson in association with a high-energy
-  photon are measured using pp collisions at $\sqrt{s}=7~\TeV$. The analysis uses a data sample with an integrated luminosity of
-  4.6 fb-1 collected by the ATLAS detector during the 2011 LHC data-taking period. Events are selected using leptonic decays
-  of the Z bosons with the requirement of an associated isolated photon. The default routine will consider the electron decay
-  channel of the Z boson. Use ATLAS_2013_I1217863_Z_EL and ATLAS_2013_I1217863_Z_MU to specify the decay channel directly.
-BibKey: Aad:2013iz
-BibTeX: '@article{Aad:2013izg,
-      author         = "Aad, Georges and others",
-      title          = "{Measurements of $W\gamma$ and $Z\gamma$ production in $pp$ collisions
-                        at $\sqrt{s}$=7  TeV with the ATLAS detector at the
-                        LHC}",
-      collaboration  = "ATLAS Collaboration",
-      journal        = "Phys.Rev.",
-      number         = "11",
-      volume         = "D87",
-      pages          = "112003",
-      doi            = "10.1103/PhysRevD.87.112003",
-      year           = "2013",
-      eprint         = "1302.1283",
-      archivePrefix  = "arXiv",
-      primaryClass   = "hep-ex",
-      reportNumber   = "CERN-PH-EP-2012-345",
-      SLACcitation   = "%%CITATION = ARXIV:1302.1283;%%",
-}'
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.plot
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.plot
+++ /dev/null
@@ -1,50 +0,0 @@
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d..-x..-y..
-LogY=1
-LegendYPos=0.90
-LegendXPos=0.90
-LegendAlign=r
-RatioPlotYMax=1.5
-RatioPlotYMin=0.5
-XTwosidedTicks=1
-YTwosidedTicks=1
-ErrorBars=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d1[1-2]-x01-y..
-LogX=1
-RatioPlotYMax=2.0
-RatioPlotYMin=0.0
-XLabel=$E^\gamma_\text{T}$ [GeV]
-YLabel=$\text{d}\sigma(pp \rightarrow \ell^+ \ell^- \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d1[7-8]-x01-y..
-XLabel=Jet multiplicity
-YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} N_\text{jet}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d20-x01-y..
-XLabel=$m^{Z\gamma}$ [GeV]
-YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} m^{Z\gamma}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d11-x01-y01
-Title=$N_\text{jet} \geq 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d12-x01-y01
-Title=$N_\text{jet} = 0$, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d17-x01-y01
-Title=$E^\gamma_\text{T} \geq 15$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d18-x01-y01
-Title=$E^\gamma_\text{T} \geq 60$ GeV, electron channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_EL/d20-x01-y01
-Title=$E^\gamma_\text{T} > 40$ GeV, electron channel, dressed level
-# END PLOT
-
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.yoda
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_EL.yoda
+++ /dev/null
@@ -1,66 +0,0 @@
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_EL/d11-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_EL/d11-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.216920e+02	1.216920e+01	1.216920e+01
-2.500000e+01	5.000000e+00	5.000000e+00	4.309925e+01	4.259220e+00	4.259220e+00
-3.500000e+01	5.000000e+00	5.000000e+00	1.318330e+01	1.419740e+00	1.419740e+00
-5.000000e+01	1.000000e+01	1.000000e+01	5.009654e+00	6.186010e-01	6.186010e-01
-8.000000e+01	2.000000e+01	2.000000e+01	1.419740e+00	1.926790e-01	1.926790e-01
-5.500000e+02	4.500000e+02	4.500000e+02	1.825380e-02	7.098700e-03	7.098700e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_EL/d12-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_EL/d12-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.074946e+02	1.115510e+01	1.115510e+01
-2.500000e+01	5.000000e+00	5.000000e+00	3.478363e+01	4.157810e+00	4.157810e+00
-3.500000e+01	5.000000e+00	5.000000e+00	9.431130e+00	1.115510e+00	1.115510e+00
-5.000000e+01	1.000000e+01	1.000000e+01	3.285684e+00	4.766270e-01	4.766270e-01
-8.000000e+01	2.000000e+01	2.000000e+01	1.024241e+00	1.622560e-01	1.622560e-01
-5.500000e+02	4.500000e+02	4.500000e+02	7.098700e-03	4.056400e-03	4.056400e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_EL/d17-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_EL/d17-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	8.000000e-01	2.700000e-02	2.700000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	1.500000e-01	1.600000e-02	1.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	5.200000e-02	1.100000e-02	1.100000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_EL/d18-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_EL/d18-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	6.000000e-01	3.800000e-02	3.800000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	2.800000e-01	2.600000e-02	2.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.900000e-02	1.900000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_EL/d20-x01-y02
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_EL/d20-x01-y02
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.000000e+02	5.000000e+01	5.000000e+01	1.400000e-03	1.800000e-04	1.800000e-04
-1.750000e+02	2.500000e+01	2.500000e+01	8.800000e-03	4.800000e-04	4.800000e-04
-2.500000e+02	5.000000e+01	5.000000e+01	3.200000e-03	2.200000e-04	2.200000e-04
-6.500000e+02	3.500000e+02	3.500000e+02	1.571429e-04	2.142857e-05	2.142857e-05
-END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.info b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.info
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.info
+++ /dev/null
@@ -1,45 +0,0 @@
-Name: ATLAS_2013_I1217863_Z_MU
-Year: 2013
-Summary: Z + gamma production at 7 TeV
-Experiment: ATLAS
-Collider: LHC
-InspireID: 1217863
-Status: VALIDATED
-Authors:
- - Chritian Gutschow <chris.g@cern.ch>
-References:
- - Phys.Rev. D87 (2013) 112003
- - doi:10.1103/PhysRevD.87.112003
- - arXiv:1302.1283 [hep-ex]
-RunInfo:
-  Z+gamma in the muon channel
-NumEvents: 1000000
-Beams: [p+, p+]
-Energies: [7000]
-PtCuts: [25,15]
-NeedCrossSection: True
-Description:
-  Measurements of the differential fiducial cross sections for the production of a Z boson in association with a high-energy
-  photon are measured using pp collisions at $\sqrt{s}=7~\TeV$. The analysis uses a data sample with an integrated luminosity of
-  4.6/fb collected by the ATLAS detector during the 2011 LHC data-taking period. Events are selected using leptonic decays
-  of the Z bosons with the requirement of an associated isolated photon. The default routine will consider the electron decay
-  channel of the Z boson. Use ATLAS_2013_I1217863_Z_EL and ATLAS_2013_I1217863_Z_MU to specify the decay channel directly.
-BibKey: Aad:2013iz
-BibTeX: '@article{Aad:2013izg,
-      author         = "Aad, Georges and others",
-      title          = "{Measurements of $W\gamma$ and $Z\gamma$ production in $pp$ collisions
-                        at $\sqrt{s}$=7  TeV with the ATLAS detector at the
-                        LHC}",
-      collaboration  = "ATLAS Collaboration",
-      journal        = "Phys.Rev.",
-      number         = "11",
-      volume         = "D87",
-      pages          = "112003",
-      doi            = "10.1103/PhysRevD.87.112003",
-      year           = "2013",
-      eprint         = "1302.1283",
-      archivePrefix  = "arXiv",
-      primaryClass   = "hep-ex",
-      reportNumber   = "CERN-PH-EP-2012-345",
-      SLACcitation   = "%%CITATION = ARXIV:1302.1283;%%",
-}'
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.plot b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.plot
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.plot
+++ /dev/null
@@ -1,50 +0,0 @@
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d..-x..-y..
-LogY=1
-LegendYPos=0.90
-LegendXPos=0.90
-LegendAlign=r
-RatioPlotYMax=1.5
-RatioPlotYMin=0.5
-XTwosidedTicks=1
-YTwosidedTicks=1
-ErrorBars=1
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d1[1-2]-x01-y..
-LogX=1
-RatioPlotYMax=2.0
-RatioPlotYMin=0.0
-XLabel=$E^\gamma_\text{T}$ [GeV]
-YLabel=$\text{d}\sigma(pp \rightarrow \ell^+ \ell^- \gamma) / \text{d}E^\gamma_\text{T}$ [fb $\text{GeV}^{-1}$]
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d1[7-8]-x01-y..
-XLabel=Jet multiplicity
-YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} N_\text{jet}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d20-x01-y..
-XLabel=$m^{Z\gamma}$ [GeV]
-YLabel=$1/\sigma_{Z\gamma} \times \text{d}\sigma_{Z\gamma} / \text{d} m^{Z\gamma}$
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d11-x01-y01
-Title=$N_\text{jet} \geq 0$, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d12-x01-y01
-Title=$N_\text{jet} = 0$, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d17-x01-y01
-Title=$E^\gamma_\text{T} \geq 15$ GeV, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d18-x01-y01
-Title=$E^\gamma_\text{T} \geq 60$ GeV, muon channel, dressed level
-# END PLOT
-
-# BEGIN PLOT /ATLAS_2013_I1217863_Z_MU/d20-x01-y01
-Title=$E^\gamma_\text{T} > 40$ GeV, muon channel, dressed level
-# END PLOT
-
diff --git a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.yoda b/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.yoda
deleted file mode 100644
--- a/analyses/pluginATLAS/ATLAS_2013_I1217863_Z_MU.yoda
+++ /dev/null
@@ -1,66 +0,0 @@
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_MU/d11-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_MU/d11-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.216920e+02	1.216920e+01	1.216920e+01
-2.500000e+01	5.000000e+00	5.000000e+00	4.309925e+01	4.259220e+00	4.259220e+00
-3.500000e+01	5.000000e+00	5.000000e+00	1.318330e+01	1.419740e+00	1.419740e+00
-5.000000e+01	1.000000e+01	1.000000e+01	5.009654e+00	6.186010e-01	6.186010e-01
-8.000000e+01	2.000000e+01	2.000000e+01	1.419740e+00	1.926790e-01	1.926790e-01
-5.500000e+02	4.500000e+02	4.500000e+02	1.825380e-02	7.098700e-03	7.098700e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_MU/d12-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_MU/d12-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.750000e+01	2.500000e+00	2.500000e+00	1.074946e+02	1.115510e+01	1.115510e+01
-2.500000e+01	5.000000e+00	5.000000e+00	3.478363e+01	4.157810e+00	4.157810e+00
-3.500000e+01	5.000000e+00	5.000000e+00	9.431130e+00	1.115510e+00	1.115510e+00
-5.000000e+01	1.000000e+01	1.000000e+01	3.285684e+00	4.766270e-01	4.766270e-01
-8.000000e+01	2.000000e+01	2.000000e+01	1.024241e+00	1.622560e-01	1.622560e-01
-5.500000e+02	4.500000e+02	4.500000e+02	7.098700e-03	4.056400e-03	4.056400e-03
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_MU/d17-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_MU/d17-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	8.000000e-01	2.700000e-02	2.700000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	1.500000e-01	1.600000e-02	1.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	5.200000e-02	1.100000e-02	1.100000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_MU/d18-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_MU/d18-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-5.000000e-01	5.000000e-01	5.000000e-01	6.000000e-01	3.800000e-02	3.800000e-02
-1.500000e+00	5.000000e-01	5.000000e-01	2.800000e-01	2.600000e-02	2.600000e-02
-2.500000e+00	5.000000e-01	5.000000e-01	1.200000e-01	1.900000e-02	1.900000e-02
-END YODA_SCATTER2D_V2
-
-BEGIN YODA_SCATTER2D_V2 /REF/ATLAS_2013_I1217863_Z_MU/d20-x01-y03
-IsRef: 1
-Path: /REF/ATLAS_2013_I1217863_Z_MU/d20-x01-y03
-Title: ~
-Type: Scatter2D
----
-# xval	 xerr-	 xerr+	 yval	 yerr-	 yerr+
-1.000000e+02	5.000000e+01	5.000000e+01	1.400000e-03	1.800000e-04	1.800000e-04
-1.750000e+02	2.500000e+01	2.500000e+01	8.800000e-03	4.800000e-04	4.800000e-04
-2.500000e+02	5.000000e+01	5.000000e+01	3.200000e-03	2.200000e-04	2.200000e-04
-6.500000e+02	3.500000e+02	3.500000e+02	1.571429e-04	2.142857e-05	2.142857e-05
-END YODA_SCATTER2D_V2
diff --git a/analyses/pluginATLAS/ATLAS_2014_I1306294.cc b/analyses/pluginATLAS/ATLAS_2014_I1306294.cc
--- a/analyses/pluginATLAS/ATLAS_2014_I1306294.cc
+++ b/analyses/pluginATLAS/ATLAS_2014_I1306294.cc
@@ -1,212 +1,212 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ZFinder.hh"
 #include "Rivet/Projections/FastJets.hh"
 #include "Rivet/Projections/HeavyHadrons.hh"
 #include "Rivet/Projections/VetoedFinalState.hh"
 
 namespace Rivet {
 
   class ATLAS_2014_I1306294 : public Analysis {
   public:
 
     /// @name Constructors etc.
     //@{
 
     /// Constructors
     ///@brief: Electroweak Wjj production at 8 TeV
     DEFAULT_RIVET_ANALYSIS_CTOR(ATLAS_2014_I1306294);
     //@}
 
   public:
 
     /// @name Analysis methods
     //@{
 
     /// Book histograms and initialise projections before the run
     void init() {
 
      // Get options from the new option system
-      _mode = 0;
+      _mode = 1;
       if ( getOption("LMODE") == "EL" ) _mode = 1;
       if ( getOption("LMODE") == "MU" ) _mode = 2;
 
       FinalState fs;
 
       Cut cuts = Cuts::etaIn(-2.5,2.5) & (Cuts::pT > 20.0*GeV);
 
       ZFinder zfinder(fs, cuts, _mode==1? PID::ELECTRON : PID::MUON, 76.0*GeV, 106.0*GeV, 0.1, ZFinder::CLUSTERNODECAY, ZFinder::NOTRACK);
       declare(zfinder, "ZFinder");
 
       //FastJets jetpro1( getProjection<ZFinder>("ZFinder").remainingFinalState(), FastJets::ANTIKT, 0.4);
       VetoedFinalState jet_fs(fs);
       jet_fs.addVetoOnThisFinalState(getProjection<ZFinder>("ZFinder"));
       FastJets jetpro1(jet_fs, FastJets::ANTIKT, 0.4);
       jetpro1.useInvisibles();
       declare(jetpro1, "AntiKtJets04");
       declare(HeavyHadrons(), "BHadrons");
 
       //Histograms with data binning
       _h_bjet_Pt      = bookHisto1D( 3, 1, 1);
       _h_bjet_Y       = bookHisto1D( 5, 1, 1);
       _h_bjet_Yboost  = bookHisto1D( 7, 1, 1);
       _h_bjet_DY20    = bookHisto1D( 9, 1, 1);
       _h_bjet_ZdPhi20 = bookHisto1D(11, 1, 1);
       _h_bjet_ZdR20   = bookHisto1D(13, 1, 1);
       _h_bjet_ZPt     = bookHisto1D(15, 1, 1);
       _h_bjet_ZY      = bookHisto1D(17, 1, 1);
       _h_2bjet_dR     = bookHisto1D(21, 1, 1);
       _h_2bjet_Mbb    = bookHisto1D(23, 1, 1);
       _h_2bjet_ZPt    = bookHisto1D(25, 1, 1);
       _h_2bjet_ZY     = bookHisto1D(27, 1, 1);
     }
 
 	  //==========================================================================================
 
 
     /// Perform the per-event analysis
     void analyze(const Event& e) {
 
       
       //---------------------------
       const double weight = e.weight();
 
       // -- check we have a Z: 
       const ZFinder& zfinder = apply<ZFinder>(e, "ZFinder");
       
       if(zfinder.bosons().size() != 1)  vetoEvent;
       
       const ParticleVector boson_s =  zfinder.bosons();
       const Particle       boson_f =  boson_s[0]      ;
       const ParticleVector zleps   =  zfinder.constituents();
       //---------------------------
 
       
       //---------------------------
       //------------- stop processing the event if no true b-partons or hadrons are found
       const Particles& allBs = apply<HeavyHadrons>(e, "BHadrons").bHadrons(5.0*GeV);
       Particles stableBs;
       foreach(Particle p, allBs) {
         if(p.abseta() < 2.5)  stableBs += p;
       }
       if( stableBs.empty() )  vetoEvent;
 
       
       //---------------------------
       // -- get the b-jets:
       const Jets& jets = apply<JetAlg>(e, "AntiKtJets04").jetsByPt(Cuts::pT >20.0*GeV && Cuts::abseta <2.4);
       Jets b_jets;
       foreach(const Jet& jet, jets) {
         //veto overlaps with Z leptons:
         bool veto = false;
         foreach(const Particle& zlep, zleps) {
           if(deltaR(jet, zlep) < 0.5)  veto = true;
         }
         if(veto) continue;
 	
         foreach(const Particle& bhadron, stableBs) {
           if( deltaR(jet, bhadron) <= 0.3 ) {
             b_jets.push_back(jet);
             break; // match
           }
 	      } // end loop on b-hadrons  
       }
       
       //and make sure we have at least 1:
       if(b_jets.empty())  vetoEvent;
 
       //---------------------------
       // fill the plots:
       const double ZpT = boson_f.pT()/GeV;
       const double ZY  = boson_f.absrap();
       
       _h_bjet_ZPt->fill(ZpT, weight);
       _h_bjet_ZY ->fill(ZY,  weight);
       
       foreach(const Jet& jet, b_jets) {
 	
         _h_bjet_Pt->fill(jet.pT()/GeV, weight );
         _h_bjet_Y ->fill(jet.absrap(), weight );
         
         const double Yboost = 0.5 * fabs(boson_f.rapidity() + jet.rapidity());
 
         _h_bjet_Yboost->fill(Yboost, weight );
         
         if(ZpT > 20.) {
         
           const double ZBDY   = fabs( boson_f.rapidity() - jet.rapidity() );
           const double ZBDPHI = fabs( deltaPhi(jet.phi(), boson_f.phi()) );
           const double ZBDR   = deltaR(jet, boson_f, RAPIDITY);
           _h_bjet_DY20->fill(   ZBDY,   weight);
           _h_bjet_ZdPhi20->fill(ZBDPHI, weight);
           _h_bjet_ZdR20->fill(  ZBDR,   weight);
         }
 	
       } //loop over b-jets
       
       if (b_jets.size() < 2) return;
       
       _h_2bjet_ZPt->fill(ZpT, weight);
       _h_2bjet_ZY ->fill(ZY,  weight);
       
       const double BBDR = deltaR(b_jets[0], b_jets[1], RAPIDITY);
       const double Mbb  = (b_jets[0].momentum() + b_jets[1].momentum()).mass();
       
       _h_2bjet_dR ->fill(BBDR, weight);
       _h_2bjet_Mbb->fill(Mbb,  weight);
       
     } // end of analysis loop
     
     
     /// Normalise histograms etc., after the run
     void finalize() {
       
       const double normfac = crossSection() / sumOfWeights();
       
       scale( _h_bjet_Pt,      normfac);
       scale( _h_bjet_Y,       normfac);
       scale( _h_bjet_Yboost,  normfac);
       scale( _h_bjet_DY20,    normfac);
       scale( _h_bjet_ZdPhi20, normfac);
       scale( _h_bjet_ZdR20,   normfac);
       scale( _h_bjet_ZPt,     normfac);
       scale( _h_bjet_ZY,      normfac);
       scale( _h_2bjet_dR,     normfac);
       scale( _h_2bjet_Mbb,    normfac);
       scale( _h_2bjet_ZPt,    normfac);
       scale( _h_2bjet_ZY,     normfac);
     }
     
     //@}
     
     
   protected:
 	  
     // Data members like post-cuts event weight counters go here
     size_t _mode;
     
     
   private:
 
     Histo1DPtr _h_bjet_Pt;
     Histo1DPtr _h_bjet_Y;
     Histo1DPtr _h_bjet_Yboost;
     Histo1DPtr _h_bjet_DY20;
     Histo1DPtr _h_bjet_ZdPhi20;
     Histo1DPtr _h_bjet_ZdR20;
     Histo1DPtr _h_bjet_ZPt;
     Histo1DPtr _h_bjet_ZY;
     Histo1DPtr _h_2bjet_dR;
     Histo1DPtr _h_2bjet_Mbb;
     Histo1DPtr _h_2bjet_ZPt;
     Histo1DPtr _h_2bjet_ZY;
     
   };
 
 
   // The hook for the plugin system
   DECLARE_RIVET_PLUGIN(ATLAS_2014_I1306294);
 
 }