Removed ParameterSet dependency from CSCReadoutMapping classes

This allowed removal of FWCore/ParameterSet dependency from
CondFormats/CSCObjects and some tests.

Author: Dr15Jones

CondFormats/CSCObjects/BuildFile.xml

@@ -1,6 +1,5 @@
 <use name="DataFormats/MuonDetId"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
 <use name="CondFormats/Serialization"/>
 <use name="boost_serialization"/>
 <export>

CondFormats/CSCObjects/interface/CSCReadoutMapping.h

@@ -15,14 +15,10 @@
 
 #include "CondFormats/Serialization/interface/Serializable.h"
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include <vector>
 #include <map>
 
-namespace edm {
-  class ParameterSet;
-}
-
 class CSCReadoutMapping {
 public:
   /// Default constructor
@@ -90,11 +86,6 @@ class CSCReadoutMapping {
     */
   int chamber(int endcap, int station, int vmecrate, int dmb, int tmb) const;
 
-  /** 
-    * Fill mapping store
-    */
-  virtual void fill(const edm::ParameterSet&) = 0;
-
   ///returns hardware ids given chamber id
   CSCLabel findHardwareId(const CSCDetId&) const;
   ///returns vmecrate given CSCDetId

CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h

@@ -8,21 +8,20 @@
  * Find file from FileInPath of ParameterSet passed from calling E_Producer.
  */
 
-#include <CondFormats/CSCObjects/interface/CSCReadoutMappingForSliceTest.h>
-#include <FWCore/ParameterSet/interface/ParameterSet.h>
+#include "CondFormats/CSCObjects/interface/CSCReadoutMappingForSliceTest.h"
 #include <string>
 
 class CSCReadoutMappingFromFile : public CSCReadoutMappingForSliceTest {
 public:
   /// Constructor
-  explicit CSCReadoutMappingFromFile(const edm::ParameterSet& ps);
+  explicit CSCReadoutMappingFromFile(std::string iFullPathFileName);
   CSCReadoutMappingFromFile() {}
 
   /// Destructor
   ~CSCReadoutMappingFromFile() override;
 
   /// Fill mapping store
-  void fill(const edm::ParameterSet& ps) override;
+  void fill(std::string iFullPathFileName);
 
 private:
   std::string theMappingFile;

CondFormats/CSCObjects/src/CSCReadoutMappingFromFile.cc

@@ -1,17 +1,17 @@
 #include "CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/FileInPath.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>
 
-CSCReadoutMappingFromFile::CSCReadoutMappingFromFile(const edm::ParameterSet& ps) { fill(ps); }
+CSCReadoutMappingFromFile::CSCReadoutMappingFromFile(std::string iName) { fill(std::move(iName)); }
 
 CSCReadoutMappingFromFile::~CSCReadoutMappingFromFile() {}
 
-void CSCReadoutMappingFromFile::fill(const edm::ParameterSet& ps) {
-  edm::FileInPath fp = ps.getParameter<edm::FileInPath>("theMappingFile");
-  theMappingFile = fp.fullPath();
+void CSCReadoutMappingFromFile::fill(std::string fileName) {
+  theMappingFile = std::move(fileName);
+  //  edm::FileInPath fp = ps.getParameter<edm::FileInPath>("theMappingFile");
+  //theMappingFile = fp.fullPath();
   std::ifstream in(theMappingFile.c_str());
   std::string line;
   const std::string commentFlag = "#";

CondFormats/CSCObjects/test/BuildFile.xml

@@ -81,12 +81,10 @@
 </library>
 
 <bin name="testCSCMapping" file="testCSCMapping.cpp">
-  <use name="FWCore/ParameterSetReader"/>
   <use name="cppunit"/>
 </bin>
 
 <bin name="testCSCTriggerMapping" file="testCSCTriggerMapping.cpp">
-  <use name="FWCore/ParameterSetReader"/>
   <use name="cppunit"/>
 </bin>
 

CondFormats/CSCObjects/test/testCSCMapping.cpp

@@ -6,9 +6,6 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 #include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/PluginManager/interface/ProblemTracker.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSetReader/interface/ParameterSetReader.h"
 #include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
@@ -60,13 +57,11 @@ class testCSCMapping : public CppUnit::TestFixture {
 void testCSCMapping::testRead() {
   edm::FileInPath fip("CondFormats/CSCObjects/data/csc_slice_test_map.txt");
   std::cout << "Attempt to set FileInPath to " << fip.fullPath() << std::endl;
-  edm::ParameterSet ps;
-  ps.addParameter<edm::FileInPath>("theMappingFile", fip);
 
   std::cout << myName_ << ": --- t e s t C S C M a p p i n g  ---" << std::endl;
   std::cout << "start " << dashedLine << std::endl;
 
-  CSCReadoutMappingFromFile theMapping(ps);
+  CSCReadoutMappingFromFile theMapping(fip.fullPath());
 
   // The following labels are irrelevant to hardware in slice test
   int tmb = -1;

CondFormats/CSCObjects/test/testCSCTriggerMapping.cpp

@@ -10,8 +10,6 @@
 #include <CondFormats/CSCObjects/interface/CSCTriggerMappingFromFile.h>
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSetReader/interface/ParameterSetReader.h"
 #include <iostream>
 #include <cstdlib>
 

EventFilter/CSCRawToDigi/interface/CSCDigiToRaw.h

@@ -21,7 +21,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class FEDRawDataCollection;
-class CSCReadoutMappingFromFile;
 class CSCChamberMap;
 
 class CSCDigiToRaw {