Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename device property to have a common format and some code cleanup.

Browse Source 
FairMQDevice: Rename property for socket rate logging to have common format (old name is still available for compatibility).
FairMQ: Avoid using std namespace in class headers (may require adding std namespace to some child devices).
FairMQ: A bit of code cleanup
FairMQConfigurable: Stop with an error if a property assignment failed due to incorrect key.
This commit is contained in:
Alexey Rybalchenko
2015-03-26 15:03:14 +01:00
committed by Florian Uhlig
parent 61f24eb73a
commit 26a1033e9d
30 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fairmq/devices/GenericSampler.h
View File

@@ -8,9 +8,6 @@
#ifndef GENERICSAMPLER_H
#define GENERICSAMPLER_H
#include <vector>
#include <iostream>
@@ -18,12 +15,6 @@
#include <boost/bind.hpp>
#include <boost/timer/timer.hpp>
#include "TList.h"
#include "TObjString.h"
#include "TClonesArray.h"
#include "TROOT.h"
#include "FairMQDevice.h"
#include "FairMQLogger.h"
@@ -44,7 +35,7 @@ class GenericSampler: public FairMQDevice, public SamplerPolicy, public OutputPo
{
//using SamplerPolicy::GetDataBranch; // get data from file
//using OutputPolicy::message; // serialize method
public:
enum {
InputFile = FairMQDevice::Last,
@@ -57,15 +48,15 @@ class GenericSampler: public FairMQDevice, public SamplerPolicy, public OutputPo
virtual void SetTransport(FairMQTransportFactory* factory);
void ResetEventCounter();
virtual void ListenToCommands();
template <typename... Args>
void SetFileProperties(Args&... args)
{
SamplerPolicy::SetFileProperties(args...);
}
virtual void SetProperty(const int key, const string& value, const int slot = 0);
virtual string GetProperty(const int key, const string& default_ = "", const int slot = 0);
virtual void SetProperty(const int key, const std::string& value, const int slot = 0);
virtual std::string GetProperty(const int key, const std::string& default_ = "", const int slot = 0);
virtual void SetProperty(const int key, const int value, const int slot = 0);
virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0);
@@ -84,9 +75,9 @@ protected:
virtual void Run();
protected:
string fInputFile; // Filename of a root file containing the simulated digis.
string fParFile;
string fBranch; // The name of the sub-detector branch to stream the digis from.
std::string fInputFile; // Filename of a root file containing the simulated digis.
std::string fParFile;
std::string fBranch; // The name of the sub-detector branch to stream the digis from.
int fNumEvents;
int fEventRate;
int fEventCounter;