Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Created setupSiteLocalConfig #34915

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Created setupSiteLocalConfig #34915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions FWCore/Services/bin/cmsGetFnConnect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#include "FWCore/Catalog/interface/SiteLocalConfig.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Services/src/SiteLocalConfigService.h"
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
#include "FWCore/Services/interface/setupSiteLocalConfig.h"
#include "FWCore/Utilities/interface/Exception.h"
#include <iostream>
#include <cstring>
Expand All @@ -27,11 +26,7 @@ int main(int argc, char* argv[]) {
}

try {
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
edm::ServiceRegistry::Operate operate(slcToken);
auto operate = edm::setupSiteLocalConfig();

edm::Service<edm::SiteLocalConfig> localconfservice;

Expand Down
16 changes: 16 additions & 0 deletions FWCore/Services/interface/setupSiteLocalConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#ifndef FWCore_Services_setupSiteLocalConfig_h
#define FWCore_Services_setupSiteLocalConfig_h

/** \function edm::setupSiteLocalConfig

Description: Setups up the SiteLocalConfig service.

Usage:
*/

#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"

namespace edm {
ServiceRegistry::Operate setupSiteLocalConfig();
} // namespace edm
#endif
22 changes: 22 additions & 0 deletions FWCore/Services/src/setupSiteLocalConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
///////////////////////////////////////
//
// data catalogs are filled in "parse"
//
///////////////////////////////////////

//<<<<<< INCLUDES >>>>>>

#include "FWCore/Services/src/SiteLocalConfigService.h"
#include "FWCore/Services/interface/setupSiteLocalConfig.h"

#include <memory>

namespace edm {
ServiceRegistry::Operate setupSiteLocalConfig() {
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
return edm::ServiceRegistry::Operate(slcToken);
}
} // namespace edm
9 changes: 2 additions & 7 deletions IOPool/Common/bin/EdmCopyUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,13 @@
#include "Utilities/StorageFactory/interface/Storage.h"
#include "Utilities/StorageFactory/interface/StorageFactory.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
#include "FWCore/Services/src/SiteLocalConfigService.h"
#include "FWCore/Services/interface/setupSiteLocalConfig.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Catalog/interface/InputFileCatalog.h"
#include "FWCore/Catalog/interface/SiteLocalConfig.h"

static int copy_files(const boost::program_options::variables_map& vm) {
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
edm::ServiceRegistry::Operate operate(slcToken);
auto operate = edm::setupSiteLocalConfig();

auto in = (vm.count("file") ? vm["file"].as<std::vector<std::string> >() : std::vector<std::string>());

Expand Down
8 changes: 2 additions & 6 deletions IOPool/Common/bin/EdmFileUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/PluginManager/interface/PluginManager.h"
#include "FWCore/PluginManager/interface/standard.h"
#include "FWCore/Services/src/SiteLocalConfigService.h"
#include "FWCore/Services/interface/setupSiteLocalConfig.h"
#include "FWCore/Utilities/interface/Adler32Calculator.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
Expand Down Expand Up @@ -76,11 +76,7 @@ int main(int argc, char* argv[]) {

int rc = 0;
try {
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
edm::ServiceRegistry::Operate operate(slcToken);
auto operate = edm::setupSiteLocalConfig();

std::vector<std::string> in =
(vm.count("file") ? vm["file"].as<std::vector<std::string> >() : std::vector<std::string>());
Expand Down
9 changes: 2 additions & 7 deletions IOPool/Common/bin/EdmProvDump.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#include "FWCore/Catalog/interface/InputFileCatalog.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/Registry.h"
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
#include "FWCore/Services/src/SiteLocalConfigService.h"
#include "FWCore/Services/interface/setupSiteLocalConfig.h"

#include "FWCore/Utilities/interface/Algorithms.h"
#include "FWCore/Utilities/interface/Exception.h"
Expand Down Expand Up @@ -333,11 +332,7 @@ void HistoryNode::printTopLevelPSetsHistory(ParameterSetMap const& iPSM,
namespace {
std::unique_ptr<TFile> makeTFileWithLookup(std::string const& filename) {
// See if it is a logical file name.
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig>>(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
edm::ServiceRegistry::Operate operate(slcToken);
auto operate = edm::setupSiteLocalConfig();
std::string override;
std::vector<std::string> fileNames;
fileNames.push_back(filename);
Expand Down
14 changes: 3 additions & 11 deletions IOPool/Streamer/test/ReadStreamerFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Disclaimer: Most of the code here is randomly written during
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/PluginManager/interface/PluginManager.h"
#include "FWCore/PluginManager/interface/standard.h"
#include "FWCore/Services/src/SiteLocalConfigService.h"
#include "FWCore/Services/interface/setupSiteLocalConfig.h"
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"

#include <iostream>
Expand Down Expand Up @@ -71,11 +71,7 @@ int readSingleStream(bool verbose) {

int readMultipleStreams(bool verbose) {
try {
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
edm::ServiceRegistry::Operate operate(slcToken);
auto operate = edm::setupSiteLocalConfig();

int evCount = 0;
std::vector<std::string> streamFiles;
Expand Down Expand Up @@ -122,11 +118,7 @@ int readMultipleStreams(bool verbose) {

int readInvalidLFN(bool verbose) {
try {
std::unique_ptr<edm::SiteLocalConfig> slcptr =
std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
edm::ServiceRegistry::Operate operate(slcToken);
auto operate = edm::setupSiteLocalConfig();

int evCount = 0;
std::vector<std::string> streamFiles;
Expand Down