Skip to content

Commit 4ce2111

Browse files
committed
formatting updates
1 parent 8f020f9 commit 4ce2111

File tree

3 files changed

+32
-39
lines changed

3 files changed

+32
-39
lines changed

FWCore/Framework/src/ModuleHolderT.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace edm::maker {
3131
return OutputModuleCommunicatorT<T>::createIfNeeded(m_mod.get());
3232
}
3333

34-
namespace {
34+
namespace {
3535
template <typename T>
3636
bool mustPrefetchMayGet();
3737

@@ -101,7 +101,7 @@ namespace edm::maker {
101101

102102
} // namespace
103103

104-
template <typename T>
104+
template <typename T>
105105
void ModuleHolderT<T>::updateLookup(BranchType iBranchType, ProductResolverIndexHelper const& iHelper) {
106106
m_mod->updateLookup(iBranchType, iHelper, mustPrefetchMayGet<T>());
107107
}
@@ -118,7 +118,7 @@ namespace edm::maker {
118118

119119
template <typename T>
120120
void ModuleHolderT<T>::selectInputProcessBlocks(ProductRegistry const& productRegistry,
121-
ProcessBlockHelperBase const& processBlockHelperBase) {
121+
ProcessBlockHelperBase const& processBlockHelperBase) {
122122
m_mod->selectInputProcessBlocks(productRegistry, processBlockHelperBase);
123123
}
124124

@@ -162,7 +162,6 @@ namespace edm::maker {
162162
resolvePutIndiciesImpl(m_mod.get(), iBranchType, iIndicies, moduleDescription().moduleLabel());
163163
}
164164

165-
166165
//Explicitly instantiate our needed templates to avoid having the compiler
167166
// instantiate them in all of our libraries
168167
template class ModuleHolderT<one::EDProducerBase>;

FWCore/Framework/src/ModuleRegistry.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace edm {
3838
if (modItr == labelToModule_.end()) {
3939
return {};
4040
}
41-
return get_underlying_safe(modItr->second);
41+
return get_underlying_safe(modItr->second);
4242
}
4343

4444
maker::ModuleHolder* ModuleRegistry::replaceModule(std::string const& iModuleLabel,

FWCore/Framework/src/Schedule.cc

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -649,9 +649,7 @@ namespace edm {
649649
}
650650
}
651651
// The RandomNumberGeneratorService is not a module, yet it consumes.
652-
{
653-
RngEDConsumer rngConsumer = RngEDConsumer(productTypesConsumed);
654-
}
652+
{ RngEDConsumer rngConsumer = RngEDConsumer(productTypesConsumed); }
655653
preg.setFrozen(productTypesConsumed, elementTypesConsumed, processConfiguration->processName());
656654
}
657655

@@ -1156,29 +1154,29 @@ namespace edm {
11561154
eventsetup::ESRecordsToProductResolverIndices const& iESIndices,
11571155
ProcessBlockHelperBase const& processBlockHelperBase,
11581156
ProcessContext const& processContext) {
1159-
auto const processBlockLookup = iRegistry.productLookup(InProcess);
1160-
auto const runLookup = iRegistry.productLookup(InRun);
1161-
auto const lumiLookup = iRegistry.productLookup(InLumi);
1162-
auto const eventLookup = iRegistry.productLookup(InEvent);
1163-
auto const& processName = processContext.processConfiguration()->processName();
1164-
1165-
auto processBlockModuleToIndicies = processBlockLookup->indiciesForModulesInProcess(processName);
1166-
auto runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
1167-
auto lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
1168-
auto eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
1169-
1170-
moduleRegistry_->forAllModuleHolders([&](auto& iHolder) {
1171-
iHolder->updateLookup(InProcess, *processBlockLookup);
1172-
iHolder->updateLookup(InRun, *runLookup);
1173-
iHolder->updateLookup(InLumi, *lumiLookup);
1174-
iHolder->updateLookup(InEvent, *eventLookup);
1175-
iHolder->updateLookup(iESIndices);
1176-
iHolder->resolvePutIndicies(InProcess, processBlockModuleToIndicies);
1177-
iHolder->resolvePutIndicies(InRun, runModuleToIndicies);
1178-
iHolder->resolvePutIndicies(InLumi, lumiModuleToIndicies);
1179-
iHolder->resolvePutIndicies(InEvent, eventModuleToIndicies);
1180-
iHolder->selectInputProcessBlocks(iRegistry, processBlockHelperBase);
1181-
});
1157+
auto const processBlockLookup = iRegistry.productLookup(InProcess);
1158+
auto const runLookup = iRegistry.productLookup(InRun);
1159+
auto const lumiLookup = iRegistry.productLookup(InLumi);
1160+
auto const eventLookup = iRegistry.productLookup(InEvent);
1161+
auto const& processName = processContext.processConfiguration()->processName();
1162+
1163+
auto processBlockModuleToIndicies = processBlockLookup->indiciesForModulesInProcess(processName);
1164+
auto runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
1165+
auto lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
1166+
auto eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
1167+
1168+
moduleRegistry_->forAllModuleHolders([&](auto& iHolder) {
1169+
iHolder->updateLookup(InProcess, *processBlockLookup);
1170+
iHolder->updateLookup(InRun, *runLookup);
1171+
iHolder->updateLookup(InLumi, *lumiLookup);
1172+
iHolder->updateLookup(InEvent, *eventLookup);
1173+
iHolder->updateLookup(iESIndices);
1174+
iHolder->resolvePutIndicies(InProcess, processBlockModuleToIndicies);
1175+
iHolder->resolvePutIndicies(InRun, runModuleToIndicies);
1176+
iHolder->resolvePutIndicies(InLumi, lumiModuleToIndicies);
1177+
iHolder->resolvePutIndicies(InEvent, eventModuleToIndicies);
1178+
iHolder->selectInputProcessBlocks(iRegistry, processBlockHelperBase);
1179+
});
11821180

11831181
globalSchedule_->beginJob(iRegistry, iESIndices, processBlockHelperBase, processContext);
11841182
}
@@ -1285,16 +1283,12 @@ namespace edm {
12851283
//for (auto const& worker : allWorkers()) {
12861284
// worker->convertCurrentProcessAlias(processName);
12871285
//}
1288-
moduleRegistry_->forAllModuleHolders([&](auto& iHolder) {
1289-
iHolder->convertCurrentProcessAlias(processName);
1290-
});
1286+
moduleRegistry_->forAllModuleHolders([&](auto& iHolder) { iHolder->convertCurrentProcessAlias(processName); });
12911287
}
12921288

1293-
void Schedule::releaseMemoryPostLookupSignal() {
1294-
moduleRegistry_->forAllModuleHolders([&](auto& iHolder) {
1295-
iHolder->releaseMemoryPostLookupSignal();
1296-
});
1297-
}
1289+
void Schedule::releaseMemoryPostLookupSignal() {
1290+
moduleRegistry_->forAllModuleHolders([&](auto& iHolder) { iHolder->releaseMemoryPostLookupSignal(); });
1291+
}
12981292

12991293
void Schedule::availablePaths(std::vector<std::string>& oLabelsToFill) const {
13001294
streamSchedules_[0]->availablePaths(oLabelsToFill);

0 commit comments

Comments
 (0)