Removed deprecated messageIDs parameter

messageIDs was just an old synonym for categories.

Author: Dr15Jones

FWCore/MessageService/src/MessageLoggerScribe.cc

@@ -253,15 +253,6 @@ namespace edm {
       // grab list of categories
       vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
 
-      // grab list of messageIDs -- these are a synonym for categories
-      // Note -- the use of messageIDs is deprecated in favor of categories
-      {
-        vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
-
-        // combine the lists, not caring about possible duplicates (for now)
-        copy_all(messageIDs, std::back_inserter(categories));
-      }  // no longer need messageIDs
-
       // grab list of hardwired categories (hardcats) -- these are to be added
       // to the list of categories
       {

FWCore/MessageService/src/MessageServicePSetValidation.cc

@@ -110,13 +110,6 @@ namespace edm {
       noDuplicates(categories, destinations, "MessageLogger", "categories", "destinations");
       noDuplicates(categories, statistics, "MessageLogger", "categories", "statistics");
 
-      messageIDs = check<vString>(pset, "MessageLogger", "messageIDs");
-      noDuplicates(messageIDs, "MessageLogger", "messageIDs");
-      noKeywords(messageIDs, "MessageLogger", "messageIDs");
-      noNonPSetUsage(pset, messageIDs, "MessageLogger", "messageIDs");
-      noDuplicates(messageIDs, destinations, "MessageLogger", "messageIDs", "destinations");
-      noDuplicates(messageIDs, statistics, "MessageLogger", "messageIDs", "statistics");
-
     }  // psetLists
 
     void edm::service::MessageServicePSetValidation::suppressionLists(ParameterSet const& pset) {
@@ -200,8 +193,6 @@ namespace edm {
         return true;
       if (s == "categories")
         return true;
-      if (s == "messageIDs")
-        return true;
       if (s == "debugModules")
         return true;
       if (s == "suppressInfo")
@@ -306,8 +297,6 @@ namespace edm {
         return false;
       if (word == "categories")
         return false;
-      if (word == "messageIDs")
-        return false;
       if (word == "destinations")
         return false;
       if (word == "statistics")
@@ -415,8 +404,6 @@ namespace edm {
           continue;
         if (lookForMatch(categories, *i))
           continue;
-        if (lookForMatch(messageIDs, *i))
-          continue;
         if ((*i) == "default")
           continue;
         ParameterSet empty_PSet;
@@ -621,8 +608,6 @@ namespace edm {
       for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
         if (lookForMatch(categories, *i))
           continue;
-        if (lookForMatch(messageIDs, *i))
-          continue;
         if ((*i) == "default")
           continue;
         if ((*i) == "ERROR")

FWCore/MessageService/src/MessageServicePSetValidation.h

@@ -256,7 +256,6 @@ namespace edm {
       std::vector<std::string> destinations;
       std::vector<std::string> statistics;
       std::vector<std::string> categories;
-      std::vector<std::string> messageIDs;
       std::vector<std::string> debugModules;
       std::vector<std::string> suppressInfo;
       std::vector<std::string> suppressFwkInfo;

FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc

@@ -234,15 +234,6 @@ namespace edm {
       // grab list of categories
       vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
 
-      // grab list of messageIDs -- these are a synonym for categories
-      // Note -- the use of messageIDs is deprecated in favor of categories
-      {
-        vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
-
-        // combine the lists, not caring about possible duplicates (for now)
-        copy_all(messageIDs, std::back_inserter(categories));
-      }  // no longer need messageIDs
-
       // grab list of hardwired categories (hardcats) -- these are to be added
       // to the list of categories -- change log 24
       {

FWCore/MessageService/test/messageLogger_cfg.py

@@ -10,8 +10,6 @@
 process.load("FWCore.MessageService.test.Services_cff")
 
 process.MessageLogger = cms.Service("MessageLogger",
-    messageIDs = cms.untracked.vstring('unimportant', 
-        'trkwarning'),
     default = cms.untracked.PSet(
         limit = cms.untracked.int32(100),
         timespan = cms.untracked.int32(60)
@@ -37,7 +35,8 @@
         threshold = cms.untracked.string('ERROR')
     ),
     debugModules = cms.untracked.vstring('sendSomeMessages'),
-    categories = cms.untracked.vstring('postBeginJob'),
+    categories = cms.untracked.vstring('postBeginJob', 'unimportant',
+        'trkwarning'),
     destinations = cms.untracked.vstring('detailedInfo', 
         'critical')
 )