Skip to content

Commit

Permalink
Merge pull request #37 from rest-for-physics/any_to_RESTValue
Browse files Browse the repository at this point in the history
Removal of custom typedef any since it is misleading with std::any
  • Loading branch information
juanangp authored Sep 6, 2023
2 parents 8cecd60 + b61365d commit b00afd2
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions inc/TRestTrackAnalysisProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ class TRestTrackAnalysisProcess : public TRestEventProcess {
Double_t fDeltaEnergy;

public:
any GetInputEvent() const override { return fInputTrackEvent; }
any GetOutputEvent() const override { return fOutputTrackEvent; }
RESTValue GetInputEvent() const override { return fInputTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutputTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackBlobAnalysisProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ class TRestTrackBlobAnalysisProcess : public TRestEventProcess {
// add here the members of your event process

public:
any GetInputEvent() const override { return fInputTrackEvent; }
any GetOutputEvent() const override { return fOutputTrackEvent; }
RESTValue GetInputEvent() const override { return fInputTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutputTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackDetachIsolatedNodesProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class TRestTrackDetachIsolatedNodesProcess : public TRestEventProcess {

protected:
public:
any GetInputEvent() const override { return fInputTrackEvent; }
any GetOutputEvent() const override { return fOutputTrackEvent; }
RESTValue GetInputEvent() const override { return fInputTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutputTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackLineAnalysisProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class TRestTrackLineAnalysisProcess : public TRestEventProcess {

protected:
public:
any GetInputEvent() const override { return fTrackEvent; }
any GetOutputEvent() const override { return fOutTrackEvent; }
RESTValue GetInputEvent() const override { return fTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackLinearizationProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class TRestTrackLinearizationProcess : public TRestEventProcess {
Int_t fMaxNodes = 6;

public:
any GetInputEvent() const override { return fTrackEvent; }
any GetOutputEvent() const override { return fOutTrackEvent; }
RESTValue GetInputEvent() const override { return fTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackPathMinimizationProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class TRestTrackPathMinimizationProcess : public TRestEventProcess {
// is connected to last hit)

public:
any GetInputEvent() const override { return fInputTrackEvent; }
any GetOutputEvent() const override { return fOutputTrackEvent; }
RESTValue GetInputEvent() const override { return fInputTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutputTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackPointLikeAnalysisProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class TRestTrackPointLikeAnalysisProcess : public TRestEventProcess {
// add here the members of your event process

public:
any GetInputEvent() const override { return fTrackEvent; }
any GetOutputEvent() const override { return fTrackEvent; }
RESTValue GetInputEvent() const override { return fTrackEvent; }
RESTValue GetOutputEvent() const override { return fTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackReconnectionProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class TRestTrackReconnectionProcess : public TRestEventProcess {

protected:
public:
any GetInputEvent() const override { return fInputTrackEvent; }
any GetOutputEvent() const override { return fOutputTrackEvent; }
RESTValue GetInputEvent() const override { return fInputTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutputTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackReductionProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class TRestTrackReductionProcess : public TRestEventProcess {
Bool_t fKmeans = false;

public:
any GetInputEvent() const override { return fInputTrackEvent; }
any GetOutputEvent() const override { return fOutputTrackEvent; }
RESTValue GetInputEvent() const override { return fInputTrackEvent; }
RESTValue GetOutputEvent() const override { return fOutputTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
4 changes: 2 additions & 2 deletions inc/TRestTrackViewerProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class TRestTrackViewerProcess : public TRestEventProcess {
// add here the members of your event process

public:
any GetInputEvent() const override { return fTrackEvent; }
any GetOutputEvent() const override { return fTrackEvent; }
RESTValue GetInputEvent() const override { return fTrackEvent; }
RESTValue GetOutputEvent() const override { return fTrackEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down

0 comments on commit b00afd2

Please sign in to comment.