Skip to content

Commit 0de23a3

Browse files
denniskleindennisklein
committed
fix: flatc warnings
fix #1510
1 parent a6dd0ca commit 0de23a3

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎examples/advanced/Tutorial3/MQ/data/PayloadDigi.fbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ table Digi {
55
y:int;
66
z:int;
77
timestamp:double;
8-
timestampError:double;
8+
timestamp_error:double;
99
}
1010

1111
table DigiPayload {

‎examples/advanced/Tutorial3/MQ/data/PayloadHit.fbs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
namespace TestDetectorFlat;
22

33
table Hit {
4-
detID:int;
5-
mcIndex:int;
4+
det_id:int;
5+
mc_index:int;
66
x:double;
77
y:double;
88
z:double;
99
dx:double;
1010
dy:double;
1111
dz:double;
1212
timestamp:double;
13-
timestampError:double;
13+
timestamp_error:double;
1414
}
1515

1616
table HitPayload {

‎examples/advanced/Tutorial3/MQ/fileSink/FileSinkFlatBuffers.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
@@ -32,7 +32,7 @@ void FileSink<TestDetectorFlatBuffers>::InitTask()
3232
for (auto it = hits->begin(); it != hits->end(); ++it) {
3333
TVector3 pos((*it)->x(), (*it)->y(), (*it)->z());
3434
TVector3 dpos((*it)->dx(), (*it)->dy(), (*it)->dz());
35-
new ((*fOutput)[it - hits->begin()]) FairTestDetectorHit((*it)->detID(), (*it)->mcIndex(), pos, dpos);
35+
new ((*fOutput)[it - hits->begin()]) FairTestDetectorHit((*it)->det_id(), (*it)->mc_index(), pos, dpos);
3636
// LOG(warn) << " " << (*it)->detID() << " " << (*it)->x() << " " << (*it)->y() << " " << (*it)->z() << " "
3737
// << (*it)->dx() << " " << (*it)->dy() << " " << (*it)->dz();
3838
}

‎examples/advanced/Tutorial3/MQ/processorTask/MQRecoTaskFlatBuffers.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
@@ -31,9 +31,9 @@ void MQRecoTask<TestDetectorFlatBuffers>::Exec(Option_t* opt)
3131
new ((*fRecoTask.fDigiArray)[it - digis->begin()])
3232
FairTestDetectorDigi((*it)->x(), (*it)->y(), (*it)->z(), (*it)->timestamp());
3333
static_cast<FairTestDetectorDigi*>(((*fRecoTask.fDigiArray)[it - digis->begin()]))
34-
->SetTimeStampError((*it)->timestampError());
34+
->SetTimeStampError((*it)->timestamp_error());
3535
// LOG(info) << (*it)->x() << " " << (*it)->y() << " " << (*it)->z() << " " << (*it)->timestamp() << " " <<
36-
// (*it)->timestampError();
36+
// (*it)->timestamp_error();
3737
}
3838

3939
if (!fRecoTask.fDigiArray) {
@@ -53,16 +53,16 @@ void MQRecoTask<TestDetectorFlatBuffers>::Exec(Option_t* opt)
5353
// LOG(warn) << " " << hit->GetDetectorID() << " " << hit->GetX() << " " << hit->GetY() << " " << hit->GetZ() <<
5454
// " " << hit->GetDx() << " " << hit->GetDy() << " " << hit->GetDz();
5555
TestDetectorFlat::HitBuilder hb(*builder);
56-
hb.add_detID(hit->GetDetectorID()); // detID:int
57-
hb.add_mcIndex(hit->GetRefIndex()); // GetRefIndex:int
58-
hb.add_x(hit->GetX()); // x:double
59-
hb.add_y(hit->GetY()); // y:double
60-
hb.add_z(hit->GetZ()); // z:double
61-
hb.add_dx(hit->GetDx()); // dx:double
62-
hb.add_dy(hit->GetDy()); // dy:double
63-
hb.add_dz(hit->GetDz()); // dz:double
64-
hb.add_timestamp(hit->GetTimeStamp()); // timestamp:double
65-
hb.add_timestampError(hit->GetTimeStampError()); // timestampError:double
56+
hb.add_det_id(hit->GetDetectorID()); // det_id:int
57+
hb.add_mc_index(hit->GetRefIndex()); // GetRefIndex:int
58+
hb.add_x(hit->GetX()); // x:double
59+
hb.add_y(hit->GetY()); // y:double
60+
hb.add_z(hit->GetZ()); // z:double
61+
hb.add_dx(hit->GetDx()); // dx:double
62+
hb.add_dy(hit->GetDy()); // dy:double
63+
hb.add_dz(hit->GetDz()); // dz:double
64+
hb.add_timestamp(hit->GetTimeStamp()); // timestamp:double
65+
hb.add_timestamp_error(hit->GetTimeStampError()); // timestamp_error:double
6666
hits[i] = hb.Finish();
6767
}
6868
auto hvector = builder->CreateVector(hits, numEntries);

‎examples/advanced/Tutorial3/MQ/samplerTask/DigiLoaderFlatBuffers.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
2+
* Copyright (C) 2014-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
33
* *
44
* This software is distributed under the terms of the *
55
* GNU Lesser General Public Licence (LGPL) version 3, *
@@ -32,11 +32,11 @@ void DigiLoader<TestDetectorFlatBuffers>::Exec(Option_t* /*opt*/)
3232
}
3333

3434
TestDetectorFlat::DigiBuilder db(*builder);
35-
db.add_x(digi->GetX()); // x:int
36-
db.add_y(digi->GetY()); // y:int
37-
db.add_z(digi->GetZ()); // z:int
38-
db.add_timestamp(digi->GetTimeStamp()); // timestamp:double
39-
db.add_timestampError(digi->GetTimeStampError()); // timestampError:double
35+
db.add_x(digi->GetX()); // x:int
36+
db.add_y(digi->GetY()); // y:int
37+
db.add_z(digi->GetZ()); // z:int
38+
db.add_timestamp(digi->GetTimeStamp()); // timestamp:double
39+
db.add_timestamp_error(digi->GetTimeStampError()); // timestamp_error:double
4040

4141
digis[i] = db.Finish();
4242
// LOG(info) << digi->GetX() << " " << digi->GetY() << " " << digi->GetZ() << " " << digi->GetTimeStamp() << " "

0 commit comments

Comments
 (0)