Rename LHEWeight-->GenWeight to have same product for LHE and GEN

GeneratorInterface/Core/interface/WeightHelper.h

@@ -2,7 +2,7 @@
 #define GeneratorInterface_LHEInterface_WeightHelper_h
 
 #include "DataFormats/Common/interface/OwnVector.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/WeightGroupInfo.h"
 #include "SimDataFormats/GeneratorProducts/interface/WeightsInfo.h"
 
@@ -11,7 +11,7 @@ namespace gen {
     public:
         WeightHelper() {}
         edm::OwnVector<gen::WeightGroupInfo> weightGroups() {return weightGroups_;}
-        std::unique_ptr<LHEWeightProduct> weightProduct(std::vector<gen::WeightsInfo>);
+        std::unique_ptr<GenWeightProduct> weightProduct(std::vector<gen::WeightsInfo>);
         int findContainingWeightGroup(std::string wgtId, int weightIndex, int previousGroupIndex);
     protected:
         edm::OwnVector<gen::WeightGroupInfo> weightGroups_;

GeneratorInterface/Core/plugins/LHEWeightProductProducer.cc

@@ -16,7 +16,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
 
 #include "GeneratorInterface/LHEInterface/interface/LHERunInfo.h"
@@ -51,8 +51,8 @@ LHEWeightProductProducer::LHEWeightProductProducer(const edm::ParameterSet& iCon
     lheEventToken_(consumes<LHEEventProduct>(edm::InputTag("externalLHEProducer")))
         //iConfig.getUntrackedParameter<edm::InputTag>("lheSource", edm::InputTag("externalLHEProducer"))))
 {
-  produces<LHEWeightProduct>();
-  produces<LHEWeightInfoProduct, edm::Transition::BeginRun>();
+  produces<GenWeightProduct>();
+  produces<GenWeightInfoProduct, edm::Transition::BeginRun>();
 }
 
 
@@ -88,7 +88,7 @@ LHEWeightProductProducer::beginRunProduce(edm::Run& run, edm::EventSetup const&
     }
 
 	weightHelper_.parseWeightGroupsFromHeader(headerWeightInfo.lines());
-    auto weightInfoProduct = std::make_unique<LHEWeightInfoProduct>();
+    auto weightInfoProduct = std::make_unique<GenWeightInfoProduct>();
     for (auto& weightGroup : weightHelper_.weightGroups()) {
         weightInfoProduct->addWeightGroupInfo(weightGroup.clone());
     }

GeneratorInterface/Core/src/WeightHelper.cc

@@ -1,8 +1,8 @@
 #include "GeneratorInterface/Core/interface/WeightHelper.h"
 
 namespace gen {
-    std::unique_ptr<LHEWeightProduct> WeightHelper::weightProduct(std::vector<gen::WeightsInfo> weights) {
-        auto weightProduct = std::make_unique<LHEWeightProduct>();
+    std::unique_ptr<GenWeightProduct> WeightHelper::weightProduct(std::vector<gen::WeightsInfo> weights) {
+        auto weightProduct = std::make_unique<GenWeightProduct>();
         weightProduct->setNumWeightSets(weightGroups_.size());
         int weightGroupIndex = 0;
         int weightNum = 0;

GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc

@@ -49,16 +49,16 @@ Description: [one line class summary]
 
 #include "SimDataFormats/GeneratorProducts/interface/LesHouches.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHEXMLStringProduct.h"
 
 #include "GeneratorInterface/LHEInterface/interface/LHERunInfo.h"
 #include "GeneratorInterface/LHEInterface/interface/LHEEvent.h"
 #include "GeneratorInterface/LHEInterface/interface/LHEReader.h"
 #include "GeneratorInterface/LHEInterface/interface/TestWeightInfo.h"
-//#include "GeneratorInterface/Core/interface/LHEWeightGroupReaderHelper.h"
+//#include "GeneratorInterface/Core/interface/GenWeightGroupReaderHelper.h"
 #include "GeneratorInterface/Core/interface/LHEWeightHelper.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -163,10 +163,10 @@ ExternalLHEProducer::ExternalLHEProducer(const edm::ParameterSet& iConfig) :
   produces<LHEXMLStringProduct, edm::Transition::BeginRun>("LHEScriptOutput"); 
 
   produces<LHEEventProduct>();
-  produces<LHEWeightProduct>();
+  produces<GenWeightProduct>();
   produces<LHERunInfoProduct, edm::Transition::BeginRun>();
   produces<LHERunInfoProduct, edm::Transition::EndRun>();
-  produces<LHEWeightInfoProduct, edm::Transition::EndRun>();
+  produces<GenWeightInfoProduct, edm::Transition::EndRun>();
 }
 
 
@@ -386,7 +386,7 @@ ExternalLHEProducer::endRunProduce(edm::Run& run, edm::EventSetup const& es)
 
   reader_.reset();  
 
-  auto weightInfoProduct = std::make_unique<LHEWeightInfoProduct>();
+  auto weightInfoProduct = std::make_unique<GenWeightInfoProduct>();
   for (auto& weightGroup : weightHelper_.weightGroups()) {
       weightInfoProduct->addWeightGroupInfo(weightGroup.clone());
   }

GeneratorInterface/LHEInterface/plugins/LHESource.cc

@@ -23,7 +23,7 @@
 #include "SimDataFormats/GeneratorProducts/interface/LesHouches.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h"
 
 #include "GeneratorInterface/LHEInterface/interface/LHERunInfo.h"
 #include "GeneratorInterface/LHEInterface/interface/LHEEvent.h"
@@ -37,7 +37,7 @@ LHESource::LHESource(const edm::ParameterSet &params,
                      const edm::InputSourceDescription &desc) :
   ProducerSourceFromFiles(params, desc, false),
   reader_(new LHEReader(fileNames(), params.getUntrackedParameter<unsigned int>("skipEvents", 0))),
-  lheProvenanceHelper_(edm::TypeID(typeid(LHEEventProduct)), edm::TypeID(typeid(LHERunInfoProduct)), edm::TypeID(typeid(LHEWeightInfoProduct)), productRegistryUpdate()),
+  lheProvenanceHelper_(edm::TypeID(typeid(LHEEventProduct)), edm::TypeID(typeid(LHERunInfoProduct)), edm::TypeID(typeid(GenWeightInfoProduct)), productRegistryUpdate()),
   phid_()
 {
   nextEvent();
@@ -136,7 +136,7 @@ void LHESource::putRunInfoProduct(edm::RunPrincipal& iRunPrincipal) {
 
 void LHESource::putWeightInfoProduct(edm::RunPrincipal& iRunPrincipal) {
   if (runInfoProductLast_) {
-    auto product = std::make_unique<LHEWeightInfoProduct>();
+    auto product = std::make_unique<GenWeightInfoProduct>();
     gen::WeightGroupInfo scaleInfo(
         "<weightgroup name=\"Central scale variation\" combine=\"envelope\">"
     );
@@ -149,7 +149,7 @@ void LHESource::putWeightInfoProduct(edm::RunPrincipal& iRunPrincipal) {
 
     product->addWeightGroupInfo(&scaleInfo);
     product->addWeightGroupInfo(&cenPdfInfo);
-    std::unique_ptr<edm::WrapperBase> rdp(new edm::Wrapper<LHEWeightInfoProduct>(std::move(product)));
+    std::unique_ptr<edm::WrapperBase> rdp(new edm::Wrapper<GenWeightInfoProduct>(std::move(product)));
     iRunPrincipal.put(lheProvenanceHelper_.weightProductBranchDescription_, std::move(rdp));
   }
 }

GeneratorInterface/LHEInterface/plugins/LHEWeightsTest.cc

@@ -43,8 +43,8 @@
 #include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightProduct.h"
 
 #include "SimDataFormats/GeneratorProducts/interface/WeightGroupInfo.h"
 #include "SimDataFormats/GeneratorProducts/interface/ScaleWeightGroupInfo.h"
@@ -94,8 +94,8 @@ class LHEWeightsTest : public edm::one::EDAnalyzer<edm::one::WatchRuns>  {
       edm::EDGetTokenT<reco::GenJetCollection> genJetToken_;
       edm::EDGetTokenT<LHEEventProduct> LHEToken_;
       edm::EDGetTokenT<GenEventInfoProduct> GenToken_;
-      edm::EDGetTokenT<LHEWeightProduct> lheWeightToken_;
-      edm::EDGetTokenT<LHEWeightInfoProduct> lheWeightInfoToken_;
+      edm::EDGetTokenT<GenWeightProduct> lheWeightToken_;
+      edm::EDGetTokenT<GenWeightInfoProduct> lheWeightInfoToken_;
       edm::Service<TFileService> fileservice;
 
       std::map<TString, TH2D*> histograms2d;
@@ -128,8 +128,8 @@ LHEWeightsTest::LHEWeightsTest(const edm::ParameterSet& iConfig) :
   genJetToken_(consumes<reco::GenJetCollection>(iConfig.getParameter<edm::InputTag>("genJetSrc"))),
   LHEToken_(consumes<LHEEventProduct>(iConfig.getParameter<edm::InputTag>("LHESrc"))),
   GenToken_(consumes<GenEventInfoProduct>(iConfig.getParameter<edm::InputTag>("GenSrc"))),
-  lheWeightToken_(consumes<LHEWeightProduct>(edm::InputTag("testWeights"))),
-  lheWeightInfoToken_(consumes<LHEWeightInfoProduct, edm::InRun>(edm::InputTag("testWeights")))
+  lheWeightToken_(consumes<GenWeightProduct>(edm::InputTag("testWeights"))),
+  lheWeightInfoToken_(consumes<GenWeightInfoProduct, edm::InRun>(edm::InputTag("testWeights")))
 
 {
    //now do what ever initialization is needed
@@ -353,9 +353,9 @@ void LHEWeightsTest::setup_variables(const edm::Event& iEvent) {
 
 }
 std::vector<double> LHEWeightsTest::setup_weights(const edm::Event& iEvent) {
-   edm::Handle<LHEWeightProduct> lheWeightHandle;
+   edm::Handle<GenWeightProduct> lheWeightHandle;
    iEvent.getByToken(lheWeightToken_, lheWeightHandle);
-   const LHEWeightProduct * lheWeights = lheWeightHandle.product();
+   const GenWeightProduct * lheWeights = lheWeightHandle.product();
    WeightsContainer weights = lheWeights->weights();
    auto scaleWeights = weights.at(scaleWeightsIndex_);
    std::vector<double> keepWeights;
@@ -414,12 +414,12 @@ LHEWeightsTest::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
 
 void 
 LHEWeightsTest::beginRun(edm::Run const& run, edm::EventSetup const& es) {
-    //edm::Handle<LHEWeightInfoProduct> lheWeightsInfoHandle;
+    //edm::Handle<GenWeightInfoProduct> lheWeightsInfoHandle;
     // get by token gives an error (the same one that's been in the ExternalLHEProducer for ages)
     //run.getByLabel("testWeights", lheWeightsInfoHandle);
     //edm::Handle<GenRunInfoProduct> lheWeightsInfoHandle;
     //run.getByLabel("generator", lheWeightsInfoHandle);
-    edm::Handle<LHEWeightInfoProduct> lheWeightInfoHandle;
+    edm::Handle<GenWeightInfoProduct> lheWeightInfoHandle;
     run.getByToken(lheWeightInfoToken_, lheWeightInfoHandle);
 
     // Should add a search by name function

GeneratorInterface/LHEInterface/test/testWeights.py

@@ -1,20 +1,20 @@
 from DataFormats.FWLite import Events,Handle,Runs
 import ROOT
-#source = "externalLHEProducer"
-source = "testWeights"
+source = "externalLHEProducer"
+#source = "testWeights"
 
 #for filename in ["HIG-RunIIFall18wmLHEGS-00509.root"," HIG-RunIIFall18wmLHEGS-00509_ordered.root","HIG-RunIIFall18wmLHEGS-00509_unordered.root"]:
-#for filename in ["HIG-RunIIFall18wmLHEGS-00509.root"]:
-for filename in ["test.root"]:
+for filename in ["HIG-RunIIFall18wmLHEGS-00509.root"]:
+#for filename in ["test.root"]:
     runs = Runs(filename)
     run = runs.__iter__().next()
-    weightInfoHandle = Handle("LHEWeightInfoProduct")
+    weightInfoHandle = Handle("GenWeightInfoProduct")
     run.getByLabel(source, weightInfoHandle)
     weightInfoProd = weightInfoHandle.product()
 
     events = Events(filename)
     event = events.__iter__().next()
-    weightHandle = Handle("LHEWeightProduct")
+    weightHandle = Handle("GenWeightProduct")
     event.getByLabel(source, weightHandle)
     weightInfo = weightHandle.product()
     print "Content of the weights"

SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h → SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h

@@ -1,5 +1,5 @@
-#ifndef SimDataFormats_GeneratorProducts_LHEWeightInfoProduct_h
-#define SimDataFormats_GeneratorProducts_LHEWeightInfoProduct_h
+#ifndef SimDataFormats_GeneratorProducts_GenWeightInfoProduct_h
+#define SimDataFormats_GeneratorProducts_GenWeightInfoProduct_h
 
 #include <iterator>
 #include <memory>
@@ -12,15 +12,15 @@
 #include "SimDataFormats/GeneratorProducts/interface/LesHouches.h"
 #include "SimDataFormats/GeneratorProducts/interface/WeightGroupInfo.h"
 
-class LHEWeightInfoProduct {
+class GenWeightInfoProduct {
     public:
-        LHEWeightInfoProduct() {}
-        LHEWeightInfoProduct(edm::OwnVector<gen::WeightGroupInfo>& weightGroups);
-	    LHEWeightInfoProduct(const LHEWeightInfoProduct& other); 
-	    LHEWeightInfoProduct(LHEWeightInfoProduct&& other);
-        ~LHEWeightInfoProduct() {}
-        LHEWeightInfoProduct& operator=(const LHEWeightInfoProduct &other); 
-        LHEWeightInfoProduct& operator=(LHEWeightInfoProduct &&other); 
+        GenWeightInfoProduct() {}
+        GenWeightInfoProduct(edm::OwnVector<gen::WeightGroupInfo>& weightGroups);
+	    GenWeightInfoProduct(const GenWeightInfoProduct& other); 
+	    GenWeightInfoProduct(GenWeightInfoProduct&& other);
+        ~GenWeightInfoProduct() {}
+        GenWeightInfoProduct& operator=(const GenWeightInfoProduct &other); 
+        GenWeightInfoProduct& operator=(GenWeightInfoProduct &&other); 
 
         const edm::OwnVector<gen::WeightGroupInfo>& allWeightGroupsInfo() const;
         const gen::WeightGroupInfo* containingWeightGroupInfo(int index) const;
@@ -36,5 +36,5 @@ class LHEWeightInfoProduct {
 
 };
 
-#endif // GeneratorWeightInfo_LHEInterface_LHEWeightInfoProduct_h
+#endif // GeneratorWeightInfo_LHEInterface_GenWeightInfoProduct_h
 

SimDataFormats/GeneratorProducts/interface/LHEWeightProduct.h → SimDataFormats/GeneratorProducts/interface/GenWeightProduct.h

@@ -1,5 +1,5 @@
-#ifndef SimDataFormats_GeneratorProducts_LHEWeightProduct_h
-#define SimDataFormats_GeneratorProducts_LHEWeightProduct_h
+#ifndef SimDataFormats_GeneratorProducts_GenWeightProduct_h
+#define SimDataFormats_GeneratorProducts_GenWeightProduct_h
 
 #include <memory>
 #include <vector>
@@ -11,14 +11,14 @@
 
 typedef std::vector<std::vector<double>> WeightsContainer;
 
-class LHEWeightProduct {
+class GenWeightProduct {
     public:
-        LHEWeightProduct() { weightsVector_ = {}; }
-        LHEWeightProduct& operator=(LHEWeightProduct&& other) {
+        GenWeightProduct() { weightsVector_ = {}; }
+        GenWeightProduct& operator=(GenWeightProduct&& other) {
         weightsVector_ = std::move(other.weightsVector_);
         return *this;
         }
-        ~LHEWeightProduct() {}
+        ~GenWeightProduct() {}
 
         void setNumWeightSets(int num) { weightsVector_.resize(num); }
         void addWeightSet() { weightsVector_.push_back({}); }
@@ -39,5 +39,5 @@ class LHEWeightProduct {
         WeightsContainer weightsVector_;
 };
 
-#endif // GeneratorEvent_LHEInterface_LHEWeightProduct_h
+#endif // GeneratorEvent_LHEInterface_GenWeightProduct_h
 

SimDataFormats/GeneratorProducts/src/LHEWeightInfoProduct.cc → SimDataFormats/GeneratorProducts/src/GenWeightInfoProduct.cc

@@ -1,41 +1,41 @@
 #include <vector>
 #include <string>
 
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h"
 
-LHEWeightInfoProduct::LHEWeightInfoProduct(edm::OwnVector<gen::WeightGroupInfo>& weightGroups) {
+GenWeightInfoProduct::GenWeightInfoProduct(edm::OwnVector<gen::WeightGroupInfo>& weightGroups) {
     weightGroupsInfo_ = weightGroups;
 }
 
-LHEWeightInfoProduct& LHEWeightInfoProduct::operator=(const LHEWeightInfoProduct &other) {
+GenWeightInfoProduct& GenWeightInfoProduct::operator=(const GenWeightInfoProduct &other) {
     weightGroupsInfo_ = other.weightGroupsInfo_; 
     return * this; 
 }
 
-LHEWeightInfoProduct& LHEWeightInfoProduct::operator=(LHEWeightInfoProduct &&other) {
+GenWeightInfoProduct& GenWeightInfoProduct::operator=(GenWeightInfoProduct &&other) {
     weightGroupsInfo_ = std::move(other.weightGroupsInfo_); 
     return *this;
 }
 
-const edm::OwnVector<gen::WeightGroupInfo>& LHEWeightInfoProduct::allWeightGroupsInfo() const { 
+const edm::OwnVector<gen::WeightGroupInfo>& GenWeightInfoProduct::allWeightGroupsInfo() const { 
     return weightGroupsInfo_; 
 }
 
-const gen::WeightGroupInfo* LHEWeightInfoProduct::containingWeightGroupInfo(int index) const {
+const gen::WeightGroupInfo* GenWeightInfoProduct::containingWeightGroupInfo(int index) const {
     for (const auto& weightGroup : weightGroupsInfo_) {
         if (weightGroup.indexInRange(index))
             return &weightGroup;
     }
     throw std::domain_error("Failed to find containing weight group");
 }
 
-const gen::WeightGroupInfo* LHEWeightInfoProduct::orderedWeightGroupInfo(int weightGroupIndex) const {
+const gen::WeightGroupInfo* GenWeightInfoProduct::orderedWeightGroupInfo(int weightGroupIndex) const {
     if (weightGroupIndex >= static_cast<int>(weightGroupsInfo_.size()))
         throw std::range_error("Weight index out of range!");
     return &weightGroupsInfo_[weightGroupIndex];
 }
 
-std::vector<gen::WeightGroupInfo*> LHEWeightInfoProduct::weightGroupsByType(gen::WeightType type) const {
+std::vector<gen::WeightGroupInfo*> GenWeightInfoProduct::weightGroupsByType(gen::WeightType type) const {
     std::vector<gen::WeightGroupInfo*> matchingGroups;
     for (size_t i = 0; i < weightGroupsInfo_.size(); i++) {
         if (weightGroupsInfo_[i].weightType() == type)
@@ -44,7 +44,7 @@ std::vector<gen::WeightGroupInfo*> LHEWeightInfoProduct::weightGroupsByType(gen:
     return matchingGroups;
 }
 
-std::vector<int> LHEWeightInfoProduct::weightGroupIndicesByType(gen::WeightType type) const {
+std::vector<int> GenWeightInfoProduct::weightGroupIndicesByType(gen::WeightType type) const {
     std::vector<int> matchingGroupIndices;
     for (size_t i = 0; i < weightGroupsInfo_.size(); i++) {
         if (weightGroupsInfo_[i].weightType() == type)
@@ -53,6 +53,6 @@ std::vector<int> LHEWeightInfoProduct::weightGroupIndicesByType(gen::WeightType
     return matchingGroupIndices;
 }
 
-void LHEWeightInfoProduct::addWeightGroupInfo(gen::WeightGroupInfo* info) {  
+void GenWeightInfoProduct::addWeightGroupInfo(gen::WeightGroupInfo* info) {  
     weightGroupsInfo_.push_back(info); 
 }

SimDataFormats/GeneratorProducts/src/classes.h

@@ -12,8 +12,8 @@
 #include "SimDataFormats/GeneratorProducts/interface/ScaleWeightGroupInfo.h"
 #include "SimDataFormats/GeneratorProducts/interface/UnknownWeightGroupInfo.h"
 #include "SimDataFormats/GeneratorProducts/interface/PdfWeightGroupInfo.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightInfoProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/LHEWeightProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenWeightProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHEXMLStringProduct.h"
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"

SimDataFormats/GeneratorProducts/src/classes_def.xml

@@ -197,8 +197,8 @@
 	<class name="LHERunInfoProduct::Header" ClassVersion="10">
   <version ClassVersion="10" checksum="1310911082"/>
  </class>
- <class name="LHEWeightInfoProduct"/>
- <class name="LHEWeightProduct"/>
+ <class name="GenWeightInfoProduct"/>
+ <class name="GenWeightProduct"/>
  <class name="LHEXMLStringProduct" ClassVersion="11">
   <version ClassVersion="10" checksum="4158740350"/>
   <version ClassVersion="11" checksum="3778311764"/>
@@ -238,8 +238,8 @@
  <class name="edm::ClonePolicy<gen::WeightGroupInfo>"/>
  <class name="edm::OwnVector<gen::WeightGroupInfo, edm::ClonePolicy<gen::WeightGroupInfo> >"/>
 	<class name="edm::Wrapper&lt;LHERunInfoProduct&gt;"/>
-	<class name="edm::Wrapper&lt;LHEWeightInfoProduct&gt;"/>
-	<class name="edm::Wrapper&lt;LHEWeightProduct&gt;"/>
+	<class name="edm::Wrapper&lt;GenWeightInfoProduct&gt;"/>
+	<class name="edm::Wrapper&lt;GenWeightProduct&gt;"/>
 	<class name="edm::Wrapper&lt;LHEEventProduct&gt;"/>
 <exclusion>
   <class name="edm::OwnVector<gen::WeightGroupInfo, edm::ClonePolicy<gen::WeightGroupInfo> >">