Skip to content

Commit

Permalink
Merge branch 'master' into signal-ana
Browse files Browse the repository at this point in the history
  • Loading branch information
@juanangp
juanangp authored Mar 28, 2023
2 parents d914d97 + 937497f commit 80f8713
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 480 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows")
set(excludes TRestRawMemoryBufferToSignalProcess)
endif (CMAKE_SYSTEM_NAME MATCHES "Windows")

set(deps detector)

if (NOT ${RESTLIB_DETECTOR} MATCHES "ON")
list(REMOVE_ITEM deps detector)
endif ()
set(deps)

compilelib(deps)

Expand Down
56 changes: 1 addition & 55 deletions inc/TRestRawSignalChannelActivityProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
#define RestCore_TRestRawSignalChannelActivityProcess

#include <TH1D.h>

#ifdef REST_DetectorLib
#include <TRestDetectorReadout.h>
#endif

#include <TRestRawSignalEvent.h>

#include "TRestEventProcess.h"
Expand All @@ -46,60 +41,19 @@ class TRestRawSignalChannelActivityProcess : public TRestEventProcess {
/// The number of bins at the daq channels histogram
Int_t fDaqChannels = 300;

/// The number of bins at the readout channels histogram
Int_t fReadoutChannels = 128;

/// The first channel at the daq channels histogram
Int_t fDaqStartChannel = 4320;

/// The last channel at the daq channels histogram
Int_t fDaqEndChannel = 4620;

/// The first channel at the readout channels histogram
Int_t fReadoutStartChannel = 0;

/// The last channel at the readout channels histogram
Int_t fReadoutEndChannel = 128;

/// The daq channels histogram
TH1D* fDaqChannelsHisto = nullptr; //!

/// The readout channels histogram
TH1D* fReadoutChannelsHisto = nullptr; //!

/// The readout channels histogram built with 1-signal events (low threshold)
TH1D* fReadoutChannelsHisto_OneSignal = nullptr; //!

/// The readout channels histogram built with 1-signal events (high threshold)
TH1D* fReadoutChannelsHisto_OneSignal_High = nullptr; //!

/// The readout channels histogram built with 2-signal events (low threshold)
TH1D* fReadoutChannelsHisto_TwoSignals = nullptr; //!

/// The readout channels histogram built with 2-signal events (high threshold)
TH1D* fReadoutChannelsHisto_TwoSignals_High = nullptr; //!

/// The readout channels histogram built with 3-signal events (low threshold)
TH1D* fReadoutChannelsHisto_ThreeSignals = nullptr; //!

/// The readout channels histogram built with 3-signal events (high threshold)
TH1D* fReadoutChannelsHisto_ThreeSignals_High = nullptr; //!

/// The readout channels histogram built more than 3-signal events (low threshold)
TH1D* fReadoutChannelsHisto_MultiSignals = nullptr; //!

/// The readout channels histogram built more than 3-signal events (high threshold)
TH1D* fReadoutChannelsHisto_MultiSignals_High = nullptr; //!

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

#ifdef REST_DetectorLib
/// A pointer to the readout metadata information accessible to TRestRun
TRestDetectorReadout* fReadout = nullptr; //!
#endif

void Initialize() override;

public:
Expand All @@ -121,14 +75,6 @@ class TRestRawSignalChannelActivityProcess : public TRestEventProcess {
RESTMetadata << "Start daq channel : " << fDaqStartChannel << RESTendl;
RESTMetadata << "End daq channel : " << fDaqEndChannel << RESTendl;

#ifdef REST_DetectorLib
RESTMetadata << "Number of readout histogram channels : " << fReadoutChannels << RESTendl;
RESTMetadata << "Start readout channel : " << fReadoutStartChannel << RESTendl;
RESTMetadata << "End readout channel : " << fReadoutEndChannel << RESTendl;
#else
RESTMetadata << "Some Detector features in this process are not available!" << RESTendl;
#endif

EndPrintProcess();
}

Expand All @@ -138,6 +84,6 @@ class TRestRawSignalChannelActivityProcess : public TRestEventProcess {
TRestRawSignalChannelActivityProcess();
~TRestRawSignalChannelActivityProcess();

ClassDefOverride(TRestRawSignalChannelActivityProcess, 3);
ClassDefOverride(TRestRawSignalChannelActivityProcess, 4);
};
#endif
88 changes: 0 additions & 88 deletions inc/TRestRawSignalRecoverChannelsProcess.h
View file

This file was deleted.

5 changes: 5 additions & 0 deletions inc/TRestRawToSignalProcess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ class TRestRawToSignalProcess : public TRestEventProcess {
any GetInputEvent() const override { return any((TRestEvent*)nullptr); }
any GetOutputEvent() const override { return fSignalEvent; }

virtual void InitProcess() override {
fRunOrigin = fRunInfo->GetRunNumber();
fSubRunOrigin = fRunInfo->GetSubRunNumber();
}

void PrintMetadata() override;
void Initialize() override;
TRestMetadata* GetProcessMetadata() const { return nullptr; }
Expand Down
1 change: 1 addition & 0 deletions src/TRestRawMultiFEMINOSToSignalProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ void TRestRawMultiFEMINOSToSignalProcess::Initialize() {
void TRestRawMultiFEMINOSToSignalProcess::InitProcess() {
RESTDebug << "TRestRawMultiFeminos::InitProcess" << RESTendl;
// Reading binary file header
TRestRawToSignalProcess::InitProcess();

if (!fInputFileNames.empty() && TRestTools::GetFileNameExtension(fInputFileNames[0]) != "aqs") {
RESTError << "The input file extension should be .aqs" << RESTendl;
Expand Down
83 changes: 1 addition & 82 deletions src/TRestRawSignalChannelActivityProcess.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,49 +133,9 @@ void TRestRawSignalChannelActivityProcess::Initialize() {
/// is found in the processing chain.
///
void TRestRawSignalChannelActivityProcess::InitProcess() {
#ifdef REST_DetectorLib
fReadout = GetMetadata<TRestDetectorReadout>();

RESTDebug << "TRestRawSignalChannelActivityProcess::InitProcess. Readout pointer : " << fReadout
<< RESTendl;
if (GetVerboseLevel() >= TRestStringOutput::REST_Verbose_Level::REST_Info && fReadout)
fReadout->PrintMetadata();
#endif

if (!fReadOnly) {
fDaqChannelsHisto = new TH1D("daqChannelActivityRaw", "daqChannelActivityRaw", fDaqChannels,
fDaqStartChannel, fDaqEndChannel);

#ifdef REST_DetectorLib
if (fReadout) {
fReadoutChannelsHisto = new TH1D("rChannelActivityRaw", "readoutChannelActivity",
fReadoutChannels, fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_OneSignal =
new TH1D("rChannelActivityRaw_1", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_OneSignal_High =
new TH1D("rChannelActivityRaw_1H", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_TwoSignals =
new TH1D("rChannelActivityRaw_2", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_TwoSignals_High =
new TH1D("rChannelActivityRaw_2H", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_ThreeSignals =
new TH1D("rChannelActivityRaw_3", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_ThreeSignals_High =
new TH1D("rChannelActivityRaw_3H", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_MultiSignals =
new TH1D("rChannelActivityRaw_M", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
fReadoutChannelsHisto_MultiSignals_High =
new TH1D("rChannelActivityRaw_MH", "readoutChannelActivity", fReadoutChannels,
fReadoutStartChannel, fReadoutEndChannel);
}
#endif
}
}

Expand All @@ -194,33 +154,7 @@ TRestEvent* TRestRawSignalChannelActivityProcess::ProcessEvent(TRestEvent* input
}

for (int s = 0; s < fSignalEvent->GetNumberOfSignals(); s++) {
// Adding signal to the channel activity histogram
#ifdef REST_DetectorLib
TRestRawSignal* sgnl = fSignalEvent->GetSignal(s);
if (!fReadOnly && fReadout) {
Int_t signalID = fSignalEvent->GetSignal(s)->GetID();

Int_t p, m, readoutChannel;
fReadout->GetPlaneModuleChannel(signalID, p, m, readoutChannel);

fReadoutChannelsHisto->Fill(readoutChannel);

if (sgnl->GetMaxValue() > fLowThreshold) {
if (Nlow == 1) fReadoutChannelsHisto_OneSignal->Fill(readoutChannel);
if (Nlow == 2) fReadoutChannelsHisto_TwoSignals->Fill(readoutChannel);
if (Nlow == 3) fReadoutChannelsHisto_ThreeSignals->Fill(readoutChannel);
if (Nlow > 3 && Nlow < 10) fReadoutChannelsHisto_MultiSignals->Fill(readoutChannel);
}

if (sgnl->GetMaxValue() > fHighThreshold) {
if (Nhigh == 1) fReadoutChannelsHisto_OneSignal_High->Fill(readoutChannel);
if (Nhigh == 2) fReadoutChannelsHisto_TwoSignals_High->Fill(readoutChannel);
if (Nhigh == 3) fReadoutChannelsHisto_ThreeSignals_High->Fill(readoutChannel);
if (Nhigh > 3 && Nhigh < 10) fReadoutChannelsHisto_MultiSignals_High->Fill(readoutChannel);
}
}
#endif

// Adding signal to the channel activity histogram
if (!fReadOnly) {
Int_t daqChannel = fSignalEvent->GetSignal(s)->GetID();
fDaqChannelsHisto->Fill(daqChannel);
Expand All @@ -241,20 +175,5 @@ TRestEvent* TRestRawSignalChannelActivityProcess::ProcessEvent(TRestEvent* input
void TRestRawSignalChannelActivityProcess::EndProcess() {
if (!fReadOnly) {
fDaqChannelsHisto->Write();
#ifdef REST_DetectorLib
if (fReadout) {
fReadoutChannelsHisto->Write();

fReadoutChannelsHisto_OneSignal->Write();
fReadoutChannelsHisto_TwoSignals->Write();
fReadoutChannelsHisto_ThreeSignals->Write();
fReadoutChannelsHisto_MultiSignals->Write();

fReadoutChannelsHisto_OneSignal_High->Write();
fReadoutChannelsHisto_TwoSignals_High->Write();
fReadoutChannelsHisto_ThreeSignals_High->Write();
fReadoutChannelsHisto_MultiSignals_High->Write();
}
#endif
}
}
Loading

0 comments on commit 80f8713

Please sign in to comment.