Merge pull request cms-sw#280 from wmtan/calculateIDofEmptyParameterSet

Add function to calculate ID of empty parameter set without registering ...
ggovi · Aug 11, 2013 · 3ad8dae · 3ad8dae
2 parents 631bb66 + 5b77329
commit 3ad8dae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/FWCore/ParameterSet/interface/ParameterSet.h b/FWCore/ParameterSet/interface/ParameterSet.h
@@ -274,6 +274,11 @@ namespace edm {
     void
     registerFromString(std::string const& rep);
 
+    // return ID of empty parameter set without registering it.
+    static
+    ParameterSetID
+    emptyParameterSetID();
+
   private:
     // construct from coded string and id.
     ParameterSet(std::string const& rep, ParameterSetID const& id);

diff --git a/FWCore/ParameterSet/src/ParameterSet.cc b/FWCore/ParameterSet/src/ParameterSet.cc
@@ -100,6 +100,13 @@ namespace edm {
     pset::Registry::instance()->insertMapped(ps);
   }
 
+  ParameterSetID
+  ParameterSet::emptyParameterSetID() {  // const
+    cms::Digest newDigest;
+    ParameterSet().toDigest(newDigest);
+    return ParameterSetID(newDigest.digest().toString());
+  }
+
   ParameterSet::ParameterSet(ParameterSet const& other)
   : tbl_(other.tbl_),
     psetTable_(other.psetTable_),

diff --git a/IOPool/SecondaryInput/test/SecondaryProducer.cc b/IOPool/SecondaryInput/test/SecondaryProducer.cc
@@ -51,9 +51,7 @@ namespace edm {
         firstEvent_(true),
         firstLoop_(true),
         expectedEventNumber_(1) {
-    ParameterSet emptyPSet;
-    emptyPSet.registerIt();
-    processConfiguration_->setParameterSetID(emptyPSet.id());
+    processConfiguration_->setParameterSetID(ParameterSet::emptyParameterSetID());
     processConfiguration_->setProcessConfigurationID();
 
     productRegistry_->setFrozen();