Skip to content

Commit 21e1640

Browse files
committed
changed Location parameter to reference
1 parent 291f5de commit 21e1640

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEventJSONSerializer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class VisualisationEventJSONSerializer : public VisualisationEventSerializer
5656

5757
public:
5858
bool fromFile(VisualisationEvent& event, std::string fileName) override;
59-
void toFile(const VisualisationEvent& event, Location location) override;
59+
void toFile(const VisualisationEvent& event, Location& location) override;
6060
~VisualisationEventJSONSerializer() override = default;
6161
};
6262

EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEventOpenGLSerializer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class VisualisationEventOpenGLSerializer : public VisualisationEventSerializer
3838
public:
3939
const std::string serializerName() const override { return std::string("VisualisationEventOpenGLSerializer"); }
4040
bool fromFile(VisualisationEvent& event, std::string fileName) override;
41-
void toFile(const VisualisationEvent& event, Location location) override;
41+
void toFile(const VisualisationEvent& event, Location& location) override;
4242
~VisualisationEventOpenGLSerializer() override = default;
4343
};
4444

EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEventROOTSerializer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class VisualisationEventROOTSerializer : public VisualisationEventSerializer
4444
public:
4545
[[nodiscard]] const std::string serializerName() const override { return std::string("VisualisationEventROOTSerializer"); }
4646
bool fromFile(VisualisationEvent& event, std::string fileName) override;
47-
void toFile(const VisualisationEvent& event, Location location) override;
47+
void toFile(const VisualisationEvent& event, Location& location) override;
4848
~VisualisationEventROOTSerializer() override = default;
4949
};
5050

EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEventSerializer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class VisualisationEventSerializer
4646
static o2::dataformats::GlobalTrackID deserialize(unsigned source, unsigned index, unsigned flags);
4747
static VisualisationEventSerializer* getInstance(std::string ext) { return instances[ext]; }
4848
virtual bool fromFile(VisualisationEvent& event, std::string fileName) = 0;
49-
virtual void toFile(const VisualisationEvent& event, Location location) = 0;
49+
virtual void toFile(const VisualisationEvent& event, Location& location) = 0;
5050
virtual const std::string serializerName() const = 0;
5151
virtual ~VisualisationEventSerializer() = default;
5252
};

EventVisualisation/DataConverter/src/VisualisationEventJSONSerializer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ using namespace rapidjson;
2929
namespace o2::event_visualisation
3030
{
3131

32-
void VisualisationEventJSONSerializer::toFile(const VisualisationEvent& event, Location location)
32+
void VisualisationEventJSONSerializer::toFile(const VisualisationEvent& event, Location& location)
3333
{
3434
std::string fileName = location.fileName();
3535
std::string json = toJson(event);

EventVisualisation/DataConverter/src/VisualisationEventOpenGLSerializer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const auto CALT = "CALT"; // calo PID
8383

8484
const auto FINE = "FINE"; //
8585

86-
void VisualisationEventOpenGLSerializer::toFile(const VisualisationEvent& event, Location location)
86+
void VisualisationEventOpenGLSerializer::toFile(const VisualisationEvent& event, Location& location)
8787
{
8888
std::string fileName = location.fileName();
8989
static const std::vector<std::string> det_coma = {

EventVisualisation/DataConverter/src/VisualisationEventROOTSerializer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ bool VisualisationEventROOTSerializer::existUInt64(TFile& f, const char* name)
9393
return true;
9494
}
9595

96-
void VisualisationEventROOTSerializer::toFile(const VisualisationEvent& event, Location location)
96+
void VisualisationEventROOTSerializer::toFile(const VisualisationEvent& event, Location& location)
9797
{
9898
std::string fileName = location.fileName();
9999
TFile f(fileName.c_str(), "recreate");

EventVisualisation/DataConverter/src/converter.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
using namespace std::chrono_literals;
3636

3737
// source file name, destination (not existing) file name, if limit > 0 then limit EACH type of data
38-
int singleFileConversion(const std::string& src, const o2::event_visualisation::Location& dst, const int limit = -1)
38+
int singleFileConversion(const std::string& src, o2::event_visualisation::Location& dst, const int limit = -1)
3939
{
4040
LOGF(info, "Translate: %s -> %s", src, dst.fileName());
4141
o2::event_visualisation::VisualisationEvent vEvent;

EventVisualisation/Workflow/src/EveWorkflowHelper.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -523,13 +523,13 @@ void EveWorkflowHelper::save(const std::string& jsonPath, const std::string& ext
523523
mEvent.setEveVersion(o2_eve_version);
524524
FileProducer producer(jsonPath, ext);
525525
producer.reduceNumberOfFiles(numberOfFiles);
526-
527-
VisualisationEventSerializer::getInstance(ext)->toFile(mEvent, Location({.fileName = producer.newFileName(),
528-
.port = receiverPort,
529-
.timeout = receiverTimeout,
530-
.host = receiverHostname,
531-
.toFile = !useOnlySockets,
532-
.toSocket = !useOnlyFiles}));
526+
Location location({.fileName = producer.newFileName(),
527+
.port = receiverPort,
528+
.timeout = receiverTimeout,
529+
.host = receiverHostname,
530+
.toFile = !useOnlySockets,
531+
.toSocket = !useOnlyFiles});
532+
VisualisationEventSerializer::getInstance(ext)->toFile(mEvent, location);
533533
}
534534

535535
std::vector<PNT>

0 commit comments

Comments
 (0)