Skip to content

Commit 25b6713

Browse files
authored
Fix include order and clean up commented code
1 parent 13c94de commit 25b6713

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

‎Common/DataModel/zdcTaskLightIons.cxx‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
/// \brief Task for ZDC in light ions
1414
/// \author chiara.oppedisano@cern.ch
1515

16-
#include <CCDB/BasicCCDBManager.h>
1716
#include "Common/CCDB/EventSelectionParams.h"
1817
#include "Common/DataModel/Centrality.h"
1918
#include "Common/DataModel/EventSelection.h"
2019
#include "Common/DataModel/ZDCLightIons.h"
20+
21+
#include <CCDB/BasicCCDBManager.h>
2122
#include <DataFormatsParameters/GRPLHCIFData.h>
2223
#include <Framework/AnalysisDataModel.h>
2324
#include <Framework/AnalysisHelpers.h>
@@ -180,11 +181,11 @@ struct ZdcTaskLightIons {
180181
std::map<std::string, std::string> metadata;
181182
// use getSpecific to set metadata to avoid crashes related to specific run number
182183
auto grplhcif = ccdbMgr.getSpecific<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp, metadata);
183-
//auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp);
184+
// auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp);
184185
if (grplhcif == nullptr) {
185186
LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp;
186187
}
187-
188+
188189
beamPatternA = grplhcif->getBunchFilling().getBeamPattern(0);
189190
beamPatternC = grplhcif->getBunchFilling().getBeamPattern(1);
190191
bcPatternB = grplhcif->getBunchFilling().getBCPattern();
@@ -195,27 +196,26 @@ struct ZdcTaskLightIons {
195196
for (const auto& bc : bcs) {
196197

197198
if (bc.has_zdc()) {
198-
199-
//int64_t timestamp = bc.timestamp();
199+
200+
// int64_t timestamp = bc.timestamp();
200201
auto timestampFromSOR = (bc.timestamp() - grplhcif->getFillNumberTime()) / 1e3; // Convert to seconds
201202

202203
int bcInOrbit = bc.globalBC() % nBCsPerOrbit;
203-
204+
204205
uint8_t maskSel = 0;
205-
if(bcPatternB[bcInOrbit]){
206+
if (bcPatternB[bcInOrbit]) {
206207
maskSel |= (uint8_t)(0x1u << bcMask_beamB);
207208
}
208-
if(bcPatternA[bcInOrbit]){
209+
if (bcPatternA[bcInOrbit]) {
209210
maskSel |= (uint8_t)(0x1u << bcMask_beamA);
210211
}
211-
if(bcPatternC[bcInOrbit]){
212+
if (bcPatternC[bcInOrbit]) {
212213
maskSel |= (uint8_t)(0x1u << bcMask_beamC);
213214
}
214-
if(bcPatternE[bcInOrbit]){
215+
if (bcPatternE[bcInOrbit]) {
215216
maskSel |= (uint8_t)(0x1u << bcMask_beamE);
216217
}
217218

218-
219219
auto tdcZNA = bc.zdc().timeZNA();
220220
auto tdcZNC = bc.zdc().timeZNC();
221221
auto tdcZPA = bc.zdc().timeZPA();
@@ -403,4 +403,5 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) // o2-linter: disab
403403
{
404404
return WorkflowSpec{
405405
adaptAnalysisTask<ZdcTaskLightIons>(cfgc)};
406-
}Common/Tasks/zdcTableReader.cxx
406+
}
407+
Common / Tasks / zdcTableReader.cxx

0 commit comments

Comments
 (0)