From 422d8d1ea9969ba446254d7824d23df7ee31b080 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 30 Sep 2021 10:56:18 +0200 Subject: [PATCH] Remove DQMReferenceHistogramRootFile --- CondCore/DQMPlugins/src/plugin.cc | 6 -- CondFormats/DataRecord/doc/DataRecord.doc | 1 - .../DQMReferenceHistogramRootFileRcd.h | 27 ----- .../src/DQMReferenceHistogramRootFileRcd.cc | 16 --- ...MReferenceHistogramRootFileSourceHandler.h | 27 ----- CondTools/DQM/plugins/BuildFile.xml | 13 --- ...enceHistogramRootFileEventSetupAnalyzer.cc | 98 ------------------- ...eferenceHistogramRootFilePopConAnalyzer.cc | 8 -- ...otFileEventSetupAnalyzer_OrcoffOnly_cfi.py | 22 ----- ...otFileEventSetupAnalyzer_SQLiteOnly_cfi.py | 22 ----- ...HistogramRootFileEventSetupAnalyzer_cfi.py | 24 ----- ...ReferenceHistogramRootFileSourceHandler.cc | 76 -------------- ...otFileEventSetupAnalyzer_OrcoffOnly_cfg.py | 24 ----- .../test/DQMXMLFileEventSetupAnalyzer_cfg.py | 96 ------------------ .../scripts/harvesting_tools/cmsHarvester.py | 35 ------- .../Muon/test/DQMOffline_SecondStep_cff.py | 13 +-- 16 files changed, 4 insertions(+), 504 deletions(-) delete mode 100644 CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h delete mode 100644 CondFormats/DataRecord/src/DQMReferenceHistogramRootFileRcd.cc delete mode 100644 CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h delete mode 100644 CondTools/DQM/plugins/DQMReferenceHistogramRootFileEventSetupAnalyzer.cc delete mode 100644 CondTools/DQM/plugins/DQMReferenceHistogramRootFilePopConAnalyzer.cc delete mode 100644 CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfi.py delete mode 100644 CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_SQLiteOnly_cfi.py delete mode 100644 CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi.py delete mode 100644 CondTools/DQM/src/DQMReferenceHistogramRootFileSourceHandler.cc delete mode 100644 CondTools/DQM/test/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfg.py delete mode 100644 CondTools/DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py diff --git a/CondCore/DQMPlugins/src/plugin.cc b/CondCore/DQMPlugins/src/plugin.cc index b0fcd9b128240..39e58bd5a2456 100644 --- a/CondCore/DQMPlugins/src/plugin.cc +++ b/CondCore/DQMPlugins/src/plugin.cc @@ -1,12 +1,6 @@ #include "CondCore/ESSources/interface/registration_macros.h" #include "CondFormats/DQMObjects/interface/DQMSummary.h" -#include "CondFormats/DataRecord/interface/DQMSummaryRcd.h" -REGISTER_PLUGIN(DQMSummaryRcd, DQMSummary); #include "CondFormats/DQMObjects/interface/HDQMSummary.h" #include "CondFormats/DataRecord/interface/HDQMSummaryRcd.h" REGISTER_PLUGIN(HDQMSummaryRcd, HDQMSummary); #include "CondFormats/Common/interface/FileBlob.h" -#include "CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h" -REGISTER_PLUGIN(DQMReferenceHistogramRootFileRcd, FileBlob); -#include "CondFormats/DataRecord/interface/DQMXMLFileRcd.h" -REGISTER_PLUGIN(DQMXMLFileRcd, FileBlob); diff --git a/CondFormats/DataRecord/doc/DataRecord.doc b/CondFormats/DataRecord/doc/DataRecord.doc index f8504eb037947..89795377f8db9 100644 --- a/CondFormats/DataRecord/doc/DataRecord.doc +++ b/CondFormats/DataRecord/doc/DataRecord.doc @@ -60,7 +60,6 @@ - CastorRecoParamsRcd - CombinedTauTagRcd - ConfObjectRcd -- DQMReferenceHistogramRootFileRcd - DQMSummaryRcd - DQMXMLFileRcd - DTCCBConfigRcd diff --git a/CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h b/CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h deleted file mode 100644 index 6aa664813c7b9..0000000000000 --- a/CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef DataRecord_DQMReferenceHistogramRootFileRcd_h -#define DataRecord_DQMReferenceHistogramRootFileRcd_h -// -*- C++ -*- -// -// Package: DataRecord -// Class : DQMReferenceHistogramRootFileRcd -// -/**\class DQMReferenceHistogramRootFileRcd DQMReferenceHistogramRootFileRcd.h CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h - - Description: - - Usage: - - -*/ -// -// Author: -// Created: Tue Jul 7 20:29:25 CEST 2009 -// $Id$ -// - -#include "FWCore/Framework/interface/EventSetupRecordImplementation.h" - -class DQMReferenceHistogramRootFileRcd - : public edm::eventsetup::EventSetupRecordImplementation {}; - -#endif diff --git a/CondFormats/DataRecord/src/DQMReferenceHistogramRootFileRcd.cc b/CondFormats/DataRecord/src/DQMReferenceHistogramRootFileRcd.cc deleted file mode 100644 index d624d3e03cf49..0000000000000 --- a/CondFormats/DataRecord/src/DQMReferenceHistogramRootFileRcd.cc +++ /dev/null @@ -1,16 +0,0 @@ -// -*- C++ -*- -// -// Package: DataRecord -// Class : DQMReferenceHistogramRootFileRcd -// -// Implementation: -// -// -// Author: -// Created: Tue Jul 7 20:29:25 CEST 2009 -// $Id$ - -#include "CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h" -#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" - -EVENTSETUP_RECORD_REG(DQMReferenceHistogramRootFileRcd); diff --git a/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h b/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h deleted file mode 100644 index 96b21e1874fe0..0000000000000 --- a/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef CondTools_DQM_DQMReferenceHistogramRootFileSourceHandler_h -#define CondTools_DQM_DQMReferenceHistogramRootFileSourceHandler_h - -#include "FWCore/ParameterSet/interface/ParameterSetfwd.h" -#include "CondCore/PopCon/interface/PopConSourceHandler.h" -#include "CondFormats/Common/interface/FileBlob.h" -#include - -namespace popcon { - class DQMReferenceHistogramRootFileSourceHandler : public popcon::PopConSourceHandler { - public: - DQMReferenceHistogramRootFileSourceHandler(const edm::ParameterSet& pset); - ~DQMReferenceHistogramRootFileSourceHandler() override; - void getNewObjects() override; - std::string id() const override; - - private: - std::string m_name; - std::string m_file; - bool m_zip; - //cond::Time_t m_since; - unsigned long long m_since; - bool m_debugMode; - }; -} // namespace popcon - -#endif diff --git a/CondTools/DQM/plugins/BuildFile.xml b/CondTools/DQM/plugins/BuildFile.xml index f545b20152377..17765a01a99e1 100644 --- a/CondTools/DQM/plugins/BuildFile.xml +++ b/CondTools/DQM/plugins/BuildFile.xml @@ -12,19 +12,6 @@ - - - - - - - - - - - - - diff --git a/CondTools/DQM/plugins/DQMReferenceHistogramRootFileEventSetupAnalyzer.cc b/CondTools/DQM/plugins/DQMReferenceHistogramRootFileEventSetupAnalyzer.cc deleted file mode 100644 index 7ec38ab5406f9..0000000000000 --- a/CondTools/DQM/plugins/DQMReferenceHistogramRootFileEventSetupAnalyzer.cc +++ /dev/null @@ -1,98 +0,0 @@ -// C++ common header -#include -#include -#include -#include - -#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/Run.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/Exception.h" -#include "FWCore/ServiceRegistry/interface/Service.h" -#include "CondFormats/Common/interface/FileBlob.h" -#include "CondFormats/DataRecord/interface/DQMReferenceHistogramRootFileRcd.h" -#include "DQMServices/Core/interface/DQMStore.h" - -namespace edmtest { - class DQMReferenceHistogramRootFileEventSetupAnalyzer : public edm::one::EDAnalyzer<> { - public: - typedef dqm::legacy::MonitorElement MonitorElement; - typedef dqm::legacy::DQMStore DQMStore; - explicit DQMReferenceHistogramRootFileEventSetupAnalyzer(const edm::ParameterSet& pset); - explicit DQMReferenceHistogramRootFileEventSetupAnalyzer(int i); - ~DQMReferenceHistogramRootFileEventSetupAnalyzer() override; - void analyze(const edm::Event& event, const edm::EventSetup& setup) override; - void beginRun(edm::Run const&, edm::EventSetup const&); - - private: - const edm::ESGetToken fileBlobToken_; - bool init_; - }; - - DQMReferenceHistogramRootFileEventSetupAnalyzer::DQMReferenceHistogramRootFileEventSetupAnalyzer( - const edm::ParameterSet& ps) - : fileBlobToken_(esConsumes()) { - init_ = false; - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") - << "DQMReferenceHistogramRootFileEventSetupAnalyzer(const edm::ParameterSet &ps)" << std::endl; - } - - DQMReferenceHistogramRootFileEventSetupAnalyzer::DQMReferenceHistogramRootFileEventSetupAnalyzer(int i) - : fileBlobToken_(esConsumes()) { - init_ = false; - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") - << "DQMReferenceHistogramRootFileEventSetupAnalyzer(int i) " << i << std::endl; - } - - DQMReferenceHistogramRootFileEventSetupAnalyzer::~DQMReferenceHistogramRootFileEventSetupAnalyzer() { - init_ = false; - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") - << "~DQMReferenceHistogramRootFileEventSetupAnalyzer" << std::endl; - } - - void DQMReferenceHistogramRootFileEventSetupAnalyzer::analyze(const edm::Event& iEvent, - const edm::EventSetup& iSetup) { - return; - } - - void DQMReferenceHistogramRootFileEventSetupAnalyzer::beginRun(edm::Run const& run, edm::EventSetup const& iSetup) { - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") - << "DQMReferenceHistogramRootFileEventSetupAnalyzer::beginRun()" << std::endl; - if (!init_) { - init_ = true; - edm::eventsetup::EventSetupRecordKey recordKey( - edm::eventsetup::EventSetupRecordKey::TypeTag::findType("DQMReferenceHistogramRootFileRcd")); - if (recordKey.type() == edm::eventsetup::EventSetupRecordKey::TypeTag()) { - throw cms::Exception("Record not found") << "Record \"DQMReferenceHistogramRootFileRcd" - << "\" does not exist!" << std::endl; - } - const auto& rootgeo = &iSetup.getData(fileBlobToken_); - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") << "ROOT FILE IN MEMORY" << std::endl; - std::unique_ptr > tb((*rootgeo).getUncompressedBlob()); - // char filename[128]; - // sprintf(filename, "mem:%p,%ul", &(*tb)[0], (unsigned long) tb->size()); - // edm::Service()->open(filename, false, "", "Reference"); - - //here you can implement the stream for putting the TFile on disk... - std::string outfile("dqmreference.root"); - std::ofstream output(outfile.c_str()); - output.write((const char*)&(*tb)[0], tb->size()); - output.close(); - - DQMStore* dqm = &*edm::Service(); - dqm->open(outfile, false, "", "Reference"); - remove(outfile.c_str()); - - std::vector mes = dqm->getAllContents(""); - for (std::vector::iterator i = mes.begin(), e = mes.end(); i != e; ++i) - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") << "ME '" << (*i)->getFullname() << "'\n"; - - edm::LogPrint("DQMReferenceHistogramRootFileEventSetupAnalyzer") << "SIZE FILE = " << tb->size() << std::endl; - } - } - - DEFINE_FWK_MODULE(DQMReferenceHistogramRootFileEventSetupAnalyzer); -} // namespace edmtest diff --git a/CondTools/DQM/plugins/DQMReferenceHistogramRootFilePopConAnalyzer.cc b/CondTools/DQM/plugins/DQMReferenceHistogramRootFilePopConAnalyzer.cc deleted file mode 100644 index 8fc884527ae6e..0000000000000 --- a/CondTools/DQM/plugins/DQMReferenceHistogramRootFilePopConAnalyzer.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "CondCore/PopCon/interface/PopConAnalyzer.h" -#include "CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -typedef popcon::PopConAnalyzer - DQMReferenceHistogramRootFilePopConAnalyzer; -//define this as a plug-in -DEFINE_FWK_MODULE(DQMReferenceHistogramRootFilePopConAnalyzer); diff --git a/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfi.py b/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfi.py deleted file mode 100644 index 59c334eb8c13c..0000000000000 --- a/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfi.py +++ /dev/null @@ -1,22 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from DQMServices.Core.DQMStore_cfg import * -from CondCore.CondDB.CondDB_cfi import * -CondDBReference = CondDB.clone(connect = cms.string('oracle://cms_orcoff_prep/CMS_COND_TEMP')) -CondDBReference.DBParameters.messageLevel = cms.untracked.int32(1) #3 for high verbosity - -ReferenceRetrieval = cms.ESSource("PoolDBESSource", - CondDBReference, - toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), - tag = cms.string('DQM_Cosmics_prompt') - ) - ) - ) - -## RecordDataGetter = cms.EDAnalyzer("EventSetupRecordDataGetter", -## toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), -## data = cms.vstring('DQM_Cosmics_prompt') -## ) -## ), -## verbose = cms.untracked.bool(False) -## ) diff --git a/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_SQLiteOnly_cfi.py b/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_SQLiteOnly_cfi.py deleted file mode 100644 index c4e5f0fbe1252..0000000000000 --- a/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_SQLiteOnly_cfi.py +++ /dev/null @@ -1,22 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from DQMServices.Core.DQMStore_cfg import * -from CondCore.CondDB.CondDB_cfi import * -CondDBReference = CondDB.clone(connect = cms.string('sqlite_file:ROOTFILE_Test.db')) -CondDBReference.DBParameters.messageLevel = cms.untracked.int32(1) #3 for high verbosity - -ReferenceRetrieval = cms.ESSource("PoolDBESSource", - CondDBReference, - toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), - tag = cms.string('ROOTFILE_Test') - ) - ) - ) - -## RecordDataGetter = cms.EDAnalyzer("EventSetupRecordDataGetter", -## toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), -## data = cms.vstring('DQM_Cosmics_prompt') -## ) -## ), -## verbose = cms.untracked.bool(False) -## ) diff --git a/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi.py b/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi.py deleted file mode 100644 index 0ff9886c3baf4..0000000000000 --- a/CondTools/DQM/python/DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi.py +++ /dev/null @@ -1,24 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from DQMServices.Core.DQMStore_cfg import * - -dqmRefHistoRootFileGetter=cms.EDAnalyzer("DQMReferenceHistogramRootFileEventSetupAnalyzer") - -## from CondCore.CondDB.CondDB_cfi import * -## CondDBReference = CondDB.clone(connect = cms.string('sqlite_file:DQMReferenceHistogramTest.db')) -## CondDBReference.DBParameters.messageLevel = cms.untracked.int32(1) #3 for high verbosity -## ReferenceRetrieval = cms.ESSource("PoolDBESSource", -## CondDBReference, -## toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), -## tag = cms.string('ROOTFILE_DQM_Test10') -## ) -## ) -## ) -## -## RecordDataGetter = cms.EDAnalyzer("EventSetupRecordDataGetter", -## toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), -## data = cms.vstring('ROOTFILE_DQM_Test10') -## ) -## ), -## verbose = cms.untracked.bool(False) -## ) diff --git a/CondTools/DQM/src/DQMReferenceHistogramRootFileSourceHandler.cc b/CondTools/DQM/src/DQMReferenceHistogramRootFileSourceHandler.cc deleted file mode 100644 index 34d54d1c1a7f6..0000000000000 --- a/CondTools/DQM/src/DQMReferenceHistogramRootFileSourceHandler.cc +++ /dev/null @@ -1,76 +0,0 @@ -#include "CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/ParameterSet/interface/ParameterSetfwd.h" -#include -#include -#include - -namespace popcon { - DQMReferenceHistogramRootFileSourceHandler::DQMReferenceHistogramRootFileSourceHandler(const edm::ParameterSet& pset) - : m_name(pset.getUntrackedParameter("name", "DQMReferenceHistogramRootFileSourceHandler")), - m_file(pset.getUntrackedParameter("ROOTFile", "./file.root")), - m_zip(pset.getUntrackedParameter("zip", false)), - m_since(pset.getUntrackedParameter("firstSince", 1)), - m_debugMode(pset.getUntrackedParameter("debug", false)) {} - - DQMReferenceHistogramRootFileSourceHandler::~DQMReferenceHistogramRootFileSourceHandler() {} - - void DQMReferenceHistogramRootFileSourceHandler::getNewObjects() { - edm::LogInfo("DQMReferenceHistogramRootFileSourceHandler") - << "[DQMReferenceHistogramRootFileSourceHandler::getNewObjects] for PopCon application " << m_name; - if (m_debugMode) { - std::stringstream ss; - ss << "\n------- " << m_name << " - > getNewObjects\n"; - if (this->tagInfo().size > 0) { - //check what is already inside of the database - ss << "\ngot offlineInfo " << this->tagInfo().name << ",\n size " << this->tagInfo().size << ",\n" - << "last object valid since " << this->tagInfo().lastInterval.since << ",\n token " - << this->tagInfo().lastInterval.payloadId << ",\n UserText " << this->userTextLog() - << ";\n last entry info regarding the payload (if existing):" - << ",\n logId" << this->logDBEntry().logId - << ",\n last record with the correct tag (if existing) has been written in the db " - << this->logDBEntry().destinationDB << ",\n provenance " << this->logDBEntry().provenance << ",\n usertext " - << this->logDBEntry().usertext << ",\n iovtag " << this->logDBEntry().iovtag << ",\n timetype " - << this->logDBEntry().iovtimetype << ",\n payload index " << this->logDBEntry().payloadIdx - << ",\n payload class " << this->logDBEntry().payloadClass << ",\n payload token " - << this->logDBEntry().payloadToken << ",\n execution time " << this->logDBEntry().exectime - << ",\n execution message " << this->logDBEntry().execmessage << std::endl; - Ref payload = this->lastPayload(); - ss << "size of last payload " << payload->size() << std::endl; - } else { - ss << " First object for this tag " << std::endl; - } - edm::LogInfo("DQMReferenceHistogramRootFileSourceHandler") << ss.str(); - } - edm::LogInfo("DQMReferenceHistogramRootFileSourceHandler") << "runnumber/first since = " << m_since << std::endl; - if (m_since <= this->tagInfo().lastInterval.since) { - edm::LogInfo("DQMReferenceHistogramRootFileSourceHandler") - << "[DQMReferenceHistogramRootFileSourceHandler::getNewObjects] \nthe current starting iov " << m_since - << "\nis not compatible with the last iov (" << this->tagInfo().lastInterval.since << ") open for the object " - << this->logDBEntry().payloadClass << " \nin the db " << this->logDBEntry().destinationDB - << " \n NO TRANSFER NEEDED" << std::endl; - return; - } - edm::LogInfo("DQMReferenceHistogramRootFileSourceHandler") - << "[DQMReferenceHistogramRootFileSourceHandler::getNewObjects] " << m_name - << " getting data to be transferred " << std::endl; - FileBlob* rootFile = new FileBlob(m_file, m_zip); - /*if(!this->tagInfo().size) - m_since=1; - else - if (m_debugMode) - m_since=this->tagInfo().lastInterval.first+1; */ - if (rootFile->size() != 0) { - edm::LogInfo("DQMReferenceHistogramRootFileSourceHandler") - << "setting runnumber/first since = " << m_since << std::endl; - this->m_to_transfer.push_back(std::make_pair(rootFile, m_since)); - } else { - edm::LogError("DQMSummarySourceHandler") << "Root file " << m_file << " does not exist" << std::endl; - delete rootFile; - } - edm::LogInfo("DQMSummarySourceHandler") << "------- " << m_name << " - > getNewObjects" << std::endl; - } - - std::string DQMReferenceHistogramRootFileSourceHandler::id() const { return m_name; } -} // namespace popcon diff --git a/CondTools/DQM/test/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfg.py b/CondTools/DQM/test/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfg.py deleted file mode 100644 index e09ea459578ae..0000000000000 --- a/CondTools/DQM/test/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfg.py +++ /dev/null @@ -1,24 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process('ROOTFILERETRIEVER') - -# import of standard configurations -process.load("DQMServices.Core.DQMStore_cfg") -process.DQMStore.verbose = cms.untracked.int32(1) -process.DQMStore.verboseQT = cms.untracked.int32(0) - -# Put reference histograms into the EventSetup -process.load('CondTools/DQM/DQMReferenceHistogramRootFileEventSetupAnalyzer_OrcoffOnly_cfi') - -process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1)) -# Input source -process.source = cms.Source("EmptyIOVSource", - timetype = cms.string('runnumber'), - firstValue = cms.uint64(1), - lastValue = cms.uint64(1), - interval = cms.uint64(1) - ) - -process.load('CondTools/DQM/DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi') - -process.path = cms.Path(process.dqmRefHistoRootFileGetter) diff --git a/CondTools/DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py b/CondTools/DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py deleted file mode 100644 index e55ec890cedf7..0000000000000 --- a/CondTools/DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py +++ /dev/null @@ -1,96 +0,0 @@ -from __future__ import print_function -import FWCore.ParameterSet.Config as cms -from FWCore.ParameterSet.VarParsing import VarParsing - -process = cms.Process('XMLFILERETRIEVER') - -#################################################################### -# Set the options -#################################################################### -options = VarParsing('analysis') -options.register('unitTest', - False, - VarParsing.multiplicity.singleton, - VarParsing.varType.bool, - 'Run the unit test', - ) - -options.parseArguments() - -#################################################################### -# Get the GlobalTag -#################################################################### -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run3_data_prompt', '') -#process.GlobalTag.DumpStat = cms.untracked.bool(True) # optional if you want it to be verbose - -# import of standard configurations -process.load("DQMServices.Core.DQMStore_cfg") -process.DQMStore.verbose = cms.untracked.int32(1) -process.DQMStore.verboseQT = cms.untracked.int32(0) - -process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1)) - -# Input source -process.source = cms.Source("EmptyIOVSource", - timetype = cms.string('runnumber'), - firstValue = cms.uint64(1), - lastValue = cms.uint64(1), - interval = cms.uint64(1) - ) - -if options.unitTest: - print("running configuration in UnitTest Mode") - process.load("CondCore.CondDB.CondDB_cfi") - process.CondDB.connect = "sqlite_file:./testXML.db" - - process.XmlRetrieval_1 = cms.ESSource("PoolDBESSource", - process.CondDB, - BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'), - messageLevel = cms.untracked.int32(1), - timetype = cms.string('runnumber'), - toGet = cms.VPSet(cms.PSet(record = cms.string('DQMXMLFileRcd'), - tag = cms.string('XML_test'), - label=cms.untracked.string('XML_label') - ) - ) - ) - - process.RecordDataGetter = cms.EDAnalyzer("EventSetupRecordDataGetter", - toGet = cms.VPSet(cms.PSet(record = cms.string('DQMXMLFileRcd'), - data = cms.vstring('FileBlob/XML_label'))), - verbose = cms.untracked.bool(True) - ) - - -# process.ReferenceRetrieval = cms.ESSource("PoolDBESSource", -# CondDBSetup, -# connect = cms.string('sqlite_file:DQMReferenceHistogramTest.db'), -# BlobStreamerName = cms.untracked.string('TBufferBlobStreamingService'), -# messageLevel = cms.untracked.int32(1), #3 for high verbosity -# timetype = cms.string('runnumber'), -# toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), -# tag = cms.string('ROOTFILE_DQM') -# ) -# ) -# ) -# - -# process.RecordDataGetter = cms.EDAnalyzer("EventSetupRecordDataGetter", -# toGet = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'), -# data = cms.vstring('ROOTFILE_DQM_Test10') -# ) -# ), -# verbose = cms.untracked.bool(False) -# ) - -process.load('CondTools.DQM.DQMXMLFileEventSetupAnalyzer_cfi') -if(options.unitTest): - process.dqmXMLFileGetter.labelToGet = cms.string('XML_label') - process.path = cms.Path(process.RecordDataGetter+process.dqmXMLFileGetter) - -else: - process.dqmXMLFileGetter.labelToGet = cms.string('SiPixelDQMQTests') - process.path = cms.Path(process.dqmXMLFileGetter) - diff --git a/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py b/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py index afb6e2d723944..0b8417747ed5c 100755 --- a/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py +++ b/DQM/Integration/scripts/harvesting_tools/cmsHarvester.py @@ -4685,41 +4685,6 @@ def check_ref_hist_tag(self, tag_name): ########## - def create_es_prefer_snippet(self, dataset_name): - """Build the es_prefer snippet for the reference histograms. - - The building of the snippet is wrapped in some care-taking - code that figures out the name of the reference histogram set - and makes sure the corresponding tag exists. - - """ - - # Figure out the name of the reference histograms tag. - # NOTE: The existence of these tags has already been checked. - ref_hist_tag_name = self.ref_hist_mappings[dataset_name] - - connect_name = self.frontier_connection_name["refhists"] - connect_name += self.db_account_name_cms_cond_dqm_summary() - record_name = "DQMReferenceHistogramRootFileRcd" - - # Build up the code snippet. - code_lines = [] - code_lines.append("from CondCore.DBCommon.CondDBSetup_cfi import *") - code_lines.append("process.ref_hist_source = cms.ESSource(\"PoolDBESSource\", CondDBSetup,") - code_lines.append(" connect = cms.string(\"%s\")," % connect_name) - code_lines.append(" toGet = cms.VPSet(cms.PSet(record = cms.string(\"%s\")," % record_name) - code_lines.append(" tag = cms.string(\"%s\"))," % ref_hist_tag_name) - code_lines.append(" )") - code_lines.append(" )") - code_lines.append("process.es_prefer_ref_hist_source = cms.ESPrefer(\"PoolDBESSource\", \"ref_hist_source\")") - - snippet = "\n".join(code_lines) - - # End of create_es_prefer_snippet. - return snippet - - ########## - def create_harvesting_config(self, dataset_name): """Create the Python harvesting configuration for harvesting. diff --git a/DQMOffline/Muon/test/DQMOffline_SecondStep_cff.py b/DQMOffline/Muon/test/DQMOffline_SecondStep_cff.py index 9efad2c8c54bb..f9aa6875bc969 100644 --- a/DQMOffline/Muon/test/DQMOffline_SecondStep_cff.py +++ b/DQMOffline/Muon/test/DQMOffline_SecondStep_cff.py @@ -3,7 +3,6 @@ import FWCore.ParameterSet.Config as cms -from CondTools.DQM.DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi import * from DQMServices.Components.DQMMessageLoggerClient_cff import * from DQMOffline.Ecal.ecal_dqm_client_offline_cff import * @@ -30,8 +29,7 @@ #dqmFEDIntegrityClient -DQMOffline_SecondStepDPG = cms.Sequence( #dqmRefHistoRootFileGetter * - DQMOffline_SecondStep_PreDPG * +DQMOffline_SecondStepDPG = cms.Sequence( DQMOffline_SecondStep_PreDPG * DQMMessageLoggerClientSeq ) @@ -54,19 +52,16 @@ DQMOffline_SecondStep_PrePOG = cms.Sequence( muonQualityTests ) -DQMOffline_SecondStepPOG = cms.Sequence( dqmRefHistoRootFileGetter * - DQMOffline_SecondStep_PrePOG * +DQMOffline_SecondStepPOG = cms.Sequence( DQMOffline_SecondStep_PrePOG * DQMMessageLoggerClientSeq ) -DQMOffline_SecondStep = cms.Sequence( dqmRefHistoRootFileGetter * - DQMOffline_SecondStep_PreDPG * +DQMOffline_SecondStep = cms.Sequence( DQMOffline_SecondStep_PreDPG * DQMOffline_SecondStep_PrePOG * DQMMessageLoggerClientSeq ) DQMOffline_SecondStep_PrePOGMC = cms.Sequence( bTagCollectorSequence ) -DQMOffline_SecondStepPOGMC = cms.Sequence( dqmRefHistoRootFileGetter * - DQMOffline_SecondStep_PrePOGMC * +DQMOffline_SecondStepPOGMC = cms.Sequence( DQMOffline_SecondStep_PrePOGMC * DQMMessageLoggerClientSeq )