Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.

cms-sw · Feb 6, 2019 · d8dce27 · d8dce27
2 parents 5fc6bb8 + c3eacf4
commit d8dce27
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h b/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h
@@ -94,10 +94,10 @@ namespace Rivet {
         // photons from hadrons are vetoed by the PromptFinalState;
         // will be default DressedLeptons behaviour for Rivet >= 2.5.4
         DressedLeptons dressed_leptons(prompt_photons, prompt_leptons, _lepConeSize, 
-                       lepton_cut, /*cluster*/ true, /*useDecayPhotons*/ true);
+                       lepton_cut, /*useDecayPhotons*/ true);
         if (not _usePromptFinalStates)
           dressed_leptons = DressedLeptons(photons, charged_leptons, _lepConeSize, 
-                            lepton_cut, /*cluster*/ true, /*useDecayPhotons*/ true);
+                            lepton_cut, /*useDecayPhotons*/ true);
         addProjection(dressed_leptons, "DressedLeptons");
 
         // Photons
@@ -162,6 +162,8 @@ namespace Rivet {
       // Do nothing here
       void finalize() override {};
 
+      std::string status() const override { return "VALIDATED"; }
+
   };
 
 }