Rename members to shouldWriteRun, shouldWriteLumi

cms-sw · Apr 29, 2022 · 70bb9c4 · 70bb9c4
1 parent 2b11352
commit 70bb9c4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/FWCore/Framework/interface/LuminosityBlockPrincipal.h b/FWCore/Framework/interface/LuminosityBlockPrincipal.h
@@ -72,9 +72,9 @@ namespace edm {
 
     void put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp) const;
 
-    enum ContinueState { kUninitialized, kWillBeContinued, kProcessLumi };
-    ContinueState continueState() const { return continueState_; }
-    void setContinueState(ContinueState value) { continueState_ = value; }
+    enum ShouldWriteLumi { kUninitialized, kNo, kYes };
+    ShouldWriteLumi shouldWriteLumi() const { return shouldWriteLumi_; }
+    void setShouldWriteLumi(ShouldWriteLumi value) { shouldWriteLumi_ = value; }
 
   private:
     unsigned int transitionIndex_() const override;
@@ -85,7 +85,7 @@ namespace edm {
 
     LuminosityBlockIndex index_;
 
-    ContinueState continueState_ = kUninitialized;
+    ShouldWriteLumi shouldWriteLumi_ = kUninitialized;
   };
 }  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/RunPrincipal.h b/FWCore/Framework/interface/RunPrincipal.h
@@ -82,9 +82,9 @@ namespace edm {
 
     void preReadFile();
 
-    enum ContinueState { kUninitialized, kWillBeContinued, kProcessRun };
-    ContinueState continueState() const { return continueState_; }
-    void setContinueState(ContinueState value) { continueState_ = value; }
+    enum ShouldWriteRun { kUninitialized, kNo, kYes };
+    ShouldWriteRun shouldWriteRun() const { return shouldWriteRun_; }
+    void setShouldWriteRun(ShouldWriteRun value) { shouldWriteRun_ = value; }
 
   private:
     unsigned int transitionIndex_() const override;
@@ -98,7 +98,7 @@ namespace edm {
     // per concurrent run. In all other cases, this should just be null.
     edm::propagate_const<std::unique_ptr<MergeableRunProductMetadata>> mergeableRunProductMetadataPtr_;
 
-    ContinueState continueState_ = kUninitialized;
+    ShouldWriteRun shouldWriteRun_ = kUninitialized;
   };
 }  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
@@ -1233,7 +1233,7 @@ namespace edm {
 
       if (globalBeginSucceeded) {
         RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, run);
-        if (runPrincipal.continueState() != RunPrincipal::kWillBeContinued) {
+        if (runPrincipal.shouldWriteRun() != RunPrincipal::kNo) {
           FinalWaitingTask t;
           MergeableRunProductMetadata* mergeableRunProductMetadata = runPrincipal.mergeableRunProductMetadata();
           mergeableRunProductMetadata->preWriteRun();
@@ -1784,7 +1784,7 @@ namespace edm {
 
   void EventProcessor::writeLumiAsync(WaitingTaskHolder task, LuminosityBlockPrincipal& lumiPrincipal) {
     using namespace edm::waiting_task;
-    if (lumiPrincipal.continueState() != LuminosityBlockPrincipal::kWillBeContinued) {
+    if (lumiPrincipal.shouldWriteLumi() != LuminosityBlockPrincipal::kNo) {
       chain::first([&](auto nextTask) {
         ServiceRegistry::Operate op(serviceToken_);
 
@@ -1803,7 +1803,7 @@ namespace edm {
     for (auto& s : subProcesses_) {
       s.deleteLumiFromCache(*iStatus.lumiPrincipal());
     }
-    iStatus.lumiPrincipal()->setContinueState(LuminosityBlockPrincipal::kUninitialized);
+    iStatus.lumiPrincipal()->setShouldWriteLumi(LuminosityBlockPrincipal::kUninitialized);
     iStatus.lumiPrincipal()->clearPrincipal();
     //FDEBUG(1) << "\tdeleteLumiFromCache " << run << "/" << lumi << "\n";
   }

diff --git a/IOPool/Input/src/RootFile.cc b/IOPool/Input/src/RootFile.cc
@@ -1746,11 +1746,11 @@ namespace edm {
       runPrincipal.fillRunPrincipal(*processHistoryRegistry_, runTree_.resetAndGetRootDelayedReader());
       // Read in all the products now.
       runPrincipal.readAllFromSourceAndMergeImmediately(mergeableRunProductMetadata);
-      runPrincipal.setContinueState(RunPrincipal::kProcessRun);
+      runPrincipal.setShouldWriteRun(RunPrincipal::kYes);
     } else {
       runPrincipal.fillRunPrincipal(*processHistoryRegistry_, nullptr);
-      if (runPrincipal.continueState() != RunPrincipal::kProcessRun) {
-        runPrincipal.setContinueState(RunPrincipal::kWillBeContinued);
+      if (runPrincipal.shouldWriteRun() != RunPrincipal::kYes) {
+        runPrincipal.setShouldWriteRun(RunPrincipal::kNo);
       }
     }
     return shouldProcessRun;
@@ -1812,12 +1812,12 @@ namespace edm {
       lumiPrincipal.fillLuminosityBlockPrincipal(history, lumiTree_.resetAndGetRootDelayedReader());
       // Read in all the products now.
       lumiPrincipal.readAllFromSourceAndMergeImmediately();
-      lumiPrincipal.setContinueState(LuminosityBlockPrincipal::kProcessLumi);
+      lumiPrincipal.setShouldWriteLumi(LuminosityBlockPrincipal::kYes);
     } else {
       auto history = processHistoryRegistry_->getMapped(lumiPrincipal.aux().processHistoryID());
       lumiPrincipal.fillLuminosityBlockPrincipal(history, nullptr);
-      if (lumiPrincipal.continueState() != LuminosityBlockPrincipal::kProcessLumi) {
-        lumiPrincipal.setContinueState(LuminosityBlockPrincipal::kWillBeContinued);
+      if (lumiPrincipal.shouldWriteLumi() != LuminosityBlockPrincipal::kYes) {
+        lumiPrincipal.setShouldWriteLumi(LuminosityBlockPrincipal::kNo);
       }
     }
     ++indexIntoFileIter_;