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

[14_0_X][DAQ] DaqDirector fixes and cleanup, and removal of EvFOutputModule #43850

Merged
merged 2 commits into from
Feb 3, 2024
Merged

[14_0_X][DAQ] DaqDirector fixes and cleanup, and removal of EvFOutputModule #43850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd1c8e
fix autofs mount (mkdir could fail first time)
smorovic Nov 22, 2023
0a7e228
- remove EvFOutputModule which was replaced by GlobalEvFOutputModule
smorovic Feb 2, 2024
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
16 changes: 4 additions & 12 deletions EventFilter/Utilities/interface/EvFDaqDirector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <cstring>
#include <cstdio>

#include <oneapi/tbb/concurrent_hash_map.h>
#include <boost/asio.hpp>

class SystemBounds;
Expand Down Expand Up @@ -68,7 +67,6 @@ namespace evf {
void initRun();
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
void preallocate(edm::service::SystemBounds const& bounds);
void preBeginJob(edm::PathsAndConsumesOfModulesBase const&, edm::ProcessContext const&);
void preBeginRun(edm::GlobalContext const& globalContext);
void postEndRun(edm::GlobalContext const& globalContext);
void preGlobalEndLumi(edm::GlobalContext const& globalContext);
Expand Down Expand Up @@ -186,10 +184,10 @@ namespace evf {
filesToDeletePtr_ = filesToDelete;
}

void checkTransferSystemPSet(edm::ProcessContext const& pc);
void checkMergeTypePSet(edm::ProcessContext const& pc);
std::string getStreamDestinations(std::string const& stream) const;
std::string getStreamMergeType(std::string const& stream, MergeType defaultType);
std::string getStreamDestinations(std::string const&) const { return std::string(""); }
std::string getStreamMergeType(std::string const&, MergeType defaultType) const {
return MergeTypeNames_[defaultType];
}
static struct flock make_flock(short type, short whence, off_t start, off_t len, pid_t pid);
bool inputThrottled();
bool lumisectionDiscarded(unsigned int ls);
Expand Down Expand Up @@ -225,9 +223,6 @@ namespace evf {
bool fileBrokerUseLocalLock_;
unsigned int fuLockPollInterval_;
bool outputAdler32Recheck_;
bool requireTSPSet_;
std::string selectedTransferMode_;
std::string mergeTypePset_;
bool directorBU_;
std::string hltSourceDirectory_;

Expand Down Expand Up @@ -282,9 +277,6 @@ namespace evf {
std::string stopFilePathPid_;
unsigned int stop_ls_override_ = 0;

std::shared_ptr<Json::Value> transferSystemJson_;
tbb::concurrent_hash_map<std::string, std::string> mergeTypeMap_;

//values initialized in .cc file
static const std::vector<std::string> MergeTypeNames_;

Expand Down
108 changes: 0 additions & 108 deletions EventFilter/Utilities/interface/EvFOutputModule.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions EventFilter/Utilities/plugins/modules.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "EventFilter/Utilities/interface/EvFDaqDirector.h"
#include "EventFilter/Utilities/interface/EvFOutputModule.h"
#include "EventFilter/Utilities/interface/FastMonitoringService.h"
#include "EventFilter/Utilities/interface/FedRawDataInputSource.h"
#include "EventFilter/Utilities/interface/DAQSource.h"
Expand Down Expand Up @@ -29,7 +28,6 @@ DEFINE_FWK_SERVICE(EvFDaqDirector);
DEFINE_FWK_MODULE(ExceptionGenerator);
DEFINE_FWK_MODULE(EvFFEDSelector);
DEFINE_FWK_MODULE(EvFFEDExcluder);
DEFINE_FWK_MODULE(EvFOutputModule);
DEFINE_FWK_MODULE(DaqFakeReader);
DEFINE_FWK_INPUT_SOURCE(FedRawDataInputSource);
DEFINE_FWK_INPUT_SOURCE(DAQSource);
Loading