From 07a59f7fa8ceedbf9de716b4f966b5240a703da6 Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Tue, 14 Sep 2021 14:56:10 +0200
Subject: [PATCH] modernize SiStripDetInfoFileWriter

---
 .../SiStripCommon/plugins/SealModules.cc      |  4 --
 .../plugins/SiStripDetInfoFileWriter.cc       | 54 +++++++++++++++----
 .../plugins/SiStripDetInfoFileWriter.h        | 44 ---------------
 3 files changed, 44 insertions(+), 58 deletions(-)
 delete mode 100644 CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h

diff --git a/CalibTracker/SiStripCommon/plugins/SealModules.cc b/CalibTracker/SiStripCommon/plugins/SealModules.cc
index 6613d45b91294..275fd4b1ba83c 100644
--- a/CalibTracker/SiStripCommon/plugins/SealModules.cc
+++ b/CalibTracker/SiStripCommon/plugins/SealModules.cc
@@ -1,10 +1,6 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h"
-
-DEFINE_FWK_MODULE(SiStripDetInfoFileWriter);
-
 #include "ShallowTree.h"
 #include "ShallowEventDataProducer.h"
 #include "ShallowDigisProducer.h"
diff --git a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc
index 9aa18d1401659..e85d85cf9a99c 100644
--- a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc
+++ b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc
@@ -1,16 +1,52 @@
 // -*- C++ -*-
-// Package:    SiStripCommon
+//
+// Package:    SiStripDetInfoFileWriter
 // Class:      SiStripDetInfoFileWriter
-// Original Author:  G. Bruno
-//         Created:  Mon May 20 10:04:31 CET 2007
+//
+/**\class SiStripDetInfoFileWriter SiStripDetInfoFileWriter.cc CalibTracker/SiStripCommon/src/SiStripDetInfoFileWriter.cc
+
+ Description: <one line class summary>
 
-#include "CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h"
+ Implementation:
+     <Notes on implementation>
+*/
+//
+// Original Author:  G. Bruno
+//         Created:  Mon Nov 20 10:04:31 CET 2006
+//
+//
+
+// C++ includes
+#include <string>
+#include <iostream>
+#include <fstream>
+
+// User includes
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+
+class SiStripDetInfoFileWriter : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
+public:
+  explicit SiStripDetInfoFileWriter(const edm::ParameterSet&);
+  ~SiStripDetInfoFileWriter() override;
+
+private:
+  void beginRun(const edm::Run&, const edm::EventSetup& iSetup) override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override{};
+  void endRun(const edm::Run&, const edm::EventSetup& iSetup) override{};
+
+private:
+  std::ofstream outputFile_;
+  std::string filePath_;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
+};
 
 using namespace cms;
 using namespace std;
@@ -55,13 +91,11 @@ void SiStripDetInfoFileWriter::beginRun(const edm::Run&, const edm::EventSetup&
         outputFile_ << detid << " " << numberOfAPVs << " " << stripLength << " " << thickness << "\n";
       }
     }
-
     outputFile_.close();
-
-  }
-
-  else {
+  } else {
     edm::LogError("SiStripDetInfoFileWriter::beginRun - Unable to open file") << endl;
     return;
   }
 }
+
+DEFINE_FWK_MODULE(SiStripDetInfoFileWriter);
diff --git a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h
deleted file mode 100644
index fd3d1353abc43..0000000000000
--- a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef CalibTracker_SiStripChannelGain_SiStripDetInfoFileWriter_h
-#define CalibTracker_SiStripChannelGain_SiStripDetInfoFileWriter_h
-// -*- C++ -*-
-//
-// Package:    SiStripDetInfoFileWriter
-// Class:      SiStripDetInfoFileWriter
-//
-/**\class SiStripDetInfoFileWriter SiStripDetInfoFileWriter.cc CalibTracker/SiStripCommon/src/SiStripDetInfoFileWriter.cc
-
- Description: <one line class summary>
-
- Implementation:
-     <Notes on implementation>
-*/
-//
-// Original Author:  G. Bruno
-//         Created:  Mon Nov 20 10:04:31 CET 2006
-//
-//
-
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include <string>
-#include <iostream>
-#include <fstream>
-
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-
-class SiStripDetInfoFileWriter : public edm::EDAnalyzer {
-public:
-  explicit SiStripDetInfoFileWriter(const edm::ParameterSet&);
-  ~SiStripDetInfoFileWriter() override;
-
-private:
-  void beginRun(const edm::Run&, const edm::EventSetup& iSetup) override;
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override{};
-
-private:
-  std::ofstream outputFile_;
-  std::string filePath_;
-  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
-};
-#endif