Added SiStripDetInfoFileReader::kDefaultFile

Use the constant in recently changed files.
cms-sw · May 29, 2021 · dd09f36 · dd09f36
1 parent f7d5080
commit dd09f36
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 26 deletions.
diff --git a/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripGain.cc b/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripGain.cc
@@ -71,7 +71,7 @@ class TestSiStripGain : public CppUnit::TestFixture {
     normVector.push_back(norm1);
     normVector.push_back(norm2);
 
-    edm::FileInPath fp("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+    edm::FileInPath fp(SiStripDetInfoFileReader::kDefaultFile);
     SiStripDetInfoFileReader reader(fp.fullPath());
 
     SiStripGain gain(*apvGain1, norm1, recordLabelPair1, reader.info());
@@ -88,7 +88,7 @@ class TestSiStripGain : public CppUnit::TestFixture {
   }
 
   void apvGainsTest(const float &norm) {
-    edm::FileInPath fp("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+    edm::FileInPath fp(SiStripDetInfoFileReader::kDefaultFile);
     SiStripDetInfoFileReader reader(fp.fullPath());
 
     SiStripGain gain(*apvGain1, norm, reader.info());

diff --git a/CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h b/CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h
@@ -30,6 +30,7 @@ class SiStripDetInfoFileReader {
 public:
   using DetInfo = SiStripDetInfo::DetInfo;
 
+  constexpr static char const * const kDefaultFile = "CalibTracker/SiStripCommon/data/SiStripDetInfo.dat";
   explicit SiStripDetInfoFileReader(){};
 
   explicit SiStripDetInfoFileReader(std::string filePath);

diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.cc
@@ -25,7 +25,7 @@ SiStripQualityFakeESSource::SiStripQualityFakeESSource(const edm::ParameterSet&
 }
 
 std::unique_ptr<SiStripQuality> SiStripQualityFakeESSource::produce(const SiStripQualityRcd& iRecord) {
-  edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+  edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
   SiStripDetInfoFileReader reader(path.fullPath());
 
   return std::make_unique<SiStripQuality>(reader.info());

diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc
@@ -92,7 +92,7 @@ SiStripGainESProducer::SiStripGainESProducer(const edm::ParameterSet& iConfig) :
 }
 
 std::unique_ptr<SiStripGain> SiStripGainESProducer::produce(const SiStripGainRcd& iRecord) {
-  edm::FileInPath fp("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+  edm::FileInPath fp(SiStripDetInfoFileReader::kDefaultFile);
   SiStripDetInfoFileReader reader(fp.fullPath());
 
   const auto& apvGain = gainGetters_[0]->gain(iRecord);

diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc
@@ -57,7 +57,7 @@ SiStripGainSimESProducer::SiStripGainSimESProducer(const edm::ParameterSet& iCon
 }
 
 std::unique_ptr<SiStripGain> SiStripGainSimESProducer::produce(const SiStripGainSimRcd& iRecord) {
-  const edm::FileInPath fp("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+  const edm::FileInPath fp(SiStripDetInfoFileReader::kDefaultFile);
   const SiStripDetInfoFileReader reader(fp.fullPath());
 
   const auto& apvGain = iRecord.get(tokenLabels_[0].token_);

diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc
@@ -129,7 +129,7 @@ SiStripQualityESProducer::SiStripQualityESProducer(const edm::ParameterSet& iCon
 }
 
 std::unique_ptr<SiStripQuality> SiStripQualityESProducer::produce(const SiStripQualityRcd& iRecord) {
-  edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+  edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
   SiStripDetInfoFileReader reader(path.fullPath());
   auto quality = std::make_unique<SiStripQuality>(reader.info());
   edm::LogInfo("SiStripQualityESProducer") << "produce called";

diff --git a/CalibTracker/SiStripESProducers/src/SiStripQualityHelpers.cc b/CalibTracker/SiStripESProducers/src/SiStripQualityHelpers.cc
@@ -53,7 +53,7 @@ namespace {
 std::unique_ptr<SiStripQuality> sistrip::badStripFromFedErr(DQMStore::IGetter& dqmStore,
                                                             const SiStripFedCabling& fedCabling,
                                                             float cutoff) {
-  edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+  edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
   SiStripDetInfoFileReader reader(path.fullPath());
 
   auto quality = std::make_unique<SiStripQuality>(reader.info());

diff --git a/CalibTracker/SiStripESProducers/test/testSiStripQualityESProducer.cc b/CalibTracker/SiStripESProducers/test/testSiStripQualityESProducer.cc
@@ -26,10 +26,6 @@ void testSiStripQualityESProducer::analyze(const edm::Event& e, const edm::Event
 
   char canvas[1024] = "\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\n";
 
-  //NOTE: can't guarantee this is what was used to make the SiStripQuality
-  // can difference be determined without it?
-  edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
-
   //&&&&&&&&&&&&&&&&&&
   //First Record
   //&&&&&&&&&&&&&&&&&&

diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc
@@ -22,7 +22,7 @@ SiStripQualityHotStripIdentifier::SiStripQualityHotStripIdentifier(const edm::Pa
       dataLabel_(iConfig.getUntrackedParameter<std::string>("dataLabel", "")),
       conf_(iConfig),
       fp_(iConfig.getUntrackedParameter<edm::FileInPath>(
-          "file", edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"))),
+          "file", edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile))),
       Cluster_src_(iConfig.getParameter<edm::InputTag>("Cluster_src")),
       Track_src_(iConfig.getUntrackedParameter<edm::InputTag>("Track_src")),
       tracksCollection_in_EventTree(iConfig.getUntrackedParameter<bool>("RemoveTrackClusters", false)),
@@ -54,7 +54,7 @@ std::unique_ptr<SiStripBadStrip> SiStripQualityHotStripIdentifier::getNewObject(
     theIdentifier.setMinNumEntries(parameters.getUntrackedParameter<uint32_t>("MinNumEntries", 100));
     theIdentifier.setMinNumEntriesPerStrip(parameters.getUntrackedParameter<uint32_t>("MinNumEntriesPerStrip", 5));
 
-    edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+    edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
     SiStripDetInfoFileReader reader(path.fullPath());
 
     SiStripQuality* qobj = new SiStripQuality(reader.info());

diff --git a/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc
@@ -143,7 +143,7 @@ namespace {
       auto tagname = PlotBase::getTag<0>().name;
       std::shared_ptr<SiStripBadStrip> payload = fetchPayload(std::get<1>(iov));
 
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       auto theIOVsince = std::to_string(std::get<0>(iov));
@@ -204,7 +204,7 @@ namespace {
       auto tagname = PlotBase::getTag<0>().name;
       std::shared_ptr<SiStripBadStrip> payload = fetchPayload(std::get<1>(iov));
 
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       auto theIOVsince = std::to_string(std::get<0>(iov));
@@ -258,7 +258,7 @@ namespace {
     ~SiStripBadStripFractionByRun() override = default;
 
     float getFromPayload(SiStripBadStrip& payload) override {
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       std::vector<uint32_t> detid;
@@ -301,7 +301,7 @@ namespace {
     ~SiStripBadStripTIBFractionByRun() override = default;
 
     float getFromPayload(SiStripBadStrip& payload) override {
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       std::vector<uint32_t> detid;
@@ -347,7 +347,7 @@ namespace {
     ~SiStripBadStripTOBFractionByRun() override = default;
 
     float getFromPayload(SiStripBadStrip& payload) override {
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       std::vector<uint32_t> detid;
@@ -393,7 +393,7 @@ namespace {
     ~SiStripBadStripTIDFractionByRun() override = default;
 
     float getFromPayload(SiStripBadStrip& payload) override {
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       std::vector<uint32_t> detid;
@@ -439,7 +439,7 @@ namespace {
     ~SiStripBadStripTECFractionByRun() override = default;
 
     float getFromPayload(SiStripBadStrip& payload) override {
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       std::vector<uint32_t> detid;
@@ -865,7 +865,7 @@ namespace {
       std::string lastIOVsince = std::to_string(std::get<0>(lastiov));
       std::string firstIOVsince = std::to_string(std::get<0>(firstiov));
 
-      edm::FileInPath fp_ = edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath fp_ = edm::FileInPath(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader* reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
       std::string titleMap =
@@ -966,7 +966,7 @@ namespace {
       auto iov = tag.iovs.front();
       std::shared_ptr<SiStripBadStrip> payload = fetchPayload(std::get<1>(iov));
 
-      edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader reader(path.fullPath());
 
       SiStripQuality* siStripQuality_ = new SiStripQuality(reader.info());
@@ -1190,7 +1190,7 @@ namespace {
       // for the total
       int totNComponents[4][19][4] = {{{0}}};
 
-      edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+      edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
       SiStripDetInfoFileReader reader(path.fullPath());
       SiStripQuality* f_siStripQuality_ = new SiStripQuality(reader.info());
       f_siStripQuality_->add(first_payload.get());

diff --git a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.cc
@@ -86,7 +86,7 @@ std::unique_ptr<SiStripBadStrip> SiStripQualityHotStripIdentifierRoot::getNewObj
             conf_.getUntrackedParameter<bool>("WriteOccupancyRootFile", false));
         theIdentifier->setTrackerGeometry(tracker_);
 
-        edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+        edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
         SiStripDetInfoFileReader reader(path.fullPath());
         SiStripQuality* qobj = new SiStripQuality(reader.info());
         theIdentifier->extractBadStrips(
@@ -133,7 +133,7 @@ std::unique_ptr<SiStripBadStrip> SiStripQualityHotStripIdentifierRoot::getNewObj
             conf_.getUntrackedParameter<bool>("WriteOccupancyRootFile", false));
         theIdentifier2->setTrackerGeometry(tracker_);
 
-        edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+        edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
         SiStripDetInfoFileReader reader(path.fullPath());
         SiStripQuality* qobj = new SiStripQuality(reader.info());
         theIdentifier2->extractBadAPVs(qobj, ClusterPositionHistoMap, SiStripQuality_);
@@ -186,7 +186,7 @@ std::unique_ptr<SiStripBadStrip> SiStripQualityHotStripIdentifierRoot::getNewObj
             parameters.getUntrackedParameter<double>("OccupancyThreshold", 1.E-5));
         theIdentifier3->setMinNumOfEvents();
 
-        edm::FileInPath path("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
+        edm::FileInPath path(SiStripDetInfoFileReader::kDefaultFile);
         SiStripDetInfoFileReader reader(path.fullPath());
         SiStripQuality* qobj = new SiStripQuality(reader.info());
         theIdentifier3->extractBadAPVSandStrips(