Code formatting

Author: Dr15Jones

DataFormats/Common/interface/RefCoreStreamer.h

@@ -44,14 +44,14 @@ namespace edm {
     static EDProductGetter const* setRefCoreStreamer(EDProductGetter const* ep);
   };
   class MultiThreadRefCoreStreamerGuard {
-    public:
-      MultiThreadRefCoreStreamerGuard(EDProductGetter const* ep) { setRefCoreStreamer(ep); }
-      ~MultiThreadRefCoreStreamerGuard() { unsetRefCoreStreamer(); }
-  
-    private:
-      static void setRefCoreStreamer(EDProductGetter const* ep);
-      static void unsetRefCoreStreamer();
-    };
-  
+  public:
+    MultiThreadRefCoreStreamerGuard(EDProductGetter const* ep) { setRefCoreStreamer(ep); }
+    ~MultiThreadRefCoreStreamerGuard() { unsetRefCoreStreamer(); }
+
+  private:
+    static void setRefCoreStreamer(EDProductGetter const* ep);
+    static void unsetRefCoreStreamer();
+  };
+
 }  // namespace edm
 #endif

DataFormats/Common/src/EDProductGetter.cc

@@ -87,7 +87,7 @@ namespace edm {
 
   void EDProductGetter::setMultiThreadProductGetter(EDProductGetter const* prodGetter) {
     EDProductGetter const* expected = nullptr;
-    while( not s_multiThreadProductGetter.compare_exchange_strong(expected, prodGetter, std::memory_order_acq_rel)) {
+    while (not s_multiThreadProductGetter.compare_exchange_strong(expected, prodGetter, std::memory_order_acq_rel)) {
       expected = nullptr;
     };
   }

IOPool/Input/src/RootDelayedReader.cc

@@ -21,10 +21,7 @@
 namespace edm {
 
   RootDelayedReader::RootDelayedReader(RootTree const& tree, std::shared_ptr<InputFile> filePtr, InputType inputType)
-      : tree_(tree),
-        filePtr_(filePtr),
-        nextReader_(),
-        inputType_(inputType) {
+      : tree_(tree), filePtr_(filePtr), nextReader_(), inputType_(inputType) {
     if (inputType == InputType::Primary) {
       auto resources = SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader();
       resourceAcquirer_ = std::make_unique<SharedResourcesAcquirer>(std::move(resources.first));
@@ -74,7 +71,7 @@ namespace edm {
 
     RefCoreStreamerGuard guard(ep);
     std::unique_ptr<WrapperBase> edp = branchInfo->newWrapper();
-    void * edpPtr = edp.get();
+    void* edpPtr = edp.get();
     branchInfo->productBranch_->SetAddress(&edpPtr);
 
     try {

IOPool/Input/src/RootDelayedReader.h

@@ -28,7 +28,7 @@ namespace edm {
   class Exception;
 
   //------------------------------------------------------------
-  // Class RootDelayedReader: 
+  // Class RootDelayedReader:
   //
 
   class RootDelayedReader : public RootDelayedReaderBase {

IOPool/Input/src/RootFile.h

@@ -101,7 +101,7 @@ namespace edm {
     struct CrossFileInfo {
       RunHelperBase* runHelper = nullptr;
       std::shared_ptr<BranchIDListHelper> branchIDListHelper{};
-      ProcessBlockHelper* processBlockHelper = 0;
+      ProcessBlockHelper* processBlockHelper = nullptr;
       std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper{};
       std::shared_ptr<DuplicateChecker> duplicateChecker{};
       std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles;  //duplicate checking

IOPool/Input/src/RootPrimaryFileSequence.cc

@@ -163,7 +163,7 @@ namespace edm {
         RootFile::TTreeOptions{.treeCacheSize = treeCacheSize_,
                                .treeMaxVirtualSize = input_.treeMaxVirtualSize(),
                                .enablePrefetching = enablePrefetching_,
-                              .promptReading = not input_.delayReadingEventProducts()},
+                               .promptReading = not input_.delayReadingEventProducts()},
         RootFile::ProductChoices{.productSelectorRules = input_.productSelectorRules(),
                                  .associationsFromSecondary = nullptr,  // associationsFromSecondary
                                  .dropDescendantsOfDroppedProducts = input_.dropDescendants(),
@@ -177,8 +177,7 @@ namespace edm {
                                 .currentIndexIntoFile = currentIndexIntoFile},
         input_.nStreams(),
         input_.processHistoryRegistryForUpdate(),
-        orderedProcessHistoryIDs_
-        );
+        orderedProcessHistoryIDs_);
   }
 
   bool RootPrimaryFileSequence::nextFile() {

IOPool/Input/src/RootPromptReadDelayedReader.cc

@@ -24,7 +24,7 @@ namespace edm {
   RootPromptReadDelayedReader::RootPromptReadDelayedReader(RootTree const& tree,
                                                            std::shared_ptr<InputFile> filePtr,
                                                            InputType inputType,
-                                                          unsigned int iNIndexes)
+                                                           unsigned int iNIndexes)
       : cacheMaps_(iNIndexes), tree_(tree), filePtr_(filePtr), nextReader_(), inputType_(inputType) {
     if (inputType == InputType::Primary) {
       auto resources = SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader();
@@ -43,7 +43,7 @@ namespace edm {
     unsigned int indexFor(RootTree const& tree, EDProductGetter const* ep) {
       return tree.branchType() == InEvent ? ep->transitionIndex() : 0;
     }
-  }
+  }  // namespace
   std::shared_ptr<WrapperBase> RootPromptReadDelayedReader::getProduct_(BranchID const& k, EDProductGetter const* ep) {
     if (lastException_) {
       try {
@@ -66,11 +66,12 @@ namespace edm {
       if (cache.wrapperBase_) {
         if (tree_.branchType() == InEvent) {
           // CMS-THREADING For the primary input source calls to this function need to be serialized
-          InputFile::reportReadBranch(inputType_, std::string(tree_.branches().find(itFound->first)->productBranch_->GetName()));
+          InputFile::reportReadBranch(inputType_,
+                                      std::string(tree_.branches().find(itFound->first)->productBranch_->GetName()));
         }
         return std::shared_ptr<WrapperBase>(std::move(cache.wrapperBase_));
       }
-    } 
+    }
     if (nextReader_) {
       return nextReader_->getProduct(k, ep);
     }
@@ -81,9 +82,9 @@ namespace edm {
     // first set all the addresses
     auto& cacheMap = cacheMaps_[indexFor(tree_, ep)];
     if (cacheMap.empty()) {
-      for(auto& cacheMap : cacheMaps_) {
+      for (auto& cacheMap : cacheMaps_) {
         cacheMap.reserve(tree_.branches().size());
-        for(auto const& branch : tree_.branches()) {
+        for (auto const& branch : tree_.branches()) {
           cacheMap.emplace(branch.first, Cache{});
         }
       }

IOPool/Input/src/RootPromptReadDelayedReader.h

@@ -35,7 +35,10 @@ namespace edm {
     typedef roottree::BranchInfo BranchInfo;
     typedef roottree::BranchMap BranchMap;
     typedef roottree::EntryNumber EntryNumber;
-    RootPromptReadDelayedReader(RootTree const& tree, std::shared_ptr<InputFile> filePtr, InputType inputType, unsigned int iNIndexes);
+    RootPromptReadDelayedReader(RootTree const& tree,
+                                std::shared_ptr<InputFile> filePtr,
+                                InputType inputType,
+                                unsigned int iNIndexes);
 
     ~RootPromptReadDelayedReader() override;