Skip to content

Commit 0959dbe

Browse files
jose-luis-rsjose-luis-rs
committed
MWPC: Update online
Minor change
1 parent af52bfe commit 0959dbe

4 files changed

Lines changed: 116 additions & 176 deletions

File tree

‎mwpc/online/R3BMwpcCorrelationOnlineSpectra.cxx‎

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
3-
* Copyright (C) 2019-2023 Members of R3B Collaboration *
3+
* Copyright (C) 2019-2024 Members of R3B Collaboration *
44
* *
55
* This software is distributed under the terms of the *
66
* GNU General Public Licence (GPL) version 3, *
@@ -23,26 +23,25 @@
2323

2424
#include "R3BMwpcCorrelationOnlineSpectra.h"
2525
#include "R3BEventHeader.h"
26+
#include "R3BLogger.h"
2627
#include "R3BMwpcCalData.h"
2728
#include "R3BMwpcHitData.h"
28-
#include "THttpServer.h"
29+
#include "R3BShared.h"
2930

3031
#include "FairLogger.h"
3132
#include "FairRootManager.h"
3233
#include "FairRunAna.h"
3334
#include "FairRunOnline.h"
3435
#include "FairRuntimeDb.h"
35-
#include "TCanvas.h"
36-
#include "TFolder.h"
37-
#include "TH1F.h"
38-
#include "TH2F.h"
39-
40-
#include "TClonesArray.h"
41-
#include "TMath.h"
42-
#include "TRandom.h"
43-
#include <array>
44-
#include <cstdlib>
45-
#include <ctime>
36+
37+
#include <TCanvas.h>
38+
#include <TClonesArray.h>
39+
#include <TFolder.h>
40+
#include <TH1F.h>
41+
#include <TH2F.h>
42+
#include <THttpServer.h>
43+
#include <TMath.h>
44+
#include <TRandom.h>
4645
#include <fstream>
4746
#include <iostream>
4847
#include <sstream>
@@ -60,32 +59,13 @@ R3BMwpcCorrelationOnlineSpectra::R3BMwpcCorrelationOnlineSpectra(const TString&
6059
const TString& namedet1,
6160
const TString& namedet2)
6261
: FairTask(name, iVerbose)
63-
, fCalItemsMwpc1(NULL)
64-
, fHitItemsMwpc1(NULL)
65-
, fCalItemsMwpc2(NULL)
66-
, fHitItemsMwpc2(NULL)
6762
, fNameDet1(namedet1)
6863
, fNameDet2(namedet2)
69-
, fNEvents(0)
70-
{
71-
}
72-
73-
R3BMwpcCorrelationOnlineSpectra::~R3BMwpcCorrelationOnlineSpectra()
7464
{
75-
LOG(info) << "R3BMwpc" + fNameDet1 + "vs" + fNameDet2 + "CorrelationOnlineSpectra::Delete instance";
76-
if (fCalItemsMwpc1)
77-
delete fCalItemsMwpc1;
78-
if (fHitItemsMwpc1)
79-
delete fHitItemsMwpc1;
80-
if (fCalItemsMwpc2)
81-
delete fCalItemsMwpc2;
82-
if (fHitItemsMwpc2)
83-
delete fHitItemsMwpc2;
8465
}
8566

8667
InitStatus R3BMwpcCorrelationOnlineSpectra::Init()
8768
{
88-
8969
LOG(info) << "R3B" + fNameDet1 + "vs" + fNameDet2 + "CorrelationOnlineSpectra::Init ";
9070

9171
// try to get a handle on the EventHeader. EventHeader may not be
@@ -100,15 +80,10 @@ InitStatus R3BMwpcCorrelationOnlineSpectra::Init()
10080

10181
// get access to mapped data of the mwpc detectors
10282
fCalItemsMwpc1 = dynamic_cast<TClonesArray*>(mgr->GetObject(fNameDet1 + "CalData"));
103-
if (!fCalItemsMwpc1)
104-
{
105-
return kFATAL;
106-
}
83+
R3BLOG_IF(fatal, fCalItemsMwpc1 == nullptr, fNameDet1 + "CalData not found");
84+
10785
fCalItemsMwpc2 = dynamic_cast<TClonesArray*>(mgr->GetObject(fNameDet2 + "CalData"));
108-
if (!fCalItemsMwpc2)
109-
{
110-
return kFATAL;
111-
}
86+
R3BLOG_IF(fatal, fCalItemsMwpc2 == nullptr, fNameDet2 + "CalData not found");
11287

11388
// get access to hit data of mwpcs
11489
fHitItemsMwpc1 = dynamic_cast<TClonesArray*>(mgr->GetObject(fNameDet1 + "HitData"));
@@ -133,9 +108,9 @@ InitStatus R3BMwpcCorrelationOnlineSpectra::Init()
133108
Name1 = "fh2_" + fNameDet1 + "-" + fNameDet2 + "_calx";
134109
Name2 = "Position-X: " + fNameDet1 + " vs " + fNameDet2;
135110
if (fNameDet2 != "Mwpc3")
136-
fh2_mwpc_calx = new TH2F(Name1, Name2, 64, 0.5, 64.5, 64, 0.5, 64.5);
111+
fh2_mwpc_calx = R3B::root_owned<TH2F>(Name1, Name2, 64, 0.5, 64.5, 64, 0.5, 64.5);
137112
else
138-
fh2_mwpc_calx = new TH2F(Name1, Name2, 64, 0.5, 64.5, 288, 0.5, 288.5);
113+
fh2_mwpc_calx = R3B::root_owned<TH2F>(Name1, Name2, 64, 0.5, 64.5, 288, 0.5, 288.5);
139114
fh2_mwpc_calx->GetXaxis()->SetTitle(fNameDet1 + "-X [pads]");
140115
fh2_mwpc_calx->GetYaxis()->SetTitle(fNameDet2 + "-X [pads]");
141116
fh2_mwpc_calx->GetYaxis()->SetTitleOffset(1.1);
@@ -151,9 +126,9 @@ InitStatus R3BMwpcCorrelationOnlineSpectra::Init()
151126
Name1 = "fh2_" + fNameDet1 + "-" + fNameDet2 + "_caly";
152127
Name2 = "Position-Y: " + fNameDet1 + " vs " + fNameDet2;
153128
if (fNameDet2 != "Mwpc3")
154-
fh2_mwpc_caly = new TH2F(Name1, Name2, 64, 0.5, 64.5, 64, 0.5, 64.5);
129+
fh2_mwpc_caly = R3B::root_owned<TH2F>(Name1, Name2, 64, 0.5, 64.5, 64, 0.5, 64.5);
155130
else
156-
fh2_mwpc_caly = new TH2F(Name1, Name2, 64, 0.5, 64.5, 120, 0.5, 120.5);
131+
fh2_mwpc_caly = R3B::root_owned<TH2F>(Name1, Name2, 64, 0.5, 64.5, 120, 0.5, 120.5);
157132
fh2_mwpc_caly->GetXaxis()->SetTitle(fNameDet1 + "-Y [pads]");
158133
fh2_mwpc_caly->GetYaxis()->SetTitle(fNameDet2 + "-Y [pads]");
159134
fh2_mwpc_caly->GetYaxis()->SetTitleOffset(1.1);
@@ -174,9 +149,9 @@ InitStatus R3BMwpcCorrelationOnlineSpectra::Init()
174149
Name1 = "fh2_" + fNameDet1 + "-" + fNameDet2 + "_hitx";
175150
Name2 = "Position-X: " + fNameDet1 + " vs " + fNameDet2;
176151
if (fNameDet2 != "Mwpc3")
177-
fh2_mwpc_hitx = new TH2F(Name1, Name2, 500, -100., 100., 500, -100., 100.);
152+
fh2_mwpc_hitx = R3B::root_owned<TH2F>(Name1, Name2, 500, -100., 100., 500, -100., 100.);
178153
else
179-
fh2_mwpc_hitx = new TH2F(Name1, Name2, 600, -100., 100., 1200, -450, 450);
154+
fh2_mwpc_hitx = R3B::root_owned<TH2F>(Name1, Name2, 600, -100., 100., 1200, -450, 450);
180155
fh2_mwpc_hitx->GetXaxis()->SetTitle(fNameDet1 + "-X [mm]");
181156
fh2_mwpc_hitx->GetYaxis()->SetTitle(fNameDet2 + "-X [mm]");
182157
fh2_mwpc_hitx->GetYaxis()->SetTitleOffset(1.1);
@@ -192,9 +167,9 @@ InitStatus R3BMwpcCorrelationOnlineSpectra::Init()
192167
Name1 = "fh2_" + fNameDet1 + "-" + fNameDet2 + "_hity";
193168
Name2 = "Position-Y: " + fNameDet1 + " vs " + fNameDet2;
194169
if (fNameDet2 != "Mwpc3")
195-
fh2_mwpc_hity = new TH2F(Name1, Name2, 500, -100., 100., 500, -100., 100.);
170+
fh2_mwpc_hity = R3B::root_owned<TH2F>(Name1, Name2, 500, -100., 100., 500, -100., 100.);
196171
else
197-
fh2_mwpc_hity = new TH2F(Name1, Name2, 600, -100., 100., 800, -300., 300.);
172+
fh2_mwpc_hity = R3B::root_owned<TH2F>(Name1, Name2, 600, -100., 100., 800, -300., 300.);
198173
fh2_mwpc_hity->GetXaxis()->SetTitle(fNameDet1 + "-Y [mm]");
199174
fh2_mwpc_hity->GetYaxis()->SetTitle(fNameDet2 + "-Y [mm]");
200175
fh2_mwpc_hity->GetYaxis()->SetTitleOffset(1.1);
@@ -236,7 +211,7 @@ void R3BMwpcCorrelationOnlineSpectra::Reset_Histo()
236211
}
237212
}
238213

239-
void R3BMwpcCorrelationOnlineSpectra::Exec(Option_t* option)
214+
void R3BMwpcCorrelationOnlineSpectra::Exec(Option_t* /*option*/)
240215
{
241216
FairRootManager* mgr = FairRootManager::Instance();
242217
if (NULL == mgr)
@@ -369,4 +344,4 @@ void R3BMwpcCorrelationOnlineSpectra::FinishTask()
369344
}
370345
}
371346

372-
ClassImp(R3BMwpcCorrelationOnlineSpectra);
347+
ClassImp(R3BMwpcCorrelationOnlineSpectra)

‎mwpc/online/R3BMwpcCorrelationOnlineSpectra.h‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
* Copyright (C) 2019 GSI Helmholtzzentrum für Schwerionenforschung GmbH *
3-
* Copyright (C) 2019-2023 Members of R3B Collaboration *
3+
* Copyright (C) 2019-2024 Members of R3B Collaboration *
44
* *
55
* This software is distributed under the terms of the *
66
* GNU General Public Licence (GPL) version 3, *
@@ -17,8 +17,7 @@
1717
// ----- Fill MWPC correlation online histograms -----
1818
// ------------------------------------------------------------
1919

20-
#ifndef R3BMwpcCorrelationOnlineSpectra_H
21-
#define R3BMwpcCorrelationOnlineSpectra_H 1
20+
#pragma once
2221

2322
#include "FairTask.h"
2423
#include "TCanvas.h"
@@ -60,50 +59,49 @@ class R3BMwpcCorrelationOnlineSpectra : public FairTask
6059
* Destructor.
6160
* Frees the memory used by the object.
6261
*/
63-
virtual ~R3BMwpcCorrelationOnlineSpectra();
62+
virtual ~R3BMwpcCorrelationOnlineSpectra() = default;
6463

6564
/**
6665
* Method for task initialization.
6766
* This function is called by the framework before
6867
* the event loop.
6968
* @return Initialization status. kSUCCESS, kERROR or kFATAL.
7069
*/
71-
virtual InitStatus Init();
70+
InitStatus Init() override;
7271

7372
/**
7473
* Method for event loop implementation.
7574
* Is called by the framework every time a new event is read.
7675
* @param option an execution option.
7776
*/
78-
virtual void Exec(Option_t* option);
77+
void Exec(Option_t* /*option*/) override;
7978

8079
/**
8180
* A method for finish of processing of an event.
8281
* Is called by the framework for each event after executing
8382
* the tasks.
8483
*/
85-
virtual void FinishEvent();
84+
void FinishEvent() override;
8685

8786
/**
8887
* Method for finish of the task execution.
8988
* Is called by the framework after processing the event loop.
9089
*/
91-
virtual void FinishTask();
90+
void FinishTask() override;
9291

9392
/**
9493
* Methods to clean histograms.
9594
*/
9695
virtual void Reset_Histo();
9796

9897
private:
99-
TClonesArray* fCalItemsMwpc1; /**< Array with cal items. */
100-
TClonesArray* fHitItemsMwpc1; /**< Array with hit items. */
101-
TClonesArray* fCalItemsMwpc2; /**< Array with cal items. */
102-
TClonesArray* fHitItemsMwpc2; /**< Array with hit items. */
98+
TClonesArray* fCalItemsMwpc1 = nullptr; /**< Array with cal items. */
99+
TClonesArray* fHitItemsMwpc1 = nullptr; /**< Array with hit items. */
100+
TClonesArray* fCalItemsMwpc2 = nullptr; /**< Array with cal items. */
101+
TClonesArray* fHitItemsMwpc2 = nullptr; /**< Array with hit items. */
103102

104103
// check for trigger should be done globablly (somewhere else)
105-
R3BEventHeader* header; /**< Event header. */
106-
Int_t fNEvents; /**< Event counter. */
104+
int fNEvents = 0;
107105
TString fNameDet1, fNameDet2;
108106

109107
// Canvas
@@ -116,7 +114,5 @@ class R3BMwpcCorrelationOnlineSpectra : public FairTask
116114
TH2F* fh2_mwpc_hity;
117115

118116
public:
119-
ClassDef(R3BMwpcCorrelationOnlineSpectra, 1)
117+
ClassDefOverride(R3BMwpcCorrelationOnlineSpectra, 1)
120118
};
121-
122-
#endif

0 commit comments

Comments
 (0)