Merge pull request #31429 from Dr15Jones/fixHeadersParameterSet

Update FWCore/ParameterSet headers
cms-sw · Sep 11, 2020 · d107405 · d107405
2 parents 49597b4 + c13ed23
commit d107405
Show file tree

Hide file tree

Showing 18 changed files with 141 additions and 112 deletions.
diff --git a/FWCore/Integration/test/ProducerWithPSetDesc.cc b/FWCore/Integration/test/ProducerWithPSetDesc.cc
@@ -4,7 +4,6 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "FWCore/ParameterSet/interface/getFixedSizeArray.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterDescriptionBase.h"
 #include "FWCore/ParameterSet/interface/ParameterDescription.h"
@@ -80,10 +79,10 @@ namespace edmtest {
     vint = ps.getParameter<std::vector<int>>("vint3");
     assert(vint[0] == 2147483647);
     assert(vint[1] == -2147483647);
-    std::array<int, 2> testArray = edm::getFixedSizeArray<int, 2>(ps, std::string("vint3"));
+    std::array<int, 2> testArray = ps.getParameter<std::array<int, 2>>(std::string("vint3"));
     assert(testArray[0] == 2147483647);
     assert(testArray[1] == -2147483647);
-    std::array<int, 2> testArray1 = edm::getFixedSizeArray<int, 2>(ps, "vint3");
+    std::array<int, 2> testArray1 = ps.getParameter<std::array<int, 2>>("vint3");
     assert(testArray1[0] == 2147483647);
     assert(testArray1[1] == -2147483647);
     vint = ps.getParameter<std::vector<int>>("vint4");

diff --git a/FWCore/ParameterSet/interface/ParameterSet.h b/FWCore/ParameterSet/interface/ParameterSet.h
diff --git a/FWCore/ParameterSet/interface/getFixedSizeArray.h b/FWCore/ParameterSet/interface/getFixedSizeArray.h
diff --git a/FWCore/ParameterSet/src/ANDGroupDescription.cc b/FWCore/ParameterSet/src/ANDGroupDescription.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/ANDGroupDescription.h"
+#include "FWCore/ParameterSet/src/ANDGroupDescription.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 

diff --git a/...ameterSet/interface/ANDGroupDescription.h → ...re/ParameterSet/src/ANDGroupDescription.h b/...ameterSet/interface/ANDGroupDescription.h → ...re/ParameterSet/src/ANDGroupDescription.h
diff --git a/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc b/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/FillDescriptionFromPSet.h"
+#include "FWCore/ParameterSet/src/FillDescriptionFromPSet.h"
 #include "FWCore/ParameterSet/interface/ParameterDescriptionNode.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/...erSet/interface/FillDescriptionFromPSet.h → ...arameterSet/src/FillDescriptionFromPSet.h b/...erSet/interface/FillDescriptionFromPSet.h → ...arameterSet/src/FillDescriptionFromPSet.h
diff --git a/FWCore/ParameterSet/src/ORGroupDescription.cc b/FWCore/ParameterSet/src/ORGroupDescription.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/ORGroupDescription.h"
+#include "FWCore/ParameterSet/src/ORGroupDescription.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 

diff --git a/...rameterSet/interface/ORGroupDescription.h → FWCore/ParameterSet/src/ORGroupDescription.h b/...rameterSet/interface/ORGroupDescription.h → FWCore/ParameterSet/src/ORGroupDescription.h
diff --git a/FWCore/ParameterSet/src/ParameterDescription.cc b/FWCore/ParameterSet/src/ParameterDescription.cc
@@ -7,7 +7,7 @@
 #include "DataFormats/Provenance/interface/LuminosityBlockRange.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
-#include "FWCore/ParameterSet/interface/FillDescriptionFromPSet.h"
+#include "FWCore/ParameterSet/src/FillDescriptionFromPSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ParameterSet/interface/VParameterSetEntry.h"
 #include "FWCore/Utilities/interface/Algorithms.h"

diff --git a/FWCore/ParameterSet/src/ParameterDescriptionNode.cc b/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
@@ -1,9 +1,9 @@
 
 #include "FWCore/ParameterSet/interface/ParameterDescriptionNode.h"
 #include "FWCore/ParameterSet/interface/ParameterDescriptionCases.h"
-#include "FWCore/ParameterSet/interface/ANDGroupDescription.h"
-#include "FWCore/ParameterSet/interface/ORGroupDescription.h"
-#include "FWCore/ParameterSet/interface/XORGroupDescription.h"
+#include "FWCore/ParameterSet/src/ANDGroupDescription.h"
+#include "FWCore/ParameterSet/src/ORGroupDescription.h"
+#include "FWCore/ParameterSet/src/XORGroupDescription.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 
 #include <vector>

diff --git a/FWCore/ParameterSet/src/ParameterSet.cc b/FWCore/ParameterSet/src/ParameterSet.cc
@@ -11,7 +11,7 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/Registry.h"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Digest.h"
 #include "FWCore/Utilities/interface/EDMException.h"
@@ -29,6 +29,13 @@
 
 namespace edm {
 
+  namespace pset::exceptions {
+    void throwWrongNumberOfElements(std::string const& iName, size_t iExpected, size_t iGot) {
+      throw Exception(errors::Configuration) << "The parameter '" << iName << "' should have " << iExpected
+                                             << " elements, but has " << iGot << " elements in the configuration.\n";
+    }
+  }  // namespace pset::exceptions
+
   void ParameterSet::invalidateRegistration(std::string const& nameOfTracked) {
     // We have added a new parameter.  Invalidate the ID.
     if (isRegistered()) {

diff --git a/FWCore/ParameterSet/src/ParameterSetConverter.cc b/FWCore/ParameterSet/src/ParameterSetConverter.cc
@@ -10,7 +10,7 @@ ParameterSetConverter.cc
 #include "FWCore/ParameterSet/interface/ParameterSetConverter.h"
 #include <iterator>
 #include "FWCore/ParameterSet/interface/Registry.h"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 
 namespace edm {

diff --git a/FWCore/ParameterSet/src/VParameterSetEntry.cc b/FWCore/ParameterSet/src/VParameterSetEntry.cc
@@ -1,6 +1,6 @@
 #include "FWCore/ParameterSet/interface/VParameterSetEntry.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Digest.h"
 
 #include <cassert>

diff --git a/FWCore/ParameterSet/src/XORGroupDescription.cc b/FWCore/ParameterSet/src/XORGroupDescription.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/XORGroupDescription.h"
+#include "FWCore/ParameterSet/src/XORGroupDescription.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 

diff --git a/...ameterSet/interface/XORGroupDescription.h → ...re/ParameterSet/src/XORGroupDescription.h b/...ameterSet/interface/XORGroupDescription.h → ...re/ParameterSet/src/XORGroupDescription.h
diff --git a/FWCore/ParameterSet/interface/split.h → FWCore/ParameterSet/src/split.h b/FWCore/ParameterSet/interface/split.h → FWCore/ParameterSet/src/split.h
diff --git a/FWCore/ParameterSet/src/types.cc b/FWCore/ParameterSet/src/types.cc
@@ -9,7 +9,7 @@
 #include "FWCore/ParameterSet/interface/types.h"
 
 #include "boost/lexical_cast.hpp"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Parse.h"
 #include <cctype>
 #include <cstdlib>