Skip to content

Commit

Permalink
Merge pull request #131 from rest-for-physics/inputname-in-processes-…
Browse files Browse the repository at this point in the history 
…consistency

Consistent name of the input events in the processes
  • Loading branch information
@lobis
lobis authored May 9, 2024
2 parents f7ccc9f + cb0420a commit 745951c
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 42 deletions.
6 changes: 3 additions & 3 deletions inc/TRestRawPeaksFinderProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class TRestRawPeaksFinderProcess : public TRestEventProcess {
private:
TRestRawSignalEvent* fSignalEvent = nullptr; //!
TRestRawSignalEvent* fInputEvent = nullptr; //!
TRestRawReadoutMetadata* fReadoutMetadata = nullptr; //!

/// \brief threshold over baseline to consider a peak
Expand All @@ -27,8 +27,8 @@ class TRestRawPeaksFinderProcess : public TRestEventProcess {
std::set<std::string> fChannelTypes = {}; // this process will only be applied to selected channel types

public:
RESTValue GetInputEvent() const override { return fSignalEvent; }
RESTValue GetOutputEvent() const override { return fSignalEvent; }
RESTValue GetInputEvent() const override { return fInputEvent; }
RESTValue GetOutputEvent() const override { return fInputEvent; }

void PrintMetadata() override;

Expand Down
6 changes: 3 additions & 3 deletions inc/TRestRawSignalAnalysisProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class TRestRawSignalAnalysisProcess : public TRestEventProcess {
private:
/// A pointer to the specific TRestRawSignalEvent input
TRestRawSignalEvent* fSignalEvent; //!
TRestRawSignalEvent* fInputEvent; //!

/// Just a flag to quickly determine if we have to apply the range filter
Bool_t fRangeEnabled = false; //!
Expand Down Expand Up @@ -70,9 +70,9 @@ class TRestRawSignalAnalysisProcess : public TRestEventProcess {
// add here the members of your event process

public:
RESTValue GetInputEvent() const override { return fSignalEvent; }
RESTValue GetInputEvent() const override { return fInputEvent; }

RESTValue GetOutputEvent() const override { return fSignalEvent; }
RESTValue GetOutputEvent() const override { return fInputEvent; }

void InitProcess() override;

Expand Down
6 changes: 3 additions & 3 deletions inc/TRestRawSignalChannelActivityProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ class TRestRawSignalChannelActivityProcess : public TRestEventProcess {

private:
/// A pointer to the specific TRestRawSignalEvent input
TRestRawSignalEvent* fSignalEvent = nullptr; //!
TRestRawSignalEvent* fInputEvent = nullptr; //!

std::string fChannelType;
TRestRawReadoutMetadata* fReadoutMetadata = nullptr; //!

void Initialize() override;

public:
RESTValue GetInputEvent() const override { return fSignalEvent; }
RESTValue GetOutputEvent() const override { return fSignalEvent; }
RESTValue GetInputEvent() const override { return fInputEvent; }
RESTValue GetOutputEvent() const override { return fInputEvent; }

void InitProcess() override;
TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;
Expand Down
8 changes: 4 additions & 4 deletions inc/TRestRawSignalRemoveChannelsProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
class TRestRawSignalRemoveChannelsProcess : public TRestEventProcess {
private:
/// A pointer to the specific TRestDetectorSignalEvent input
TRestRawSignalEvent* fInputSignalEvent; //!
TRestRawSignalEvent* fInputEvent; //!

/// A pointer to the specific TRestRawSignalEvent input
TRestRawSignalEvent* fOutputSignalEvent; //!
TRestRawSignalEvent* fOutputEvent; //!

/// A pointer to the readout metadata
TRestRawReadoutMetadata* fReadoutMetadata = nullptr; //!
Expand All @@ -53,8 +53,8 @@ class TRestRawSignalRemoveChannelsProcess : public TRestEventProcess {
std::map<Int_t, std::string> fChannelTypesToRemove;

public:
RESTValue GetInputEvent() const override { return fInputSignalEvent; }
RESTValue GetOutputEvent() const override { return fOutputSignalEvent; }
RESTValue GetInputEvent() const override { return fInputEvent; }
RESTValue GetOutputEvent() const override { return fOutputEvent; }

TRestEvent* ProcessEvent(TRestEvent* inputEvent) override;

Expand Down
4 changes: 2 additions & 2 deletions src/TRestRawBaseLineCorrectionProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ void TRestRawBaseLineCorrectionProcess::Initialize() {
fOutputEvent = new TRestRawSignalEvent();
}

TRestEvent* TRestRawBaseLineCorrectionProcess::ProcessEvent(TRestEvent* evInput) {
fInputEvent = dynamic_cast<TRestRawSignalEvent*>(evInput);
TRestEvent* TRestRawBaseLineCorrectionProcess::ProcessEvent(TRestEvent* inputEvent) {
fInputEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);

const auto run = GetRunInfo();
if (run != nullptr) {
Expand Down
8 changes: 4 additions & 4 deletions src/TRestRawPeaksFinderProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ using namespace std;
void TRestRawPeaksFinderProcess::InitProcess() {}

TRestEvent* TRestRawPeaksFinderProcess::ProcessEvent(TRestEvent* inputEvent) {
fSignalEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);
fInputEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);

const auto run = GetRunInfo();
if (run != nullptr) {
fSignalEvent->InitializeReferences(run);
fInputEvent->InitializeReferences(run);
}

auto event = fSignalEvent->GetSignalEventForTypes(fChannelTypes, fReadoutMetadata);
auto event = fInputEvent->GetSignalEventForTypes(fChannelTypes, fReadoutMetadata);

if (fReadoutMetadata == nullptr) {
fReadoutMetadata = fSignalEvent->GetReadoutMetadata();
fReadoutMetadata = fInputEvent->GetReadoutMetadata();
}

if (fReadoutMetadata == nullptr && !fChannelTypes.empty()) {
Expand Down
29 changes: 23 additions & 6 deletions src/TRestRawSignalAnalysisProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ TRestRawSignalAnalysisProcess::~TRestRawSignalAnalysisProcess() {}
void TRestRawSignalAnalysisProcess::Initialize() {
SetSectionName(this->ClassName());
SetLibraryVersion(LIBRARY_VERSION);
fSignalEvent = nullptr;

fInputEvent = nullptr;
}

///////////////////////////////////////////////
Expand All @@ -294,9 +295,25 @@ void TRestRawSignalAnalysisProcess::InitFromConfigFile() {
/// \brief The main processing event function
///
TRestEvent* TRestRawSignalAnalysisProcess::ProcessEvent(TRestEvent* inputEvent) {
fSignalEvent = (TRestRawSignalEvent*)inputEvent;
fSignalEvent->InitializeReferences(GetRunInfo());
auto event = fSignalEvent->GetSignalEventForTypes(fChannelTypes, fReadoutMetadata);
fInputEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);

const auto run = GetRunInfo();
if (run != nullptr) {
fInputEvent->InitializeReferences(run);
}

if (fReadoutMetadata == nullptr) {
fReadoutMetadata = fInputEvent->GetReadoutMetadata();
}

if (fReadoutMetadata == nullptr && !fChannelTypes.empty()) {
cerr << "TRestRawSignalAnalysisProcess::ProcessEvent: readout metadata is null, cannot filter "
"the process by signal type"
<< endl;
exit(1);
}

auto event = fInputEvent->GetSignalEventForTypes(fChannelTypes, fReadoutMetadata);

// we save some complex typed analysis result
map<int, Double_t> baseline;
Expand Down Expand Up @@ -393,7 +410,7 @@ TRestEvent* TRestRawSignalAnalysisProcess::ProcessEvent(TRestEvent* inputEvent)
//
// We do not substract baselines then now, as it was done before
//
// fSignalEvent->SubstractBaselines(fBaseLineRange.X(), fBaseLineRange.Y());
// fInputEvent->SubstractBaselines(fBaseLineRange.X(), fBaseLineRange.Y());
//
// Methods in TRestRawSignal have been updated to consider baseline.
// TRestRawSignal now implements that internally. We need to define the
Expand Down Expand Up @@ -502,5 +519,5 @@ TRestEvent* TRestRawSignalAnalysisProcess::ProcessEvent(TRestEvent* inputEvent)
return nullptr;
}

return fSignalEvent;
return fInputEvent;
}
14 changes: 7 additions & 7 deletions src/TRestRawSignalChannelActivityProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void TRestRawSignalChannelActivityProcess::Initialize() {
SetSectionName(this->ClassName());
SetLibraryVersion(LIBRARY_VERSION);

fSignalEvent = nullptr;
fInputEvent = nullptr;
}

///////////////////////////////////////////////
Expand All @@ -143,15 +143,15 @@ void TRestRawSignalChannelActivityProcess::InitProcess() {
/// \brief The main processing event function
///
TRestEvent* TRestRawSignalChannelActivityProcess::ProcessEvent(TRestEvent* inputEvent) {
fSignalEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);
fInputEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);

const auto run = GetRunInfo();
if (run != nullptr) {
fSignalEvent->InitializeReferences(run);
fInputEvent->InitializeReferences(run);
}

if (fReadoutMetadata == nullptr) {
fReadoutMetadata = fSignalEvent->GetReadoutMetadata();
fReadoutMetadata = fInputEvent->GetReadoutMetadata();
}

if (fReadoutMetadata == nullptr && !fChannelType.empty()) {
Expand All @@ -161,8 +161,8 @@ TRestEvent* TRestRawSignalChannelActivityProcess::ProcessEvent(TRestEvent* input
exit(1);
}

for (int s = 0; s < fSignalEvent->GetNumberOfSignals(); s++) {
const auto signal = fSignalEvent->GetSignal(s);
for (int s = 0; s < fInputEvent->GetNumberOfSignals(); s++) {
const auto signal = fInputEvent->GetSignal(s);
if (!fChannelType.empty()) {
const auto channelType = fReadoutMetadata->GetTypeForChannelDaqId(signal->GetID());
if (fChannelType != channelType) {
Expand All @@ -179,7 +179,7 @@ TRestEvent* TRestRawSignalChannelActivityProcess::ProcessEvent(TRestEvent* input
if (GetVerboseLevel() >= TRestStringOutput::REST_Verbose_Level::REST_Debug)
fAnalysisTree->PrintObservables();

return fSignalEvent;
return fInputEvent;
}

///////////////////////////////////////////////
Expand Down
20 changes: 10 additions & 10 deletions src/TRestRawSignalRemoveChannelsProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ TRestRawSignalRemoveChannelsProcess::TRestRawSignalRemoveChannelsProcess(const c
///////////////////////////////////////////////
/// \brief Default destructor
///
TRestRawSignalRemoveChannelsProcess::~TRestRawSignalRemoveChannelsProcess() { delete fOutputSignalEvent; }
TRestRawSignalRemoveChannelsProcess::~TRestRawSignalRemoveChannelsProcess() { delete fOutputEvent; }

///////////////////////////////////////////////
/// \brief Function to load the default config in absence of RML input
Expand All @@ -120,8 +120,8 @@ void TRestRawSignalRemoveChannelsProcess::Initialize() {
SetSectionName(this->ClassName());
SetLibraryVersion(LIBRARY_VERSION);

fInputSignalEvent = nullptr;
fOutputSignalEvent = new TRestRawSignalEvent();
fInputEvent = nullptr;
fOutputEvent = new TRestRawSignalEvent();
}

///////////////////////////////////////////////
Expand All @@ -146,15 +146,15 @@ void TRestRawSignalRemoveChannelsProcess::LoadConfig(const string& configFilenam
/// \brief The main processing event function
///
TRestEvent* TRestRawSignalRemoveChannelsProcess::ProcessEvent(TRestEvent* inputEvent) {
fInputSignalEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);
fInputEvent = dynamic_cast<TRestRawSignalEvent*>(inputEvent);

const auto run = GetRunInfo();
if (run != nullptr) {
fInputSignalEvent->InitializeReferences(run);
fInputEvent->InitializeReferences(run);
}

if (fReadoutMetadata == nullptr) {
fReadoutMetadata = fInputSignalEvent->GetReadoutMetadata();
fReadoutMetadata = fInputEvent->GetReadoutMetadata();
}

if (fReadoutMetadata == nullptr && !fChannelTypes.empty()) {
Expand All @@ -164,8 +164,8 @@ TRestEvent* TRestRawSignalRemoveChannelsProcess::ProcessEvent(TRestEvent* inputE
exit(1);
}

for (int n = 0; n < fInputSignalEvent->GetNumberOfSignals(); n++) {
TRestRawSignal* signal = fInputSignalEvent->GetSignal(n);
for (int n = 0; n < fInputEvent->GetNumberOfSignals(); n++) {
TRestRawSignal* signal = fInputEvent->GetSignal(n);

bool removeSignal = false;

Expand Down Expand Up @@ -195,7 +195,7 @@ TRestEvent* TRestRawSignalRemoveChannelsProcess::ProcessEvent(TRestEvent* inputE
}

if (!removeSignal) {
fOutputSignalEvent->AddSignal(*signal);
fOutputEvent->AddSignal(*signal);
}

// Logging messages
Expand All @@ -212,7 +212,7 @@ TRestEvent* TRestRawSignalRemoveChannelsProcess::ProcessEvent(TRestEvent* inputE
GetChar();
}

return fOutputSignalEvent;
return fOutputEvent;
}

///////////////////////////////////////////////
Expand Down

0 comments on commit 745951c

Please sign in to comment.