Skip to content

Commit 3bf4d72

Browse files
committed
Please consider the following formatting changes
1 parent be4cb11 commit 3bf4d72

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

Framework/Core/include/Framework/AnalysisSupportHelpers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ struct AnalysisSupportHelpers {
4747
std::vector<InputSpec> const& requestedTimestampedCCDBObjects,
4848
DataProcessorSpec& publisher);
4949

50-
/// Match all inputs of kind ATSK and write them to a ROOT file,
51-
/// one root file per originating task.
52-
static DataProcessorSpec getOutputObjHistSink(ConfigContext const&);
50+
/// Match all inputs of kind ATSK and write them to a ROOT file,
51+
/// one root file per originating task.
52+
static DataProcessorSpec getOutputObjHistSink(ConfigContext const&);
5353
/// writes inputs of kind AOD to file
5454
static DataProcessorSpec getGlobalAODSink(ConfigContext const&);
5555
/// Get the data director

Framework/Core/src/AnalysisSupportHelpers.cxx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ void AnalysisSupportHelpers::addMissingOutputsToBuilder(std::vector<InputSpec> c
208208
}
209209

210210
void AnalysisSupportHelpers::addMissingOutputsToAnalysisCCDBFetcher(
211-
std::vector<OutputSpec> const& providedTimestampedCDBObjects,
212-
std::vector<InputSpec> const& requestedTimestampedCCDBObjects,
213-
DataProcessorSpec& publisher)
211+
std::vector<OutputSpec> const& providedTimestampedCDBObjects,
212+
std::vector<InputSpec> const& requestedTimestampedCCDBObjects,
213+
DataProcessorSpec& publisher)
214214
{
215215
for (auto& input : requestedTimestampedCCDBObjects) {
216216
auto concrete = DataSpecUtils::asConcreteDataMatcher(input);
@@ -220,16 +220,16 @@ void AnalysisSupportHelpers::addMissingOutputsToAnalysisCCDBFetcher(
220220
if ((i.type == VariantType::String) && (i.name.find("input:") != std::string::npos)) {
221221
auto value = i.defaultValue.get<std::string>();
222222
std::cout << "XXX " << value << std::endl;
223-
// auto spec = DataSpecUtils::fromMetadataString(i.defaultValue.get<std::string>());
224-
// auto j = std::find_if(publisher.inputs.begin(), publisher.inputs.end(), [&](auto x) { return x.binding == spec.binding; });
225-
// if (j == publisher.inputs.end()) {
226-
// publisher.inputs.push_back(spec);
227-
// }
228-
// if (DataSpecUtils::partialMatch(spec, AODOrigins)) {
229-
// DataSpecUtils::updateInputList(requestedAODs, std::move(spec));
230-
// } else if (DataSpecUtils::partialMatch(spec, header::DataOrigin{"DYN"})) {
231-
// DataSpecUtils::updateInputList(requestedDYNs, std::move(spec));
232-
// }
223+
// auto spec = DataSpecUtils::fromMetadataString(i.defaultValue.get<std::string>());
224+
// auto j = std::find_if(publisher.inputs.begin(), publisher.inputs.end(), [&](auto x) { return x.binding == spec.binding; });
225+
// if (j == publisher.inputs.end()) {
226+
// publisher.inputs.push_back(spec);
227+
// }
228+
// if (DataSpecUtils::partialMatch(spec, AODOrigins)) {
229+
// DataSpecUtils::updateInputList(requestedAODs, std::move(spec));
230+
// } else if (DataSpecUtils::partialMatch(spec, header::DataOrigin{"DYN"})) {
231+
// DataSpecUtils::updateInputList(requestedDYNs, std::move(spec));
232+
// }
233233
}
234234
}
235235
}

Framework/Core/src/ArrowSupport.cxx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,6 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
455455
ac.providedTIMs.clear();
456456
ac.requestedTIMs.clear();
457457

458-
459458
auto inputSpecLessThan = [](InputSpec const& lhs, InputSpec const& rhs) { return DataSpecUtils::describe(lhs) < DataSpecUtils::describe(rhs); };
460459
auto outputSpecLessThan = [](OutputSpec const& lhs, OutputSpec const& rhs) { return DataSpecUtils::describe(lhs) < DataSpecUtils::describe(rhs); };
461460

@@ -564,8 +563,6 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
564563
}
565564
}
566565

567-
568-
569566
// replace writer as some outputs may have become dangling and some are now consumed
570567
auto [outputsInputs, isDangling] = WorkflowHelpers::analyzeOutputs(workflow);
571568

0 commit comments

Comments
 (0)