Skip to content

Commit 937497f

Browse files
jgalanjgalan
authored
Merge pull request #92 from rest-for-physics/jgalan_detector_migration
Removing all dependencies with detector lib
2 parents 8e27090 + 87b3735 commit 937497f

7 files changed

+9
-480
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows")
55
set(excludes TRestRawMemoryBufferToSignalProcess)
66
endif (CMAKE_SYSTEM_NAME MATCHES "Windows")
77

8-
set(deps detector)
9-
10-
if (NOT ${RESTLIB_DETECTOR} MATCHES "ON")
11-
list(REMOVE_ITEM deps detector)
12-
endif ()
8+
set(deps)
139

1410
compilelib(deps)
1511

‎inc/TRestRawSignalChannelActivityProcess.h‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
#define RestCore_TRestRawSignalChannelActivityProcess
2525

2626
#include <TH1D.h>
27-
28-
#ifdef REST_DetectorLib
29-
#include <TRestDetectorReadout.h>
30-
#endif
31-
3227
#include <TRestRawSignalEvent.h>
3328

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

49-
/// The number of bins at the readout channels histogram
50-
Int_t fReadoutChannels = 128;
51-
5244
/// The first channel at the daq channels histogram
5345
Int_t fDaqStartChannel = 4320;
5446

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

58-
/// The first channel at the readout channels histogram
59-
Int_t fReadoutStartChannel = 0;
60-
61-
/// The last channel at the readout channels histogram
62-
Int_t fReadoutEndChannel = 128;
63-
6450
/// The daq channels histogram
6551
TH1D* fDaqChannelsHisto = nullptr; //!
6652

67-
/// The readout channels histogram
68-
TH1D* fReadoutChannelsHisto = nullptr; //!
69-
70-
/// The readout channels histogram built with 1-signal events (low threshold)
71-
TH1D* fReadoutChannelsHisto_OneSignal = nullptr; //!
72-
73-
/// The readout channels histogram built with 1-signal events (high threshold)
74-
TH1D* fReadoutChannelsHisto_OneSignal_High = nullptr; //!
75-
76-
/// The readout channels histogram built with 2-signal events (low threshold)
77-
TH1D* fReadoutChannelsHisto_TwoSignals = nullptr; //!
78-
79-
/// The readout channels histogram built with 2-signal events (high threshold)
80-
TH1D* fReadoutChannelsHisto_TwoSignals_High = nullptr; //!
81-
82-
/// The readout channels histogram built with 3-signal events (low threshold)
83-
TH1D* fReadoutChannelsHisto_ThreeSignals = nullptr; //!
84-
85-
/// The readout channels histogram built with 3-signal events (high threshold)
86-
TH1D* fReadoutChannelsHisto_ThreeSignals_High = nullptr; //!
87-
88-
/// The readout channels histogram built more than 3-signal events (low threshold)
89-
TH1D* fReadoutChannelsHisto_MultiSignals = nullptr; //!
90-
91-
/// The readout channels histogram built more than 3-signal events (high threshold)
92-
TH1D* fReadoutChannelsHisto_MultiSignals_High = nullptr; //!
93-
9453
private:
9554
/// A pointer to the specific TRestRawSignalEvent input
9655
TRestRawSignalEvent* fSignalEvent = nullptr; //!
9756

98-
#ifdef REST_DetectorLib
99-
/// A pointer to the readout metadata information accessible to TRestRun
100-
TRestDetectorReadout* fReadout = nullptr; //!
101-
#endif
102-
10357
void Initialize() override;
10458

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

124-
#ifdef REST_DetectorLib
125-
RESTMetadata << "Number of readout histogram channels : " << fReadoutChannels << RESTendl;
126-
RESTMetadata << "Start readout channel : " << fReadoutStartChannel << RESTendl;
127-
RESTMetadata << "End readout channel : " << fReadoutEndChannel << RESTendl;
128-
#else
129-
RESTMetadata << "Some Detector features in this process are not available!" << RESTendl;
130-
#endif
131-
13278
EndPrintProcess();
13379
}
13480

@@ -138,6 +84,6 @@ class TRestRawSignalChannelActivityProcess : public TRestEventProcess {
13884
TRestRawSignalChannelActivityProcess();
13985
~TRestRawSignalChannelActivityProcess();
14086

141-
ClassDefOverride(TRestRawSignalChannelActivityProcess, 3);
87+
ClassDefOverride(TRestRawSignalChannelActivityProcess, 4);
14288
};
14389
#endif

‎inc/TRestRawSignalRecoverChannelsProcess.h‎

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

‎inc/TRestRawToSignalProcess.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ class TRestRawToSignalProcess : public TRestEventProcess {
6161
any GetInputEvent() const override { return any((TRestEvent*)nullptr); }
6262
any GetOutputEvent() const override { return fSignalEvent; }
6363

64+
virtual void InitProcess() override {
65+
fRunOrigin = fRunInfo->GetRunNumber();
66+
fSubRunOrigin = fRunInfo->GetSubRunNumber();
67+
}
68+
6469
void PrintMetadata() override;
6570
void Initialize() override;
6671
TRestMetadata* GetProcessMetadata() const { return nullptr; }

‎src/TRestRawMultiFEMINOSToSignalProcess.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ void TRestRawMultiFEMINOSToSignalProcess::Initialize() {
218218
void TRestRawMultiFEMINOSToSignalProcess::InitProcess() {
219219
RESTDebug << "TRestRawMultiFeminos::InitProcess" << RESTendl;
220220
// Reading binary file header
221+
TRestRawToSignalProcess::InitProcess();
221222

222223
if (!fInputFileNames.empty() && TRestTools::GetFileNameExtension(fInputFileNames[0]) != "aqs") {
223224
RESTError << "The input file extension should be .aqs" << RESTendl;

‎src/TRestRawSignalChannelActivityProcess.cxx‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -133,49 +133,9 @@ void TRestRawSignalChannelActivityProcess::Initialize() {
133133
/// is found in the processing chain.
134134
///
135135
void TRestRawSignalChannelActivityProcess::InitProcess() {
136-
#ifdef REST_DetectorLib
137-
fReadout = GetMetadata<TRestDetectorReadout>();
138-
139-
RESTDebug << "TRestRawSignalChannelActivityProcess::InitProcess. Readout pointer : " << fReadout
140-
<< RESTendl;
141-
if (GetVerboseLevel() >= TRestStringOutput::REST_Verbose_Level::REST_Info && fReadout)
142-
fReadout->PrintMetadata();
143-
#endif
144-
145136
if (!fReadOnly) {
146137
fDaqChannelsHisto = new TH1D("daqChannelActivityRaw", "daqChannelActivityRaw", fDaqChannels,
147138
fDaqStartChannel, fDaqEndChannel);
148-
149-
#ifdef REST_DetectorLib
150-
if (fReadout) {
151-
fReadoutChannelsHisto = new TH1D("rChannelActivityRaw", "readoutChannelActivity",
152-
fReadoutChannels, fReadoutStartChannel, fReadoutEndChannel);
153-
fReadoutChannelsHisto_OneSignal =
154-
new TH1D("rChannelActivityRaw_1", "readoutChannelActivity", fReadoutChannels,
155-
fReadoutStartChannel, fReadoutEndChannel);
156-
fReadoutChannelsHisto_OneSignal_High =
157-
new TH1D("rChannelActivityRaw_1H", "readoutChannelActivity", fReadoutChannels,
158-
fReadoutStartChannel, fReadoutEndChannel);
159-
fReadoutChannelsHisto_TwoSignals =
160-
new TH1D("rChannelActivityRaw_2", "readoutChannelActivity", fReadoutChannels,
161-
fReadoutStartChannel, fReadoutEndChannel);
162-
fReadoutChannelsHisto_TwoSignals_High =
163-
new TH1D("rChannelActivityRaw_2H", "readoutChannelActivity", fReadoutChannels,
164-
fReadoutStartChannel, fReadoutEndChannel);
165-
fReadoutChannelsHisto_ThreeSignals =
166-
new TH1D("rChannelActivityRaw_3", "readoutChannelActivity", fReadoutChannels,
167-
fReadoutStartChannel, fReadoutEndChannel);
168-
fReadoutChannelsHisto_ThreeSignals_High =
169-
new TH1D("rChannelActivityRaw_3H", "readoutChannelActivity", fReadoutChannels,
170-
fReadoutStartChannel, fReadoutEndChannel);
171-
fReadoutChannelsHisto_MultiSignals =
172-
new TH1D("rChannelActivityRaw_M", "readoutChannelActivity", fReadoutChannels,
173-
fReadoutStartChannel, fReadoutEndChannel);
174-
fReadoutChannelsHisto_MultiSignals_High =
175-
new TH1D("rChannelActivityRaw_MH", "readoutChannelActivity", fReadoutChannels,
176-
fReadoutStartChannel, fReadoutEndChannel);
177-
}
178-
#endif
179139
}
180140
}
181141

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

196156
for (int s = 0; s < fSignalEvent->GetNumberOfSignals(); s++) {
197-
// Adding signal to the channel activity histogram
198-
#ifdef REST_DetectorLib
199-
TRestRawSignal* sgnl = fSignalEvent->GetSignal(s);
200-
if (!fReadOnly && fReadout) {
201-
Int_t signalID = fSignalEvent->GetSignal(s)->GetID();
202-
203-
Int_t p, m, readoutChannel;
204-
fReadout->GetPlaneModuleChannel(signalID, p, m, readoutChannel);
205-
206-
fReadoutChannelsHisto->Fill(readoutChannel);
207-
208-
if (sgnl->GetMaxValue() > fLowThreshold) {
209-
if (Nlow == 1) fReadoutChannelsHisto_OneSignal->Fill(readoutChannel);
210-
if (Nlow == 2) fReadoutChannelsHisto_TwoSignals->Fill(readoutChannel);
211-
if (Nlow == 3) fReadoutChannelsHisto_ThreeSignals->Fill(readoutChannel);
212-
if (Nlow > 3 && Nlow < 10) fReadoutChannelsHisto_MultiSignals->Fill(readoutChannel);
213-
}
214-
215-
if (sgnl->GetMaxValue() > fHighThreshold) {
216-
if (Nhigh == 1) fReadoutChannelsHisto_OneSignal_High->Fill(readoutChannel);
217-
if (Nhigh == 2) fReadoutChannelsHisto_TwoSignals_High->Fill(readoutChannel);
218-
if (Nhigh == 3) fReadoutChannelsHisto_ThreeSignals_High->Fill(readoutChannel);
219-
if (Nhigh > 3 && Nhigh < 10) fReadoutChannelsHisto_MultiSignals_High->Fill(readoutChannel);
220-
}
221-
}
222-
#endif
223-
157+
// Adding signal to the channel activity histogram
224158
if (!fReadOnly) {
225159
Int_t daqChannel = fSignalEvent->GetSignal(s)->GetID();
226160
fDaqChannelsHisto->Fill(daqChannel);
@@ -241,20 +175,5 @@ TRestEvent* TRestRawSignalChannelActivityProcess::ProcessEvent(TRestEvent* input
241175
void TRestRawSignalChannelActivityProcess::EndProcess() {
242176
if (!fReadOnly) {
243177
fDaqChannelsHisto->Write();
244-
#ifdef REST_DetectorLib
245-
if (fReadout) {
246-
fReadoutChannelsHisto->Write();
247-
248-
fReadoutChannelsHisto_OneSignal->Write();
249-
fReadoutChannelsHisto_TwoSignals->Write();
250-
fReadoutChannelsHisto_ThreeSignals->Write();
251-
fReadoutChannelsHisto_MultiSignals->Write();
252-
253-
fReadoutChannelsHisto_OneSignal_High->Write();
254-
fReadoutChannelsHisto_TwoSignals_High->Write();
255-
fReadoutChannelsHisto_ThreeSignals_High->Write();
256-
fReadoutChannelsHisto_MultiSignals_High->Write();
257-
}
258-
#endif
259178
}
260179
}

0 commit comments

Comments
 (0)