From 6aaef397110c974d83ba52e75c65e5819dd9fc1d Mon Sep 17 00:00:00 2001
From: Kenneth Long <kdlong@hep.wisc.edu>
Date: Fri, 17 Jan 2020 11:31:23 +0100
Subject: [PATCH] Make pdfIds untracked

---
 PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc | 5 ++---
 PhysicsTools/NanoAOD/python/nanogen_cff.py              | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc b/PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc
index cc4dc25809135..ed26af86897bc 100644
--- a/PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc
+++ b/PhysicsTools/NanoAOD/plugins/LHEWeightsTableProducer.cc
@@ -35,7 +35,7 @@ class LHEWeightsTableProducer : public edm::global::EDProducer<edm::LuminosityBl
         weightgroups_(edm::vector_transform(params.getParameter<std::vector<std::string>>("weightgroups"),
                     [](auto& c) { return gen::WeightType(c.at(0)); } )),
         maxGroupsPerType_(params.getParameter<std::vector<int>>("maxGroupsPerType")),
-        pdfIds_(params.getParameter<std::vector<int>>("pdfIds")),
+        pdfIds_(params.getUntrackedParameter<std::vector<int>>("pdfIds", {})),
         lheWeightPrecision_(params.getParameter<int32_t>("lheWeightPrecision")) {
     if (weightgroups_.size() != maxGroupsPerType_.size())
        throw std::invalid_argument("Inputs 'weightgroups' and 'weightgroupNums' must have equal size");
@@ -177,7 +177,7 @@ class LHEWeightsTableProducer : public edm::global::EDProducer<edm::LuminosityBl
     desc.add<edm::InputTag>("genWeights");
     desc.add<std::vector<std::string>>("weightgroups");
     desc.add<std::vector<int>>("maxGroupsPerType");
-    desc.add<std::vector<int>>("pdfIds");
+    desc.addOptionalUntracked<std::vector<int>>("pdfIds");
     desc.add<int32_t>("lheWeightPrecision", -1)->setComment("Number of bits in the mantissa for LHE weights");
     descriptions.addDefault(desc);
   }
@@ -203,6 +203,5 @@ class LHEWeightsTableProducer : public edm::global::EDProducer<edm::LuminosityBl
   int lheWeightPrecision_;
   enum {inLHE, inGen};
 };
-
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(LHEWeightsTableProducer);
diff --git a/PhysicsTools/NanoAOD/python/nanogen_cff.py b/PhysicsTools/NanoAOD/python/nanogen_cff.py
index aed174dbf7a2b..b79d0d61c0b39 100644
--- a/PhysicsTools/NanoAOD/python/nanogen_cff.py
+++ b/PhysicsTools/NanoAOD/python/nanogen_cff.py
@@ -17,9 +17,10 @@
     # 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', 'parton shower']),
+    # Max number of groups to store for each type above, -1 ==> store all found
     maxGroupsPerType = cms.vint32([1, -1, 1, 2, 1]),
-    # If empty or not specified, all pdf weights are stored
-    pdfIds = cms.vint32([91400, 306000, 260000]),
+    # If empty or not specified, no critieria is applied to filter on LHAPDF IDs 
+    pdfIds = cms.untracked.vint32([91400, 306000, 260000]),
     lheWeightPrecision = cms.int32(14),
 )