Correct name of shower weights so they're stored

cms-sw · Jan 11, 2020 · 3dbdd4c · 3dbdd4c
1 parent 8fcc230
commit 3dbdd4c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/GeneratorInterface/Core/plugins/GenWeightProductProducer.cc b/GeneratorInterface/Core/plugins/GenWeightProductProducer.cc
@@ -78,6 +78,7 @@ GenWeightProductProducer::beginLuminosityBlockProduce(edm::LuminosityBlock& iLum
         iLumi.getByToken(genLumiInfoToken_, genLumiInfoHandle);
 
         weightNames_ = genLumiInfoHandle->weightNames();
+
 	    weightHelper_.parseWeightGroupsFromNames(weightNames_);
     }
     auto weightInfoProduct = std::make_unique<GenWeightInfoProduct>();

diff --git a/PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc b/PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc
@@ -71,7 +71,6 @@ class LHEWeightsTableProducer : public edm::global::EDProducer<edm::LuminosityBl
     size_t typeCount = 0;
     gen::WeightType previousType = gen::WeightType::kUnknownWeights;
 
-    size_t index = 0;
     for (const auto& groupInfo : weightInfos) {
         std::string entryName = typeName;
         gen::WeightType weightType = groupInfo.group->weightType();
@@ -141,7 +140,7 @@ class LHEWeightsTableProducer : public edm::global::EDProducer<edm::LuminosityBl
 
       group = weightsHandle->weightGroupsAndIndicesByType(weightType);
 
-      if (maxStore < 0 || static_cast<int>(group.size()) < maxStore) {
+      if (maxStore < 0 || static_cast<int>(group.size()) <= maxStore) {
           // Modify size in case one type of weight is present in multiple products
           maxStore -= group.size();
           return group;

diff --git a/PhysicsTools/NanoAOD/python/nanogen_cff.py b/PhysicsTools/NanoAOD/python/nanogen_cff.py
@@ -16,7 +16,7 @@
     # Warning: you can use a full string, but only the first character is read.
     # Note also that the capitalization is important! For example, 'parton shower' 
     # must be lower case and 'PDF' must be capital
-    weightgroups = cms.vstring(['scale', 'PDF', 'matrix element', 'unknown', 'shower']),
+    weightgroups = cms.vstring(['scale', 'PDF', 'matrix element', 'unknown', 'parton shower']),
     maxGroupsPerType = cms.vint32([1, -1, 1, 2, 1]),
     pdfIds = cms.vint32([91400, 306000, 260000]),
     lheWeightPrecision = cms.int32(14),