Skip to content

Commit cd82fc3

Browse files
lucaquaglia15lucaquaglia15
authored
Merge pull request AliceO2Group#1 from alibuild/alibot-cleanup-9403
Please consider the following formatting changes to AliceO2Group#9403
2 parents 80fe469 + d9b8a42 commit cd82fc3

File tree

9 files changed

+62
-64
lines changed

9 files changed

+62
-64
lines changed

‎Detectors/ZDC/calib/include/ZDCCalib/TDCCalib.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace zdc
3737
class TDCCalib //after
3838
{
3939

40-
using CcdbObjectInfo = o2::ccdb::CcdbObjectInfo; //added by me
40+
using CcdbObjectInfo = o2::ccdb::CcdbObjectInfo; //added by me
4141

4242
public:
4343
TDCCalib() = default;
@@ -49,12 +49,12 @@ class TDCCalib //after
4949
const gsl::span<const uint16_t>& info); // Calibration of RUN3 data
5050
int process(const TDCCalibData& data); // Calibration of RUN3 data - aggregator node
5151
int endOfRun(); // Perform minimization
52-
double extractShift(int ih);
52+
double extractShift(int ih);
5353
void add(int ih, o2::dataformats::FlatHisto1D<float>& h1);
5454
int write(const std::string fn = "ZDCTDCCalib.root");
55-
55+
5656
const ZDCTDCParam& getTDCParamUpd() const { return mTDCParamUpd; }; //added by me
57-
CcdbObjectInfo& getCcdbObjectInfo() { return mInfo; } //added by me
57+
CcdbObjectInfo& getCcdbObjectInfo() { return mInfo; } //added by me
5858

5959
void setTDCParam(const ZDCTDCParam* param) { mTDCParam = param; };
6060
const ZDCTDCParam* getTDCParam() const { return mTDCParam; };
@@ -66,18 +66,17 @@ class TDCCalib //after
6666

6767
private:
6868
std::array<o2::dataformats::FlatHisto1D<float>*, NTDCChannels> mCTDC{}; //array of FlatHisto1D, number of elements = NTDCChannles (= 10), defined in constants.h {} means defined but not initialized
69-
std::array<std::unique_ptr<TH1>, NTDCChannels> mHCTDC{}; //copy of flat histo 1D in TH1F to use root functions
69+
std::array<std::unique_ptr<TH1>, NTDCChannels> mHCTDC{}; //copy of flat histo 1D in TH1F to use root functions
7070
bool mInitDone = false;
7171
bool mSaveDebugHistos = true;
7272
const TDCCalibConfig* mTDCCalibConfig = nullptr; /// Configuration of TDC calibration, this line has been swapped with the following one to be consistent with intercalibration
7373
const ZDCTDCParam* mTDCParam = nullptr; /// TDC calibration object
7474
int32_t mVerbosity = DbgMinimal;
7575

7676
TDCCalibData mData;
77-
ZDCTDCParam mTDCParamUpd; /// Updated TDC calibration object, added by me
78-
CcdbObjectInfo mInfo; /// CCDB Info, added by me
79-
void assign(int ih, bool ismod); /// Assign updated calibration object, added by me
80-
77+
ZDCTDCParam mTDCParamUpd; /// Updated TDC calibration object, added by me
78+
CcdbObjectInfo mInfo; /// CCDB Info, added by me
79+
void assign(int ih, bool ismod); /// Assign updated calibration object, added by me
8180
};
8281
} // namespace zdc
8382
} // namespace o2

‎Detectors/ZDC/calib/include/ZDCCalib/TDCCalibConfig.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ struct TDCCalibConfig {
3434
std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity()};
3535
//double cutLow[NTDCChannels] = {-std::numeric_limits<float>::infinity(), -std::numeric_limits<float>::infinity(), -std::numeric_limits<float>::infinity(), -std::numeric_limits<float>::infinity(), -std::numeric_limits<float>::infinity()};
3636
//double cutHigh[NTDCChannels] = {std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity()};
37-
bool enabled[NTDCChannels] = {true,true,true,true,true,true,true,true,true,true}; //ZNAC, ZNAS, ZPAC, ZPAS, ZEM1, ZEM2, ZNCC, ZNCS, ZPCC, ZPCS
38-
int nb1[NTDCChannels] = {0}; /// 1D histogram: number of bins
39-
double amin1[NTDCChannels] = {0}; /// minimum
40-
double amax1[NTDCChannels] = {0}; /// maximum
41-
int nb2[NTDCChannels] = {0}; /// 2D histogram: number of bins
42-
double amin2[NTDCChannels] = {0}; /// minimum
43-
double amax2[NTDCChannels] = {0}; /// maximum
37+
bool enabled[NTDCChannels] = {true, true, true, true, true, true, true, true, true, true}; //ZNAC, ZNAS, ZPAC, ZPAS, ZEM1, ZEM2, ZNCC, ZNCS, ZPCC, ZPCS
38+
int nb1[NTDCChannels] = {0}; /// 1D histogram: number of bins
39+
double amin1[NTDCChannels] = {0}; /// minimum
40+
double amax1[NTDCChannels] = {0}; /// maximum
41+
int nb2[NTDCChannels] = {0}; /// 2D histogram: number of bins
42+
double amin2[NTDCChannels] = {0}; /// minimum
43+
double amax2[NTDCChannels] = {0}; /// maximum
4444
double l_bnd[NTDCChannels] = {0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1};
4545
double u_bnd[NTDCChannels] = {10., 10., 10., 10., 10., 10., 10., 10., 10., 10.};
4646
double l_bnd_o[NTDCChannels] = {-20., -20., -20., -20., -20., -20., -20., -20., -20., -20.};
@@ -85,7 +85,7 @@ struct TDCCalibConfig {
8585
enabled[8] = c8;
8686
enabled[9] = c9;
8787
}
88-
88+
8989
ClassDefNV(TDCCalibConfig, 3);
9090
};
9191
} // namespace zdc

‎Detectors/ZDC/calib/include/ZDCCalib/TDCCalibData.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ namespace zdc
2626
{
2727

2828
struct TDCCalibData {
29-
static constexpr int NTDC = 10; /// ZNAC, ZNAS, ZPAC, ZPAS, ZEM1, ZEM2, ZNCC, ZNCS, ZPCC, ZPCS
30-
uint64_t mCTimeBeg = 0; /// Time of processed time frame
31-
uint64_t mCTimeEnd = 0; /// Time of processed time frame
29+
static constexpr int NTDC = 10; /// ZNAC, ZNAS, ZPAC, ZPAS, ZEM1, ZEM2, ZNCC, ZNCS, ZPCC, ZPCS
30+
uint64_t mCTimeBeg = 0; /// Time of processed time frame
31+
uint64_t mCTimeEnd = 0; /// Time of processed time frame
3232
static constexpr const char* CTDC[NTDC] = {"ZNAC", "ZNAS", "ZPAC", "ZPAS", "ZEM1", "ZEM2", "ZNCC", "ZNCS", "ZPCC", "ZPCS"};
3333
int entries[NTDC] = {0};
3434
TDCCalibData& operator+=(const TDCCalibData& other);

‎Detectors/ZDC/calib/include/ZDCCalib/TDCCalibEPNSpec.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ class TDCCalibEPNSpec : public o2::framework::Task
4444
void endOfStream(o2::framework::EndOfStreamContext& ec) final;
4545

4646
private:
47-
int mVerbosity = DbgMinimal; // Verbosity level
48-
bool mInitialized = false; // Connect once to CCDB during initialization
49-
TDCCalibEPN mWorker; // TDC calibration object (was mTDCCalibEPN, modified after discussion with Pietro 20 June 2022)
47+
int mVerbosity = DbgMinimal; // Verbosity level
48+
bool mInitialized = false; // Connect once to CCDB during initialization
49+
TDCCalibEPN mWorker; // TDC calibration object (was mTDCCalibEPN, modified after discussion with Pietro 20 June 2022)
5050
TStopwatch mTimer;
5151
};
5252

‎Detectors/ZDC/calib/src/TDCCalib.cxx‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ int TDCCalib::endOfRun()
5555
for (int ih = 0; ih < TDCCalibData::NTDC; ih++) {
5656
//LOGF(info, "%s %g events and cuts (%g:%g)", TDCCalibData::CTDC[ih], mData.mSum[ih][5][5], mTDCCalibConfig->cutLow[ih], mTDCCalibConfig->cutHigh[ih]);
5757
LOGF(info, "%s %i events and cuts (%g:%g)", TDCCalibData::CTDC[ih], mData.entries[ih], mTDCCalibConfig->cutLow[ih], mTDCCalibConfig->cutHigh[ih]);
58-
58+
5959
if (!mTDCCalibConfig->enabled[ih]) {
6060
LOGF(info, "DISABLED processing of RUN3 data for ih = %d: %s", ih, TDCCalibData::CTDC[ih]);
6161
assign(ih, false);
62-
}
62+
}
6363

6464
else if (mData.entries[ih] >= mTDCCalibConfig->min_e[ih]) { //if number of events > minimum value accpeted -> process
6565
LOGF(info, "Processed RUN3 data for ih = %d: %s", ih, TDCCalibData::CTDC[ih]);
@@ -99,16 +99,16 @@ int TDCCalib::endOfRun()
9999
// ismod=true if the calibration was updated
100100
void TDCCalib::assign(int ih, bool ismod)
101101
{
102-
if (ih >= 0 && ih <= 9) {
102+
if (ih >= 0 && ih <= 9) {
103103
auto oldval = mTDCParam->getShift(ih); //old value from calibration object (TDCCalib)
104-
if (ismod == true) { //ismod == true
105-
auto val = oldval;
104+
if (ismod == true) { //ismod == true
105+
auto val = oldval;
106106
auto shift = extractShift(ih);
107107
//If final shift < 0 -> put log error!!!!! Or if it's bigger than 25 (whole bx)
108108
//Accept only tdcs of colliding bunches
109109
if (shift >= 0) { //previous shift is positive
110110
val = val + shift;
111-
}
111+
}
112112

113113
else if (shift < 0) { //previous shift is negative
114114
val = val /*12.5*/ - TMath::Abs(shift);
@@ -119,15 +119,15 @@ void TDCCalib::assign(int ih, bool ismod)
119119
}
120120
mTDCParamUpd.setShift(ih, val);
121121
}
122-
122+
123123
else { //ismod == false
124124
if (mVerbosity > DbgZero) {
125125
LOGF(info, "%s NOT CHANGED %8.6f", TDCCalibData::CTDC[ih], oldval);
126126
}
127127
mTDCParamUpd.setShift(ih, oldval);
128128
}
129129
}
130-
130+
131131
else { //TDC index out of range
132132
LOG(fatal) << "TDCCalib::assign accessing not existing ih = " << ih;
133133
}
@@ -137,7 +137,7 @@ void TDCCalib::clear(int ih)
137137
{
138138
int ihstart = 0;
139139
int ihstop = TDCCalibData::NTDC;
140-
140+
141141
for (int32_t ii = ihstart; ii < ihstop; ii++) {
142142
if (mCTDC[ii]) {
143143
mCTDC[ii]->clear();
@@ -161,7 +161,7 @@ void TDCCalib::add(int ih, o2::dataformats::FlatHisto1D<float>& h1)
161161
}
162162

163163
constexpr int nh = TDCCalibData::NTDC;
164-
164+
165165
if (ih >= 0 && ih < nh) {
166166
mCTDC[ih]->add(h1);
167167
} else {
@@ -176,8 +176,8 @@ double TDCCalib::extractShift(int ih)
176176
//h1->Draw("HISTO");
177177
int nEntries = h1->GetEntries();
178178
std::cout << nEntries << std::endl;
179-
if ((ih >= 0 && ih <= 9) && (nEntries >= mTDCCalibConfig->min_e[ih])) { //TDC number is ok and more than minimum entries
180-
double avgShift = h1->GetMean();
179+
if ((ih >= 0 && ih <= 9) && (nEntries >= mTDCCalibConfig->min_e[ih])) { //TDC number is ok and more than minimum entries
180+
double avgShift = h1->GetMean();
181181
return avgShift;
182182
} else {
183183
LOG(error) << "TDCCalib::extractShift TDC out of range " << ih;
@@ -205,4 +205,3 @@ int TDCCalib::write(const std::string fn)
205205
cwd->cd();
206206
return 0;
207207
}
208-

‎Detectors/ZDC/calib/src/TDCCalibEPN.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ int TDCCalibEPN::init()
4949
//----//
5050

5151
int TDCCalibEPN::process(const gsl::span<const o2::zdc::BCRecData>& RecBC,
52-
const gsl::span<const o2::zdc::ZDCEnergy>& Energy,
53-
const gsl::span<const o2::zdc::ZDCTDCData>& TDCData,
54-
const gsl::span<const uint16_t>& Info)
52+
const gsl::span<const o2::zdc::ZDCEnergy>& Energy,
53+
const gsl::span<const o2::zdc::ZDCTDCData>& TDCData,
54+
const gsl::span<const uint16_t>& Info)
5555
{
5656
if (!mInitDone) {
5757
init();
@@ -82,15 +82,15 @@ int TDCCalibEPN::process(const gsl::span<const o2::zdc::BCRecData>& RecBC,
8282
continue;
8383
}
8484

85-
//Fill 1d histograms with tdc values. Check if channel is acquired or not
85+
//Fill 1d histograms with tdc values. Check if channel is acquired or not
8686
for (int itdc = 0; itdc < NTDC; itdc++) { //loop over all TDCs
87-
int nhits = ev.NtdcV(itdc);
87+
int nhits = ev.NtdcV(itdc);
8888

89-
if(nhits > 0) {
90-
//call fill function to fill histo
91-
fill1D(itdc,nhits,ev);
92-
}
93-
}
89+
if (nhits > 0) {
90+
//call fill function to fill histo
91+
fill1D(itdc, nhits, ev);
92+
}
93+
}
9494
}
9595
return 0;
9696
}
@@ -119,7 +119,7 @@ void TDCCalibEPN::clear(int ih)
119119
{
120120
int ihstart = 0;
121121
int ihstop = NTDC;
122-
122+
123123
for (int32_t ii = ihstart; ii < ihstop; ii++) {
124124
if (mTDC[ii]) {
125125
mTDC[ii]->clear();
@@ -134,14 +134,14 @@ void TDCCalibEPN::fill1D(int iTDC, int nHits, o2::zdc::RecEventFlat ev)
134134
//Get TDC values
135135
float tdcVal[nHits];
136136
for (int i = 0; i < nHits; i++) {
137-
tdcVal[i] = ev.tdcV(iTDC,i);
137+
tdcVal[i] = ev.tdcV(iTDC, i);
138138
//std::cout << ev.tdcV(iTDC,i) << std::endl;
139139
std::cout << tdcVal[i] << std::endl;
140140
}
141141

142-
//Fill histo
142+
//Fill histo
143143
for (int hit = 0; hit < nHits; hit++) {
144-
mTDC[iTDC]->fill(tdcVal[hit]);
144+
mTDC[iTDC]->fill(tdcVal[hit]);
145145
}
146146
//mData.entries[iTDC] += (mTDC[iTDC]->createTH1F(TDCCalibData::CTDC[iTDC]))->GetEntries(); //cumulate number of entries of TF histograms
147147
//std::cout << nHits << std::endl;

‎Detectors/ZDC/calib/src/TDCCalibEPNSpec.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ void TDCCalibEPNSpec::run(ProcessingContext& pc)
8888
mTimer.Stop();
8989
mTimer.Reset();
9090
mTimer.Start(false);
91-
}
92-
//auto config = pc.inputs().get<o2::zdc::TDCCalibConfig*>("tdccalibconfig");
91+
}
92+
//auto config = pc.inputs().get<o2::zdc::TDCCalibConfig*>("tdccalibconfig");
9393
const auto ref = pc.inputs().getFirstValid(true);
9494
auto creationTime = DataRefUtils::getHeader<DataProcessingHeader*>(ref)->creation; // approximate time in ms
9595
mWorker.getData().setCreationTime(creationTime);
@@ -132,19 +132,19 @@ framework::DataProcessorSpec getTDCCalibEPNSpec()
132132
std::vector<OutputSpec> outputs;
133133
outputs.emplace_back("ZDC", "TDCCALIBDATA", 0, Lifetime::Timeframe); //added by me
134134
char outputd[o2::header::gSizeDataDescriptionString];
135-
135+
136136
for (int ih = 0; ih < TDCCalibData::NTDC; ih++) {
137137
snprintf(outputd, o2::header::gSizeDataDescriptionString, "TDC_1DH%d", ih);
138138
outputs.emplace_back("ZDC", outputd, 0, Lifetime::Timeframe);
139139
}
140-
140+
141141
return DataProcessorSpec{
142-
"zdc-tdccalib-epn",
142+
"zdc-tdccalib-epn",
143143
inputs,
144144
outputs,
145145
AlgorithmSpec{adaptFromTask<TDCCalibEPNSpec>()},
146146
o2::framework::Options{{"verbosity-level", o2::framework::VariantType::Int, 0, {"Verbosity level"}}}};
147147
}
148148

149-
} //zdc
150-
} //o2
149+
} // namespace zdc
150+
} // namespace o2

‎Detectors/ZDC/calib/src/TDCCalibSpec.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "CCDB/CCDBTimeStampUtils.h"
2121
#include "CCDB/CcdbApi.h"
2222
#include "Framework/Logger.h"
23-
#include "Framework/ControlService.h"
24-
#include "Framework/ConfigParamRegistry.h"
25-
#include "Framework/CCDBParamSpec.h"
23+
#include "Framework/ControlService.h"
24+
#include "Framework/ConfigParamRegistry.h"
25+
#include "Framework/CCDBParamSpec.h"
2626
#include "DetectorsCommonDataFormats/DetID.h"
2727
#include "DataFormatsZDC/BCData.h"
2828
#include "DataFormatsZDC/ChannelData.h"
@@ -146,7 +146,7 @@ framework::DataProcessorSpec getTDCCalibSpec()
146146
std::vector<InputSpec> inputs;
147147
inputs.emplace_back("tdccalibconfig", "ZDC", "TDCCALIBCONFIG", 0, Lifetime::Condition, o2::framework::ccdbParamSpec(fmt::format("{}", o2::zdc::CCDBPathTDCCalibConfig.data())));
148148
inputs.emplace_back("tdccalib", "ZDC", "TDCCALIB", 0, Lifetime::Condition, o2::framework::ccdbParamSpec(fmt::format("{}", o2::zdc::CCDBPathTDCCalib.data())));
149-
inputs.emplace_back("tdccalibdata", "ZDC", "TDCCALIBDATA", 0, Lifetime::Timeframe);
149+
inputs.emplace_back("tdccalibdata", "ZDC", "TDCCALIBDATA", 0, Lifetime::Timeframe);
150150

151151
char outputa[o2::header::gSizeDataDescriptionString];
152152
char outputd[o2::header::gSizeDataDescriptionString];
@@ -168,5 +168,5 @@ framework::DataProcessorSpec getTDCCalibSpec()
168168
Options{{"verbosity-level", o2::framework::VariantType::Int, 1, {"Verbosity level"}}}};
169169
}
170170

171-
} //zdc
172-
} //o2
171+
} // namespace zdc
172+
} // namespace o2

‎Detectors/ZDC/macro/CreateTDCCalibConfig.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void CreateTDCCalibConfig(long tmin = 0, long tmax = -1, std::string ccdbHost =
4545
// The version for this macro considers NO energy calibration, i.e. all coefficients = 1
4646
// It is necessary to set the binning
4747
conf.setBinning1D(100, -5, 5); //same range as plot_calo_loop 2400, -12.5 to 12.5 altrimenti bin vuoti
48-
conf.setBinning2D(50, -5, 5); //same range as plot_calo_loop
48+
conf.setBinning2D(50, -5, 5); //same range as plot_calo_loop
4949

5050
conf.setDescription("Simulated data");
5151

0 commit comments

Comments
 (0)