Skip to content

Commit 47a07e7

Browse files
Merge pull request #1 from alibuild/alibot-cleanup-14683
Please consider the following formatting changes to #14683
2 parents 4daaea6 + 8a02b3c commit 47a07e7

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Detectors/AOD/include/AODProducerWorkflow/AODProducerWorkflowSpec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ enum struct AODProducerStreamerFlags : uint8_t {
217217
class AODProducerWorkflowDPL : public Task
218218
{
219219
public:
220-
AODProducerWorkflowDPL(GID::mask_t src, std::shared_ptr<DataRequest> dataRequest, std::shared_ptr<o2::base::GRPGeomRequest> gr, bool enableSV, bool useMC = true, bool enableFITextra = false, bool enableTRDextra = false) : mUseMC(useMC), mEnableSV(enableSV), mEnableFITextra(enableFITextra), mEnableTRDextra(enableTRDextra), mInputSources(src), mDataRequest(dataRequest), mGGCCDBRequest(gr) {}
220+
AODProducerWorkflowDPL(GID::mask_t src, std::shared_ptr<DataRequest> dataRequest, std::shared_ptr<o2::base::GRPGeomRequest> gr, bool enableSV, bool useMC = true, bool enableFITextra = false, bool enableTRDextra = false) : mUseMC(useMC), mEnableSV(enableSV), mEnableFITextra(enableFITextra), mEnableTRDextra(enableTRDextra), mInputSources(src), mDataRequest(dataRequest), mGGCCDBRequest(gr) {}
221221
~AODProducerWorkflowDPL() override = default;
222222
void init(InitContext& ic) final;
223223
void run(ProcessingContext& pc) final;
@@ -527,7 +527,7 @@ class AODProducerWorkflowDPL : public Task
527527

528528
template <typename TracksQACursorType>
529529
void addToTracksQATable(TracksQACursorType& tracksQACursor, TrackQA& trackQAInfoHolder);
530-
530+
531531
template <typename TRDsExtraCursorType>
532532
void addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx);
533533

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
517517
TracksCovCursorType& tracksCovCursor,
518518
TracksExtraCursorType& tracksExtraCursor,
519519
TracksQACursorType& tracksQACursor,
520-
TRDsExtraCursor& trdsExtraCursor,
520+
TRDsExtraCursor& trdsExtraCursor,
521521
AmbigTracksCursorType& ambigTracksCursor,
522522
MFTTracksCursorType& mftTracksCursor,
523523
MFTTracksCovCursorType& mftTracksCovCursor,
@@ -2000,7 +2000,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
20002000
if (mEnableTRDextra) {
20012001
trdExtraCursor = createTableCursor<o2::aod::TRDsExtra>(pc);
20022002
}
2003-
2003+
20042004
// Declare MC cursors type without adding the output for a table
20052005
o2::framework::Produces<o2::aod::McCollisionLabels> mcColLabelsCursor;
20062006
o2::framework::Produces<o2::aod::McCollisions> mcCollisionsCursor;
@@ -2343,7 +2343,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
23432343
// so that all unassigned tracks are stored in the beginning of the table together
23442344
auto& trackRef = primVer2TRefs.back(); // references to unassigned tracks are at the end
23452345
// fixme: interaction time is undefined for unassigned tracks (?)
2346-
fillTrackTablesPerCollision(-1, std::uint64_t(-1), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor,trdExtraCursor,
2346+
fillTrackTablesPerCollision(-1, std::uint64_t(-1), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor,
23472347
ambigTracksCursor, mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
23482348
fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);
23492349

@@ -3356,18 +3356,18 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
33563356
OutputSpec{"TFF", "TFFilename"},
33573357
OutputSpec{"AMD", "AODMetadataKeys"},
33583358
OutputSpec{"AMD", "AODMetadataVals"}};
3359-
/// Extra tables
3360-
if (enableFITextra) {
3361-
outputs.insert(outputs.end(),
3362-
{OutputForTable<FDDsExtra>::spec(),
3363-
OutputForTable<FT0sExtra>::spec(),
3364-
OutputForTable<FV0AsExtra>::spec()});
3365-
}
3366-
if (enableTRDextra) {
3367-
outputs.push_back(OutputForTable<TRDsExtra>::spec());
3368-
dataRequest->inputs.emplace_back("trdlocalgainfactors", "TRD", "LOCALGAINFACTORS", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/LocalGainFactor"));
3369-
dataRequest->inputs.emplace_back("trdnoisemap", "TRD", "NOISEMAP", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/NoiseMapMCM"));
3370-
}
3359+
/// Extra tables
3360+
if (enableFITextra) {
3361+
outputs.insert(outputs.end(),
3362+
{OutputForTable<FDDsExtra>::spec(),
3363+
OutputForTable<FT0sExtra>::spec(),
3364+
OutputForTable<FV0AsExtra>::spec()});
3365+
}
3366+
if (enableTRDextra) {
3367+
outputs.push_back(OutputForTable<TRDsExtra>::spec());
3368+
dataRequest->inputs.emplace_back("trdlocalgainfactors", "TRD", "LOCALGAINFACTORS", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/LocalGainFactor"));
3369+
dataRequest->inputs.emplace_back("trdnoisemap", "TRD", "NOISEMAP", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/NoiseMapMCM"));
3370+
}
33713371

33723372
if (useMC) {
33733373
outputs.insert(outputs.end(),

0 commit comments

Comments
 (0)