Merge pull request #40793 from mmusich/useResources_in_ConditionDBWriter

`usesResource` in `ConditionDBWriter`
cms-sw · Feb 20, 2023 · 67b6191 · 67b6191
2 parents 3cc5a4e + cfd3f1b
commit 67b6191
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 30 deletions.
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
@@ -358,8 +358,8 @@ void SiStripGainFromCalibTree::merge(TH2* A, TH2* B) {
 
 SiStripGainFromCalibTree::SiStripGainFromCalibTree(const edm::ParameterSet& iConfig)
     : ConditionDBWriter<SiStripApvGain>(iConfig) {
+  usesResource(TFileService::kSharedResource);
   OutputGains = iConfig.getParameter<std::string>("OutputGains");
-
   AlgoMode = iConfig.getUntrackedParameter<std::string>("AlgoMode", "CalibTree");
   MagFieldCurrentTh = iConfig.getUntrackedParameter<double>("MagFieldCurrentTh", 2000.);
   MinNrEntries = iConfig.getUntrackedParameter<double>("minNrEntries", 20);

diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainBuilderFromTag.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainBuilderFromTag.h
@@ -8,7 +8,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h
@@ -9,7 +9,6 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

diff --git a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h
@@ -160,6 +160,7 @@ class ConditionDBWriter
         Time_(0),
         setSinceTime_(false),
         firstRun_(true) {
+    usesResource(cond::service::PoolDBOutputService::kSharedResource);
     edm::LogInfo("ConditionDBWriter::ConditionDBWriter()") << std::endl;
     SinceAppendMode_ = iConfig.getParameter<bool>("SinceAppendMode");
     std::string IOVMode = iConfig.getParameter<std::string>("IOVMode");

diff --git a/CondCore/DBOutputService/interface/PoolDBOutputService.h b/CondCore/DBOutputService/interface/PoolDBOutputService.h
@@ -34,6 +34,8 @@ namespace cond {
     public:
       PoolDBOutputService(const edm::ParameterSet& iConfig, edm::ActivityRegistry& iAR);
 
+      static const std::string kSharedResource;
+
       virtual ~PoolDBOutputService();
 
       //use these to control connections

diff --git a/CondCore/DBOutputService/src/PoolDBOutputService.cc b/CondCore/DBOutputService/src/PoolDBOutputService.cc
@@ -12,6 +12,8 @@
 #include <memory>
 #include <cassert>
 
+const std::string cond::service::PoolDBOutputService::kSharedResource = "PoolDBOutputService";
+
 //In order to make PoolDBOutputService::currentTime() to work we have to keep track
 // of which stream is presently being processed on a given thread during the call of
 // a module which calls that method.

diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc
@@ -1,15 +1,17 @@
 #ifndef SiStripDeDx2DBuilder_H
 #define SiStripDeDx2DBuilder_H
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
+#include "CondFormats/PhysicsToolsObjects/interface/Histogram2D.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 //#include "FWCore/Utilities/interface/FileInPath.h"
 
-#include "CondFormats/PhysicsToolsObjects/interface/Histogram2D.h"
-
 #include <iostream>
 #include <fstream>
 //#include "CLHEP/Random/RandFlat.h"

diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc
@@ -1,15 +1,17 @@
 #ifndef SiStripDeDx3DBuilder_H
 #define SiStripDeDx3DBuilder_H
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
+#include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 //#include "FWCore/Utilities/interface/FileInPath.h"
 
-#include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h"
-
 #include <iostream>
 #include <fstream>
 //#include "CLHEP/Random/RandFlat.h"

diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.cc
@@ -1,5 +1,7 @@
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h"
 #include "CondFormats/PhysicsToolsObjects/interface/Histogram2D.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 //#include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 
 #include <iostream>

diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h b/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h
@@ -5,7 +5,8 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
 //#include "FWCore/Utilities/interface/FileInPath.h"
 
 #include "CondFormats/PhysicsToolsObjects/interface/Histogram2D.h"

diff --git a/CondTools/SiStrip/plugins/SiStripApvGainBuilder.cc b/CondTools/SiStrip/plugins/SiStripApvGainBuilder.cc
@@ -4,13 +4,15 @@
 
 // user include files
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGauss.h"

diff --git a/CondTools/SiStrip/plugins/SiStripApvSimulationParametersBuilder.cc b/CondTools/SiStrip/plugins/SiStripApvSimulationParametersBuilder.cc
@@ -1,8 +1,9 @@
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondFormats/DataRecord/interface/SiStripCondDataRecords.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvSimulationParameters.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
 
 class SiStripApvSimulationParametersBuilder : public edm::one::EDAnalyzer<> {
 public:

diff --git a/CondTools/SiStrip/plugins/SiStripNoisesBuilder.cc b/CondTools/SiStrip/plugins/SiStripNoisesBuilder.cc
@@ -4,11 +4,14 @@
 
 // user includes
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Random/RandFlat.h"

diff --git a/CondTools/SiStrip/plugins/SiStripPedestalsBuilder.cc b/CondTools/SiStrip/plugins/SiStripPedestalsBuilder.cc
@@ -1,11 +1,14 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGauss.h"

diff --git a/CondTools/SiStrip/plugins/SiStripSummaryBuilder.cc b/CondTools/SiStrip/plugins/SiStripSummaryBuilder.cc
@@ -3,13 +3,16 @@
 #include <fstream>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
+#include "CondFormats/SiStripObjects/interface/SiStripSummary.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
-#include "CondFormats/SiStripObjects/interface/SiStripSummary.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGauss.h"

diff --git a/CondTools/SiStrip/plugins/SiStripThresholdBuilder.cc b/CondTools/SiStrip/plugins/SiStripThresholdBuilder.cc
@@ -1,10 +1,13 @@
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
-#include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
 #include "CondFormats/SiStripObjects/interface/SiStripThreshold.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Random/RandFlat.h"