Include FileInPath.h from FWCore/Utilities in Formats packages

Dr15Jones · Dr15Jones · commit a5c98c721f78 · 2021-05-30T11:42:16.000-05:00
This is a step towards decreasing dependencies on FWCore/ParameterSet
in Formats packages.
diff --git a/CondFormats/CSCObjects/src/CSCReadoutMappingFromFile.cc b/CondFormats/CSCObjects/src/CSCReadoutMappingFromFile.cc
@@ -1,6 +1,6 @@
-#include <CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h>
-#include <FWCore/MessageLogger/interface/MessageLogger.h>
-#include <FWCore/ParameterSet/interface/FileInPath.h>
+#include "CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/CondFormats/CSCObjects/test/testCSCMapping.cpp b/CondFormats/CSCObjects/test/testCSCMapping.cpp
@@ -5,13 +5,13 @@
  */
 
 #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/Utilities/interface/Exception.h"
+#include "FWCore/PluginManager/interface/ProblemTracker.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSetReader/interface/ParameterSetReader.h"
-#include <FWCore/ParameterSet/interface/FileInPath.h>
-#include <CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h>
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
+#include "FWCore/Utilities/interface/FileInPath.h"
+#include "CondFormats/CSCObjects/interface/CSCReadoutMappingFromFile.h"
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
 #include <iostream>
 #include <cstdlib>
diff --git a/CondFormats/JetMETObjects/test/BuildFile.xml b/CondFormats/JetMETObjects/test/BuildFile.xml
@@ -3,7 +3,7 @@
 </bin>
 
 <bin name="TestCondFormatsJetMETObjectsJetCorrectorParameters" file="JetCorrectorParameters_t.cpp">
-  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
   <use name="CondFormats/JetMETObjects"/>
   <use name="cppunit"/>
 </bin>
diff --git a/CondFormats/JetMETObjects/test/JetCorrectorParameters_t.cpp b/CondFormats/JetMETObjects/test/JetCorrectorParameters_t.cpp
@@ -1,7 +1,7 @@
 #include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
 #include "cppunit/extensions/HelperMacros.h"
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/JetMETObjects/interface/JetCorrectorParameters.h"
 #include "CondFormats/JetMETObjects/interface/FactorizedJetCorrector.h"
 
diff --git a/CondFormats/L1TObjects/src/L1MuDTEtaPatternLut.cc b/CondFormats/L1TObjects/src/L1MuDTEtaPatternLut.cc
@@ -32,7 +32,7 @@
 // Collaborating Class Headers --
 //-------------------------------
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerLutFile.h"
 
 using namespace std;
diff --git a/CondFormats/L1TObjects/src/L1MuDTExtLut.cc b/CondFormats/L1TObjects/src/L1MuDTExtLut.cc
@@ -34,7 +34,7 @@
 // Collaborating Class Headers --
 //-------------------------------
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/L1TObjects/interface/DTTFBitArray.h"
 #include "CondFormats/L1TObjects/interface/L1MuDTExtParam.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerLutFile.h"
diff --git a/CondFormats/L1TObjects/src/L1MuDTPhiLut.cc b/CondFormats/L1TObjects/src/L1MuDTPhiLut.cc
@@ -34,7 +34,7 @@
 // Collaborating Class Headers --
 //-------------------------------
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/L1TObjects/interface/DTTFBitArray.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerLutFile.h"
 
diff --git a/CondFormats/L1TObjects/src/L1MuDTPtaLut.cc b/CondFormats/L1TObjects/src/L1MuDTPtaLut.cc
@@ -34,7 +34,7 @@
 // Collaborating Class Headers --
 //-------------------------------
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/L1TObjects/interface/DTTFBitArray.h"
 #include "CondFormats/L1TObjects/interface/L1MuDTAssParam.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerLutFile.h"
diff --git a/CondFormats/L1TObjects/src/L1MuDTQualPatternLut.cc b/CondFormats/L1TObjects/src/L1MuDTQualPatternLut.cc
@@ -34,7 +34,7 @@
 // Collaborating Class Headers --
 //-------------------------------
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerLutFile.h"
 
 using namespace std;
diff --git a/CondFormats/PPSObjects/src/PPSDirectSimulationData.cc b/CondFormats/PPSObjects/src/PPSDirectSimulationData.cc
@@ -5,7 +5,7 @@
 #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h"
 #include "DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 
 #include "TFile.h"
 
@@ -107,4 +107,4 @@ std::string PPSDirectSimulationData::replace(std::string input, const std::strin
     start_pos += to.length();
   }
   return input;
-}
+}
diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc
@@ -6,7 +6,7 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+//#include "FWCore/Utilities/interface/FileInPath.h"
 
 #include "CondFormats/PhysicsToolsObjects/interface/Histogram2D.h"
 
@@ -24,7 +24,7 @@ class SiStripDeDx2DBuilder : public edm::EDAnalyzer {
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
 private:
-  edm::FileInPath fp_;
+  //edm::FileInPath fp_;
   bool printdebug_;
 };
 
diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc
@@ -6,7 +6,7 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+//#include "FWCore/Utilities/interface/FileInPath.h"
 
 #include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h"
 
@@ -24,7 +24,7 @@ class SiStripDeDx3DBuilder : public edm::EDAnalyzer {
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
 private:
-  edm::FileInPath fp_;
+  //edm::FileInPath fp_;
   bool printdebug_;
 };
 
diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h b/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h
@@ -6,7 +6,7 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+//#include "FWCore/Utilities/interface/FileInPath.h"
 
 #include "CondFormats/PhysicsToolsObjects/interface/Histogram2D.h"
 
@@ -22,7 +22,7 @@ class SiStripDeDxMipBuilder : public edm::EDAnalyzer {
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
 private:
-  edm::FileInPath fp_;
+  //edm::FileInPath fp_;
   bool printdebug_;
 };
 
diff --git a/CondFormats/SiPixelObjects/BuildFile.xml b/CondFormats/SiPixelObjects/BuildFile.xml
@@ -13,7 +13,6 @@
 <use name="DataFormats/GeometryVector"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
diff --git a/CondFormats/SiPixelObjects/src/SiPixelCPEGenericErrorParm.cc b/CondFormats/SiPixelObjects/src/SiPixelCPEGenericErrorParm.cc
@@ -1,5 +1,4 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelCPEGenericErrorParm.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include <fstream>
 
 void SiPixelCPEGenericErrorParm::fillCPEGenericErrorParm(double version, std::string file) {
diff --git a/CondFormats/SiPixelTransient/BuildFile.xml b/CondFormats/SiPixelTransient/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="boost"/>
 <export>
diff --git a/CondFormats/SiPixelTransient/src/SiPixelGenError.cc b/CondFormats/SiPixelTransient/src/SiPixelGenError.cc
@@ -30,7 +30,7 @@
 
 #ifndef SI_PIXEL_TEMPLATE_STANDALONE
 #include "CondFormats/SiPixelTransient/interface/SiPixelGenError.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #define LOGERROR(x) LogError(x)
 #define LOGWARNING(x) LogWarning(x)
diff --git a/CondFormats/SiPixelTransient/src/SiPixelTemplate.cc b/CondFormats/SiPixelTransient/src/SiPixelTemplate.cc
@@ -104,7 +104,7 @@
 #ifndef SI_PIXEL_TEMPLATE_STANDALONE
 #include "CondFormats/SiPixelTransient/interface/SiPixelTemplate.h"
 #include "CondFormats/SiPixelTransient/interface/SimplePixel.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #define LOGERROR(x) LogError(x)
 #define LOGINFO(x) LogInfo(x)
diff --git a/CondFormats/SiPixelTransient/src/SiPixelTemplate2D.cc b/CondFormats/SiPixelTransient/src/SiPixelTemplate2D.cc
@@ -38,7 +38,7 @@
 
 #ifndef SI_PIXEL_TEMPLATE_STANDALONE
 #include "CondFormats/SiPixelTransient/interface/SiPixelTemplate2D.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #define LOGERROR(x) LogError(x)
 #define LOGINFO(x) LogInfo(x)
diff --git a/DataFormats/PatCandidates/src/CovarianceParameterization.cc b/DataFormats/PatCandidates/src/CovarianceParameterization.cc
@@ -9,7 +9,7 @@
 #include "DataFormats/Math/interface/liblogintpack.h"
 #include "DataFormats/Math/interface/libminifloat.h"
 #include "DataFormats/PatCandidates/interface/CovarianceParameterization.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/FileInPath.h"
 
 uint16_t CompressionElement::pack(float value, float ref) const {
   float toCompress = 0;
