Skip to content

Commit 11fea85

Browse files
jose-luis-rsjose-luis-rs
committed
Update of R3BCalifaOnlineSpectra
Use of std::string in R3BCalifaOnlineSpectra instead of sprintf Update definition of histograms Update califa online class Update string side Update ring value for mapped histograms Removed inline Basic changes
1 parent b4eaefb commit 11fea85

12 files changed

Lines changed: 468 additions & 497 deletions

‎califa/calibration/R3BCalifaCrystalCal2TotCalPar.cxx‎

Lines changed: 16 additions & 18 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, *
@@ -11,31 +11,30 @@
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
1313

14-
#include "TClonesArray.h"
15-
#include "TF1.h"
16-
#include "TGraph.h"
17-
#include "TH1F.h"
18-
#include "TMath.h"
19-
#include "TObjArray.h"
20-
#include "TRandom.h"
21-
#include "TSpectrum.h"
22-
#include "TVector3.h"
23-
24-
#include "FairLogger.h"
25-
#include "FairRootManager.h"
26-
#include "FairRunAna.h"
27-
#include "FairRuntimeDb.h"
14+
#include <FairLogger.h>
15+
#include <FairRootManager.h>
16+
#include <FairRunAna.h>
17+
#include <FairRuntimeDb.h>
2818

2919
#include "R3BCalifaCrystalCal2TotCalPar.h"
3020
#include "R3BCalifaCrystalCalData.h"
3121
#include "R3BCalifaMappingPar.h"
3222
#include "R3BCalifaTotCalPar.h"
3323

24+
#include <TClonesArray.h>
25+
#include <TF1.h>
26+
#include <TGraph.h>
27+
#include <TH1F.h>
28+
#include <TMath.h>
29+
#include <TObjArray.h>
30+
#include <TRandom.h>
31+
#include <TSpectrum.h>
32+
#include <TVector3.h>
3433
#include <iostream>
3534
#include <stdlib.h>
3635

3736
R3BCalifaCrystalCal2TotCalPar::R3BCalifaCrystalCal2TotCalPar()
38-
: R3BCalifaCrystalCal2TotCalPar("R3B CALIFA Tot Calibration Parameters Finder ", 1)
37+
: R3BCalifaCrystalCal2TotCalPar("R3BCalifaCrystalCal2TotCalPar", 1)
3938
{
4039
}
4140

@@ -56,7 +55,6 @@ R3BCalifaCrystalCal2TotCalPar::R3BCalifaCrystalCal2TotCalPar(const char* name, I
5655

5756
R3BCalifaCrystalCal2TotCalPar::~R3BCalifaCrystalCal2TotCalPar()
5857
{
59-
LOG(info) << "R3BCalifaCrystalCal2TotCalPar: Delete instance";
6058
if (fCrystalCalDataCA)
6159
delete fCrystalCalDataCA;
6260
}
@@ -230,7 +228,7 @@ void R3BCalifaCrystalCal2TotCalPar::Search_TotParams()
230228
energy_vs_tot_crystal[i]->Fit("f1", "R0");
231229
for (Int_t h = 0; h < fNumParam; h++)
232230
{
233-
fTotCal_Par->SetCryCalParams(f1->GetParameter(h), fNumParam * i + h);
231+
fTotCal_Par->SetCryCalParams(f1->GetParameter(h), fNumParam * i + h + 1); // 1-base
234232
}
235233
}
236234

‎califa/calibration/R3BCalifaMapped2CrystalCal.cxx‎

Lines changed: 12 additions & 29 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, *
@@ -10,14 +10,15 @@
1010
* granted to it by virtue of its status as an Intergovernmental Organization *
1111
* or submit itself to any jurisdiction. *
1212
******************************************************************************/
13-
#include "TClonesArray.h"
14-
#include "TMath.h"
15-
#include "TRandom.h"
13+
14+
#include <TClonesArray.h>
15+
#include <TMath.h>
16+
#include <TRandom.h>
1617
#include <iomanip>
1718

18-
#include "FairLogger.h"
19-
#include "FairRootManager.h"
20-
#include "FairRuntimeDb.h"
19+
#include <FairLogger.h>
20+
#include <FairRootManager.h>
21+
#include <FairRuntimeDb.h>
2122

2223
#include "R3BCalifaCrystalCalData.h"
2324
#include "R3BCalifaCrystalCalPar.h"
@@ -29,14 +30,6 @@
2930
// R3BCalifaMapped2CrystalCal::Constructor
3031
R3BCalifaMapped2CrystalCal::R3BCalifaMapped2CrystalCal()
3132
: FairTask("R3BCalifaMapped2CrystalCal")
32-
, fNumCrystals(0)
33-
, fNumParams(0)
34-
, fNumTotParams(0)
35-
, fCalParams(NULL)
36-
, fCal_Par(NULL)
37-
, fOnline(kFALSE)
38-
, fCalifaMappedDataCA(NULL)
39-
, fCalifaCryCalDataCA(NULL)
4033
{
4134
}
4235

@@ -96,7 +89,7 @@ void R3BCalifaMapped2CrystalCal::SetParameter()
9689
fNumCrystals = fCal_Par->GetNumCrystals(); // Number of Crystals
9790
fNumParams = fCal_Par->GetNumParametersFit(); // Number of Parameters
9891

99-
fCalParams = fCal_Par->GetCryCalParams(); // Array with the Cal parameters
92+
fCalParams = const_cast<TArrayF*>(fCal_Par->GetCryCalParams()); // Array with the Cal parameters
10093
assert(fCalParams->GetSize() >= fNumCrystals * fNumParams);
10194

10295
R3BLOG(info, "Max Crystal ID " << fNumCrystals);
@@ -151,25 +144,15 @@ InitStatus R3BCalifaMapped2CrystalCal::Init()
151144
{
152145
R3BLOG(info, "");
153146

154-
// INPUT DATA
155147
FairRootManager* rootManager = FairRootManager::Instance();
156-
if (!rootManager)
157-
{
158-
R3BLOG(fatal, "FairRootManager not found");
159-
return kFATAL;
160-
}
148+
R3BLOG_IF(fatal, rootManager == nullptr, "FairRootManager not found");
161149

150+
// INPUT DATA
162151
fCalifaMappedDataCA = dynamic_cast<TClonesArray*>(rootManager->GetObject("CalifaMappedData"));
163-
if (!fCalifaMappedDataCA)
164-
{
165-
R3BLOG(fatal, "CalifaMappedData not found");
166-
return kFATAL;
167-
}
152+
R3BLOG_IF(fatal, fCalifaMappedDataCA == nullptr, "CalifaMappedData not found");
168153

169154
// OUTPUT DATA
170-
// Calibrated data
171155
fCalifaCryCalDataCA = new TClonesArray("R3BCalifaCrystalCalData");
172-
173156
rootManager->Register("CalifaCrystalCalData", "CALIFA Crystal Cal", fCalifaCryCalDataCA, !fOnline);
174157

175158
SetParameter();

‎califa/calibration/R3BCalifaMapped2CrystalCal.h‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222

2323
#pragma once
2424

25-
#ifndef R3BCALIFAMAPPED2CRYSTALCAL_H
26-
#define R3BCALIFAMAPPED2CRYSTALCAL_H 1
27-
28-
#include "FairTask.h"
25+
#include <FairTask.h>
2926

3027
#include "R3BCalifaCrystalCalData.h"
3128
#include "R3BCalifaMappedData.h"
@@ -67,18 +64,18 @@ class R3BCalifaMapped2CrystalCal : public FairTask
6764
private:
6865
void SetParameter();
6966

70-
UInt_t fNumCrystals;
71-
UInt_t fNumParams;
72-
UInt_t fNumTotParams;
67+
UInt_t fNumCrystals = 5088;
68+
UInt_t fNumParams = 2;
69+
UInt_t fNumTotParams = 2;
7370
TArrayF* fCalParams;
7471
TArrayF* fCalTotParams;
7572
// Don't store data for online
76-
Bool_t fOnline;
73+
Bool_t fOnline = false;
7774

78-
R3BCalifaCrystalCalPar* fCal_Par; /**< Parameter container. >*/
79-
R3BCalifaTotCalPar* fTotCal_Par; /**< Tot Parameter container. >*/
80-
TClonesArray* fCalifaMappedDataCA; /**< Array with CALIFA Mapped- input data. >*/
81-
TClonesArray* fCalifaCryCalDataCA; /**< Array with CALIFA Cal- output data. >*/
75+
R3BCalifaCrystalCalPar* fCal_Par = nullptr; /**< Parameter container. >*/
76+
R3BCalifaTotCalPar* fTotCal_Par = nullptr; /**< Tot Parameter container. >*/
77+
TClonesArray* fCalifaMappedDataCA = nullptr; /**< Array with CALIFA Mapped- input data. >*/
78+
TClonesArray* fCalifaCryCalDataCA = nullptr; /**< Array with CALIFA Cal- output data. >*/
8279

8380
/** Private method AddCalData **/
8481
R3BCalifaCrystalCalData* AddCalData(Int_t id,
@@ -92,5 +89,3 @@ class R3BCalifaMapped2CrystalCal : public FairTask
9289
// Class definition
9390
ClassDef(R3BCalifaMapped2CrystalCal, 1)
9491
};
95-
96-
#endif /* R3BCALIFAMAPPED2CRYSTALCAL_H */

‎califa/calibration/R3BCalifaMapped2CrystalCalPar.cxx‎

Lines changed: 2 additions & 2 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, *
@@ -317,7 +317,7 @@ void R3BCalifaMapped2CrystalCalPar::SearchPeaks()
317317

318318
for (Int_t h = 0; h < numPars; h++)
319319
{
320-
fCal_Par->SetCryCalParams(f1->GetParameter(h), numPars * i + h);
320+
fCal_Par->SetCryCalParams(f1->GetParameter(h), numPars * i + h + 1); // 1-base
321321
}
322322
}
323323
else

0 commit comments

Comments
 (0)