Fixed namin of inclusion guards an removed Phase1 from names

cms-sw · Jun 2, 2021 · 208fc22 · 208fc22
1 parent 45d54f9
commit 208fc22
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_harvesting_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_harvesting_cff.py
@@ -14,7 +14,7 @@
                                                 + SiPixelPhase1RawDataHarvester
                                                 + RunQTests_offline
                                                 + SiPixelPhase1SummaryOffline
-                                                + SiPixelPhase1BarycenterOffline
+                                                + SiPixelBarycenterOffline
                                                   )
 
 siPixelPhase1OfflineDQM_harvesting_cosmics = siPixelPhase1OfflineDQM_harvesting.copyAndExclude([

diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_source_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_source_cff.py
@@ -20,7 +20,7 @@
 #Summary maps
 from DQM.SiPixelPhase1Summary.SiPixelPhase1Summary_cfi import *
 #Barycenter plots
-from DQM.SiPixelPhase1Summary.SiPixelPhase1Barycenter_cfi import *
+from DQM.SiPixelPhase1Summary.SiPixelBarycenter_cfi import *
 
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
 from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *

diff --git a/...mmary/interface/SiPixelPhase1Barycenter.h → ...ase1Summary/interface/SiPixelBarycenter.h b/...mmary/interface/SiPixelPhase1Barycenter.h → ...ase1Summary/interface/SiPixelBarycenter.h
@@ -1,9 +1,9 @@
-#ifndef SiPixelPhase1Barycenter_SiPixelPhase1Barycenter_h
-#define SiPixelPhase1Barycenter_SiPixelPhase1Barycenter_h
+#ifndef DQM_SiPixelPhase1Summary_SiPixelBarycenter_h
+#define DQM_SiPixelPhase1Summary_SiPixelBarycenter_h
 // -*- C++ -*-
 //
-// Package:     SiPixelPhase1Barycenter
-// Class  :     SiPixelPhase1Barycenter
+// Package:     SiPixelPhase1Summary
+// Class  :     SiPixelBarycenter
 //
 /**
 
@@ -31,10 +31,10 @@
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 #include "CondFormats/Alignment/interface/Alignments.h"
 
-class SiPixelPhase1Barycenter : public DQMEDHarvester {
+class SiPixelBarycenter : public DQMEDHarvester {
 public:
-  explicit SiPixelPhase1Barycenter(const edm::ParameterSet& conf);
-  ~SiPixelPhase1Barycenter() override;
+  explicit SiPixelBarycenter(const edm::ParameterSet& conf);
+  ~SiPixelBarycenter() override;
 
 protected:
   void beginRun(edm::Run const& run, edm::EventSetup const& eSetup) override;

diff --git a/...interface/SiPixelPhase1BarycenterHelper.h → ...mmary/interface/SiPixelBarycenterHelper.h b/...interface/SiPixelPhase1BarycenterHelper.h → ...mmary/interface/SiPixelBarycenterHelper.h
@@ -1,5 +1,5 @@
-#ifndef SiPixelPhase1Barycenter_SiPixelPhase1BarycenterHelper_h
-#define SiPixelPhase1Barycenter_SiPixelPhase1BarycenterHelper_h
+#ifndef DQM_SiPixelPhase1Summary_SiPixelBarycenterHelper_h
+#define DQM_SiPixelPhase1Summary_SiPixelBarycenterHelper_h
 
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -87,7 +87,7 @@ namespace DQMBarycenter {
   {
     for (const auto& ali : input) {
       if (DetId(ali.rawId()).det() != DetId::Tracker) {
-        edm::LogWarning("SiPixelPhase1Barycenters::computeBarycenters")
+        edm::LogWarning("SiPixelBarycenters::computeBarycenters")
             << "Encountered invalid Tracker DetId:" << ali.rawId() << " " << DetId(ali.rawId()).det()
             << " is different from " << DetId::Tracker << "  - terminating ";
         assert(DetId(ali.rawId()).det() != DetId::Tracker);

diff --git a/...ary/python/SiPixelPhase1Barycenter_cfi.py → ...e1Summary/python/SiPixelBarycenter_cfi.py b/...ary/python/SiPixelPhase1Barycenter_cfi.py → ...e1Summary/python/SiPixelBarycenter_cfi.py
@@ -5,4 +5,4 @@
 # This object is used to make changes for different running scenarios
 #
 
-SiPixelPhase1BarycenterOffline = DQMEDHarvester("SiPixelPhase1Barycenter")
+SiPixelBarycenterOffline = DQMEDHarvester("SiPixelBarycenter")
diff --git a/...se1Summary/src/SiPixelPhase1Barycenter.cc → ...xelPhase1Summary/src/SiPixelBarycenter.cc b/...se1Summary/src/SiPixelPhase1Barycenter.cc → ...xelPhase1Summary/src/SiPixelBarycenter.cc
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 //
-// Package:    SiPixelPhase1Barycenter
-// Class:      SiPixelPhase1Barycenter
+// Package:    SiPixelPhase1Summary
+// Class:      SiPixelBarycenter
 //
 /**\class 
 
- Description: Create the Phase 1 pixel barycenter plots
+ Description: Create the pixel barycenter plots
 
  Implementation:
      <Notes on implementation>
@@ -15,9 +15,9 @@
 //         Created:  26th May 2021
 //
 //
-#include "DQM/SiPixelPhase1Summary/interface/SiPixelPhase1Barycenter.h"
+#include "DQM/SiPixelPhase1Summary/interface/SiPixelBarycenter.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DQM/SiPixelPhase1Summary/interface/SiPixelPhase1BarycenterHelper.h"
+#include "DQM/SiPixelPhase1Summary/interface/SiPixelBarycenterHelper.h"
 #include "CalibTracker/StandaloneTrackerTopology/interface/StandaloneTrackerTopology.h"
 
 #include <string>
@@ -26,23 +26,23 @@
 using namespace std;
 using namespace edm;
 
-SiPixelPhase1Barycenter::SiPixelPhase1Barycenter(const edm::ParameterSet& iConfig)
+SiPixelBarycenter::SiPixelBarycenter(const edm::ParameterSet& iConfig)
     : DQMEDHarvester(iConfig) {
-  LogInfo("PixelDQM") << "SiPixelPhase1Barycenter::SiPixelPhase1Barycenter: Got DQM BackEnd interface" << endl;
+  LogInfo("PixelDQM") << "SiPixelBarycenter::SiPixelBarycenter: Got DQM BackEnd interface" << endl;
 
 }
 
-SiPixelPhase1Barycenter::~SiPixelPhase1Barycenter() {
+SiPixelBarycenter::~SiPixelBarycenter() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
-  LogInfo("PixelDQM") << "SiPixelPhase1Barycenter::~SiPixelPhase1Barycenter: Destructor" << endl;
+  LogInfo("PixelDQM") << "SiPixelBarycenter::~SiPixelBarycenter: Destructor" << endl;
 }
 
-void SiPixelPhase1Barycenter::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) {}
+void SiPixelBarycenter::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) {}
 
-void SiPixelPhase1Barycenter::dqmEndJob(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter) {}
+void SiPixelBarycenter::dqmEndJob(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter) {}
 
-void SiPixelPhase1Barycenter::dqmEndLuminosityBlock(DQMStore::IBooker& iBooker,
+void SiPixelBarycenter::dqmEndLuminosityBlock(DQMStore::IBooker& iBooker,
                                                  DQMStore::IGetter& iGetter,
                                                  const edm::LuminosityBlock& lumiSeg,
                                                  edm::EventSetup const& c) {
@@ -62,7 +62,7 @@ void SiPixelPhase1Barycenter::dqmEndLuminosityBlock(DQMStore::IBooker& iBooker,
 //------------------------------------------------------------------
 // Used to book the barycenter histograms
 //------------------------------------------------------------------
-void SiPixelPhase1Barycenter::bookBarycenterHistograms(DQMStore::IBooker& iBooker) {
+void SiPixelBarycenter::bookBarycenterHistograms(DQMStore::IBooker& iBooker) {
   iBooker.cd();
 
   iBooker.setCurrentFolder("PixelPhase1/Barycenter");
@@ -86,7 +86,7 @@ void SiPixelPhase1Barycenter::bookBarycenterHistograms(DQMStore::IBooker& iBooke
 //------------------------------------------------------------------
 // Fill the Barycenter histograms
 //------------------------------------------------------------------
-void SiPixelPhase1Barycenter::fillBarycenterHistograms(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter, const std::vector<AlignTransform>& input, const std::vector<AlignTransform>& GPR) {
+void SiPixelBarycenter::fillBarycenterHistograms(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter, const std::vector<AlignTransform>& input, const std::vector<AlignTransform>& GPR) {
 
   const auto GPR_translation_pixel = GPR[0].translation();
   const std::map<DQMBarycenter::coordinate, float> GPR_pixel = {{DQMBarycenter::t_x, GPR_translation_pixel.x()}, {DQMBarycenter::t_y, GPR_translation_pixel.y()}, {DQMBarycenter::t_z, GPR_translation_pixel.z()}};
@@ -109,4 +109,4 @@ void SiPixelPhase1Barycenter::fillBarycenterHistograms(DQMStore::IBooker& iBooke
 }
 
 //define this as a plug-in
-DEFINE_FWK_MODULE(SiPixelPhase1Barycenter);
+DEFINE_FWK_MODULE(SiPixelBarycenter);