Skip to content

Commit c6273e0

Browse files
cmsbuildcmsbuild
authored
Merge pull request #49526 from Dr15Jones/TransitionAction
Renamed BranchAction* to TransitionAction*
2 parents 86dd6b3 + f34b477 commit c6273e0

19 files changed

+171
-169
lines changed

‎FWCore/Framework/interface/BranchActionType.h‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎FWCore/Framework/interface/OccurrenceTraits.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "DataFormats/Provenance/interface/LuminosityBlockID.h"
1111
#include "DataFormats/Provenance/interface/ModuleDescription.h"
12-
#include "FWCore/Framework/interface/BranchActionType.h"
12+
#include "FWCore/Framework/interface/TransitionActionType.h"
1313
#include "FWCore/Framework/interface/EventPrincipal.h"
1414
#include "FWCore/Framework/interface/LuminosityBlockPrincipal.h"
1515
#include "FWCore/Framework/interface/ProcessBlockPrincipal.h"
@@ -31,11 +31,11 @@ namespace edm {
3131

3232
class ProcessContext;
3333

34-
template <typename T, BranchActionType B>
34+
template <typename T, TransitionActionType B>
3535
class OccurrenceTraits;
3636

3737
template <>
38-
class OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> {
38+
class OccurrenceTraits<EventPrincipal, TransitionActionStreamBegin> {
3939
public:
4040
using MyPrincipal = EventPrincipal;
4141
using TransitionInfoType = EventTransitionInfo;
@@ -68,7 +68,7 @@ namespace edm {
6868
};
6969

7070
template <>
71-
class OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> {
71+
class OccurrenceTraits<RunPrincipal, TransitionActionGlobalBegin> {
7272
public:
7373
using MyPrincipal = RunPrincipal;
7474
using TransitionInfoType = RunTransitionInfo;
@@ -109,7 +109,7 @@ namespace edm {
109109
};
110110

111111
template <>
112-
class OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> {
112+
class OccurrenceTraits<RunPrincipal, TransitionActionStreamBegin> {
113113
public:
114114
using MyPrincipal = RunPrincipal;
115115
using TransitionInfoType = RunTransitionInfo;
@@ -149,7 +149,7 @@ namespace edm {
149149
};
150150

151151
template <>
152-
class OccurrenceTraits<RunPrincipal, BranchActionStreamEnd> {
152+
class OccurrenceTraits<RunPrincipal, TransitionActionStreamEnd> {
153153
public:
154154
using MyPrincipal = RunPrincipal;
155155
using TransitionInfoType = RunTransitionInfo;
@@ -189,7 +189,7 @@ namespace edm {
189189
};
190190

191191
template <>
192-
class OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd> {
192+
class OccurrenceTraits<RunPrincipal, TransitionActionGlobalEnd> {
193193
public:
194194
using MyPrincipal = RunPrincipal;
195195
using TransitionInfoType = RunTransitionInfo;
@@ -230,7 +230,7 @@ namespace edm {
230230
};
231231

232232
template <>
233-
class OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin> {
233+
class OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionGlobalBegin> {
234234
public:
235235
using MyPrincipal = LuminosityBlockPrincipal;
236236
using TransitionInfoType = LumiTransitionInfo;
@@ -271,7 +271,7 @@ namespace edm {
271271
};
272272

273273
template <>
274-
class OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> {
274+
class OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionStreamBegin> {
275275
public:
276276
using MyPrincipal = LuminosityBlockPrincipal;
277277
using TransitionInfoType = LumiTransitionInfo;
@@ -311,7 +311,7 @@ namespace edm {
311311
};
312312

313313
template <>
314-
class OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd> {
314+
class OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionStreamEnd> {
315315
public:
316316
using MyPrincipal = LuminosityBlockPrincipal;
317317
using TransitionInfoType = LumiTransitionInfo;
@@ -353,7 +353,7 @@ namespace edm {
353353
};
354354

355355
template <>
356-
class OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd> {
356+
class OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionGlobalEnd> {
357357
public:
358358
using MyPrincipal = LuminosityBlockPrincipal;
359359
using TransitionInfoType = LumiTransitionInfo;
@@ -394,7 +394,7 @@ namespace edm {
394394
};
395395

396396
template <>
397-
class OccurrenceTraits<ProcessBlockPrincipal, BranchActionGlobalBegin> {
397+
class OccurrenceTraits<ProcessBlockPrincipal, TransitionActionGlobalBegin> {
398398
public:
399399
using MyPrincipal = ProcessBlockPrincipal;
400400
using TransitionInfoType = ProcessBlockTransitionInfo;
@@ -432,7 +432,7 @@ namespace edm {
432432
};
433433

434434
template <>
435-
class OccurrenceTraits<ProcessBlockPrincipal, BranchActionProcessBlockInput> {
435+
class OccurrenceTraits<ProcessBlockPrincipal, TransitionActionProcessBlockInput> {
436436
public:
437437
using MyPrincipal = ProcessBlockPrincipal;
438438
using TransitionInfoType = ProcessBlockTransitionInfo;
@@ -470,7 +470,7 @@ namespace edm {
470470
};
471471

472472
template <>
473-
class OccurrenceTraits<ProcessBlockPrincipal, BranchActionGlobalEnd> {
473+
class OccurrenceTraits<ProcessBlockPrincipal, TransitionActionGlobalEnd> {
474474
public:
475475
using MyPrincipal = ProcessBlockPrincipal;
476476
using TransitionInfoType = ProcessBlockTransitionInfo;

‎FWCore/Framework/interface/TransitionActionType.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#ifndef Framework_TransitionActionType_h
2+
#define Framework_TransitionActionType_h
3+
4+
/*----------------------------------------------------------------------
5+
6+
TransitionActionType: TransitionAction
7+
8+
----------------------------------------------------------------------*/
9+
10+
namespace edm {
11+
enum TransitionActionType {
12+
TransitionActionGlobalBegin = 0,
13+
TransitionActionStreamBegin = 1,
14+
TransitionActionStreamEnd = 2,
15+
TransitionActionGlobalEnd = 3,
16+
TransitionActionProcessBlockInput = 4
17+
};
18+
}
19+
#endif

‎FWCore/Framework/interface/maker/Worker.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ namespace edm {
486486
};
487487

488488
template <typename DUMMY>
489-
class AcquireTask<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>, DUMMY> : public WaitingTask {
489+
class AcquireTask<OccurrenceTraits<EventPrincipal, TransitionActionStreamBegin>, DUMMY> : public WaitingTask {
490490
public:
491491
AcquireTask(Worker* worker,
492492
EventTransitionInfo const& eventTransitionInfo,
@@ -593,9 +593,9 @@ namespace edm {
593593
};
594594
namespace workerhelper {
595595
template <>
596-
class CallImpl<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>> {
596+
class CallImpl<OccurrenceTraits<EventPrincipal, TransitionActionStreamBegin>> {
597597
public:
598-
typedef OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> Arg;
598+
typedef OccurrenceTraits<EventPrincipal, TransitionActionStreamBegin> Arg;
599599
static bool call(Worker* iWorker,
600600
StreamID,
601601
EventTransitionInfo const& info,
@@ -620,9 +620,9 @@ namespace edm {
620620
};
621621

622622
template <>
623-
class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin>> {
623+
class CallImpl<OccurrenceTraits<RunPrincipal, TransitionActionGlobalBegin>> {
624624
public:
625-
typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> Arg;
625+
typedef OccurrenceTraits<RunPrincipal, TransitionActionGlobalBegin> Arg;
626626
static bool call(Worker* iWorker,
627627
StreamID,
628628
RunTransitionInfo const& info,
@@ -654,9 +654,9 @@ namespace edm {
654654
static SerialTaskQueue* enableGlobalQueue(Worker*) noexcept { return nullptr; }
655655
};
656656
template <>
657-
class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionStreamBegin>> {
657+
class CallImpl<OccurrenceTraits<RunPrincipal, TransitionActionStreamBegin>> {
658658
public:
659-
typedef OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> Arg;
659+
typedef OccurrenceTraits<RunPrincipal, TransitionActionStreamBegin> Arg;
660660
static bool call(Worker* iWorker,
661661
StreamID id,
662662
RunTransitionInfo const& info,
@@ -683,9 +683,9 @@ namespace edm {
683683
static SerialTaskQueue* enableGlobalQueue(Worker*) noexcept { return nullptr; }
684684
};
685685
template <>
686-
class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd>> {
686+
class CallImpl<OccurrenceTraits<RunPrincipal, TransitionActionGlobalEnd>> {
687687
public:
688-
typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd> Arg;
688+
typedef OccurrenceTraits<RunPrincipal, TransitionActionGlobalEnd> Arg;
689689
static bool call(Worker* iWorker,
690690
StreamID,
691691
RunTransitionInfo const& info,
@@ -716,9 +716,9 @@ namespace edm {
716716
static SerialTaskQueue* enableGlobalQueue(Worker* iWorker) noexcept { return iWorker->globalRunsQueue(); }
717717
};
718718
template <>
719-
class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionStreamEnd>> {
719+
class CallImpl<OccurrenceTraits<RunPrincipal, TransitionActionStreamEnd>> {
720720
public:
721-
typedef OccurrenceTraits<RunPrincipal, BranchActionStreamEnd> Arg;
721+
typedef OccurrenceTraits<RunPrincipal, TransitionActionStreamEnd> Arg;
722722
static bool call(Worker* iWorker,
723723
StreamID id,
724724
RunTransitionInfo const& info,
@@ -750,9 +750,9 @@ namespace edm {
750750
};
751751

752752
template <>
753-
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin>> {
753+
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionGlobalBegin>> {
754754
public:
755-
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin>;
755+
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionGlobalBegin>;
756756
static bool call(Worker* iWorker,
757757
StreamID,
758758
LumiTransitionInfo const& info,
@@ -781,9 +781,9 @@ namespace edm {
781781
static SerialTaskQueue* enableGlobalQueue(Worker*) noexcept { return nullptr; }
782782
};
783783
template <>
784-
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin>> {
784+
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionStreamBegin>> {
785785
public:
786-
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin>;
786+
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionStreamBegin>;
787787
static bool call(Worker* iWorker,
788788
StreamID id,
789789
LumiTransitionInfo const& info,
@@ -811,9 +811,9 @@ namespace edm {
811811
};
812812

813813
template <>
814-
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd>> {
814+
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionGlobalEnd>> {
815815
public:
816-
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd>;
816+
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionGlobalEnd>;
817817
static bool call(Worker* iWorker,
818818
StreamID,
819819
LumiTransitionInfo const& info,
@@ -846,9 +846,9 @@ namespace edm {
846846
}
847847
};
848848
template <>
849-
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>> {
849+
class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionStreamEnd>> {
850850
public:
851-
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>;
851+
using Arg = OccurrenceTraits<LuminosityBlockPrincipal, TransitionActionStreamEnd>;
852852
static bool call(Worker* iWorker,
853853
StreamID id,
854854
LumiTransitionInfo const& info,
@@ -879,9 +879,9 @@ namespace edm {
879879
static SerialTaskQueue* enableGlobalQueue(Worker*) noexcept { return nullptr; }
880880
};
881881
template <>
882-
class CallImpl<OccurrenceTraits<ProcessBlockPrincipal, BranchActionGlobalBegin>> {
882+
class CallImpl<OccurrenceTraits<ProcessBlockPrincipal, TransitionActionGlobalBegin>> {
883883
public:
884-
using Arg = OccurrenceTraits<ProcessBlockPrincipal, BranchActionGlobalBegin>;
884+
using Arg = OccurrenceTraits<ProcessBlockPrincipal, TransitionActionGlobalBegin>;
885885
static bool call(Worker* iWorker,
886886
StreamID,
887887
ProcessBlockTransitionInfo const& info,
@@ -903,9 +903,9 @@ namespace edm {
903903
static SerialTaskQueue* enableGlobalQueue(Worker*) noexcept { return nullptr; }
904904
};
905905
template <>
906-
class CallImpl<OccurrenceTraits<ProcessBlockPrincipal, BranchActionProcessBlockInput>> {
906+
class CallImpl<OccurrenceTraits<ProcessBlockPrincipal, TransitionActionProcessBlockInput>> {
907907
public:
908-
using Arg = OccurrenceTraits<ProcessBlockPrincipal, BranchActionProcessBlockInput>;
908+
using Arg = OccurrenceTraits<ProcessBlockPrincipal, TransitionActionProcessBlockInput>;
909909
static bool call(Worker* iWorker,
910910
StreamID,
911911
ProcessBlockTransitionInfo const& info,
@@ -926,9 +926,9 @@ namespace edm {
926926
static SerialTaskQueue* enableGlobalQueue(Worker*) noexcept { return nullptr; }
927927
};
928928
template <>
929-
class CallImpl<OccurrenceTraits<ProcessBlockPrincipal, BranchActionGlobalEnd>> {
929+
class CallImpl<OccurrenceTraits<ProcessBlockPrincipal, TransitionActionGlobalEnd>> {
930930
public:
931-
using Arg = OccurrenceTraits<ProcessBlockPrincipal, BranchActionGlobalEnd>;
931+
using Arg = OccurrenceTraits<ProcessBlockPrincipal, TransitionActionGlobalEnd>;
932932
static bool call(Worker* iWorker,
933933
StreamID,
934934
ProcessBlockTransitionInfo const& info,

0 commit comments

Comments
 (0)