@@ -40,23 +40,23 @@ using namespace o2::framework;
4040
4141MetadataHelper metadataInfo; // Metadata helper
4242
43- static constexpr int kCentRun2V0Ms = 0 ;
44- static constexpr int kCentRun2V0As = 1 ;
45- static constexpr int kCentRun2SPDTrks = 2 ;
46- static constexpr int kCentRun2SPDClss = 3 ;
47- static constexpr int kCentRun2CL0s = 4 ;
48- static constexpr int kCentRun2CL1s = 5 ;
49- static constexpr int kCentFV0As = 6 ;
50- static constexpr int kCentFT0Ms = 7 ;
51- static constexpr int kCentFT0As = 8 ;
52- static constexpr int kCentFT0Cs = 9 ;
53- static constexpr int kCentFT0CVariant1s = 10 ;
54- static constexpr int kCentFDDMs = 11 ;
55- static constexpr int kCentNTPVs = 12 ;
56- static constexpr int kCentNGlobals = 13 ;
57- static constexpr int kCentMFTs = 14 ;
58- static constexpr int NTables = 15 ;
59- static constexpr int NParameters = 1 ;
43+ static constexpr int kRun2V0Ms = 0 ;
44+ static constexpr int kRun2V0As = 1 ;
45+ static constexpr int kRun2SPDTrks = 2 ;
46+ static constexpr int kRun2SPDClss = 3 ;
47+ static constexpr int kRun2CL0s = 4 ;
48+ static constexpr int kRun2CL1s = 5 ;
49+ static constexpr int kFV0As = 6 ;
50+ static constexpr int kFT0Ms = 7 ;
51+ static constexpr int kFT0As = 8 ;
52+ static constexpr int kFT0Cs = 9 ;
53+ static constexpr int kFT0CVariant1s = 10 ;
54+ static constexpr int kFDDMs = 11 ;
55+ static constexpr int kNTPVs = 12 ;
56+ static constexpr int kNGlobals = 13 ;
57+ static constexpr int kMFTs = 14 ;
58+ static constexpr int kNTables = 15 ;
59+ static constexpr int kNParameters = 1 ;
6060static const std::vector<std::string> tableNames{" CentRun2V0Ms" ,
6161 " CentRun2V0As" ,
6262 " CentRun2SPDTrks" ,
@@ -73,7 +73,7 @@ static const std::vector<std::string> tableNames{"CentRun2V0Ms",
7373 " CentNGlobals" ,
7474 " CentMFTs" };
7575static const std::vector<std::string> parameterNames{" Enable" };
76- static const int defaultParameters[NTables][NParameters ]{{-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }};
76+ static const int defaultParameters[kNTables ][ kNParameters ]{{-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }, {-1 }};
7777
7878struct CentralityTable {
7979 Produces<aod::CentRun2V0Ms> centRun2V0M;
@@ -93,7 +93,7 @@ struct CentralityTable {
9393 Produces<aod::CentMFTs> centMFTs;
9494 Service<o2::ccdb::BasicCCDBManager> ccdb;
9595 Configurable<LabeledArray<int >> enabledTables{" enabledTables" ,
96- {defaultParameters[0 ], NTables, NParameters , tableNames, parameterNames},
96+ {defaultParameters[0 ], kNTables , kNParameters , tableNames, parameterNames},
9797 " Produce tables depending on needs. Values different than -1 override the automatic setup: the corresponding table can be set off (0) or on (1)" };
9898 struct : ConfigurableGroup {
9999 Configurable<std::string> ccdbUrl{" ccdbUrl" , " http://alice-ccdb.cern.ch" , " The CCDB endpoint url address" };
@@ -183,7 +183,7 @@ struct CentralityTable {
183183 CalibrationInfo nGlobalInfo = CalibrationInfo(" NGlobal" );
184184 CalibrationInfo mftInfo = CalibrationInfo(" MFT" );
185185 std::vector<int > mEnabledTables ; // Vector of enabled tables
186- std::array<bool , NTables > isTableEnabled;
186+ std::array<bool , kNTables > isTableEnabled;
187187
188188 // Debug output
189189 HistogramRegistry histos{" Histos" , {}, OutputObjHandlingPolicy::AnalysisObject};
@@ -203,7 +203,7 @@ struct CentralityTable {
203203 }
204204
205205 /* Checking the tables which are requested in the workflow and enabling them */
206- for (int i = 0 ; i < NTables ; i++) {
206+ for (int i = 0 ; i < kNTables ; i++) {
207207 int f = enabledTables->get (tableNames[i].c_str (), " Enable" );
208208 enableFlagIfTableRequired (context, tableNames[i], f);
209209 if (f == 1 ) {
@@ -227,7 +227,7 @@ struct CentralityTable {
227227 std::sort (mEnabledTables .begin (), mEnabledTables .end ());
228228
229229 // Check if FT0 is the only centrality needed
230- if (mEnabledTables .size () == 1 && isTableEnabled[kCentFT0Ms ] == true ) {
230+ if (mEnabledTables .size () == 1 && isTableEnabled[kFT0Ms ] == true ) {
231231 LOG (info) << " FT0 only mode is enabled" ;
232232 doprocessRun3FT0.value = true ;
233233 doprocessRun3.value = false ;
@@ -301,7 +301,7 @@ struct CentralityTable {
301301 TFormula* f = reinterpret_cast <TFormula*>(callst->FindObject (ccdbhname));
302302 return f;
303303 };
304- if (isTableEnabled[kCentRun2V0Ms ]) {
304+ if (isTableEnabled[kRun2V0Ms ]) {
305305 LOGF (debug, " Getting new histograms with %d run number for %d run number" , mRunNumber , bc.runNumber ());
306306 Run2V0MInfo.mhVtxAmpCorrV0A = getccdb (" hVtx_fAmplitude_V0A_Normalized" );
307307 Run2V0MInfo.mhVtxAmpCorrV0C = getccdb (" hVtx_fAmplitude_V0C_Normalized" );
@@ -330,7 +330,7 @@ struct CentralityTable {
330330 }
331331 }
332332 }
333- if (isTableEnabled[kCentRun2V0As ]) {
333+ if (isTableEnabled[kRun2V0As ]) {
334334 LOGF (debug, " Getting new histograms with %d run number for %d run number" , mRunNumber , bc.runNumber ());
335335 Run2V0AInfo.mhVtxAmpCorrV0A = getccdb (" hVtx_fAmplitude_V0A_Normalized" );
336336 Run2V0AInfo.mhMultSelCalib = getccdb (" hMultSelCalib_V0A" );
@@ -344,7 +344,7 @@ struct CentralityTable {
344344 }
345345 }
346346 }
347- if (isTableEnabled[kCentRun2SPDTrks ]) {
347+ if (isTableEnabled[kRun2SPDTrks ]) {
348348 LOGF (debug, " Getting new histograms with %d run number for %d run number" , mRunNumber , bc.runNumber ());
349349 Run2SPDTksInfo.mhVtxAmpCorr = getccdb (" hVtx_fnTracklets_Normalized" );
350350 Run2SPDTksInfo.mhMultSelCalib = getccdb (" hMultSelCalib_SPDTracklets" );
@@ -358,7 +358,7 @@ struct CentralityTable {
358358 }
359359 }
360360 }
361- if (isTableEnabled[kCentRun2SPDClss ]) {
361+ if (isTableEnabled[kRun2SPDClss ]) {
362362 LOGF (debug, " Getting new histograms with %d run number for %d run number" , mRunNumber , bc.runNumber ());
363363 Run2SPDClsInfo.mhVtxAmpCorrCL0 = getccdb (" hVtx_fnSPDClusters0_Normalized" );
364364 Run2SPDClsInfo.mhVtxAmpCorrCL1 = getccdb (" hVtx_fnSPDClusters1_Normalized" );
@@ -373,7 +373,7 @@ struct CentralityTable {
373373 }
374374 }
375375 }
376- if (isTableEnabled[kCentRun2CL0s ]) {
376+ if (isTableEnabled[kRun2CL0s ]) {
377377 LOGF (debug, " Getting new histograms with %d run number for %d run number" , mRunNumber , bc.runNumber ());
378378 Run2CL0Info.mhVtxAmpCorr = getccdb (" hVtx_fnSPDClusters0_Normalized" );
379379 Run2CL0Info.mhMultSelCalib = getccdb (" hMultSelCalib_CL0" );
@@ -387,7 +387,7 @@ struct CentralityTable {
387387 }
388388 }
389389 }
390- if (isTableEnabled[kCentRun2CL1s ]) {
390+ if (isTableEnabled[kRun2CL1s ]) {
391391 LOGF (debug, " Getting new histograms with %d run number for %d run number" , mRunNumber , bc.runNumber ());
392392 Run2CL1Info.mhVtxAmpCorr = getccdb (" hVtx_fnSPDClusters1_Normalized" );
393393 Run2CL1Info.mhMultSelCalib = getccdb (" hMultSelCalib_CL1" );
@@ -414,7 +414,7 @@ struct CentralityTable {
414414 return std::pow (((pars[0 ] + pars[1 ] * std::pow (x, pars[2 ])) - pars[3 ]) / pars[4 ], 1 .0f / pars[5 ]);
415415 };
416416
417- if (isTableEnabled[kCentRun2V0Ms ]) {
417+ if (isTableEnabled[kRun2V0Ms ]) {
418418 float cV0M = 105 .0f ;
419419 if (Run2V0MInfo.mCalibrationStored ) {
420420 float v0m;
@@ -431,7 +431,7 @@ struct CentralityTable {
431431 // fill centrality columns
432432 centRun2V0M (cV0M);
433433 }
434- if (isTableEnabled[kCentRun2V0As ]) {
434+ if (isTableEnabled[kRun2V0As ]) {
435435 float cV0A = 105 .0f ;
436436 if (Run2V0AInfo.mCalibrationStored ) {
437437 float v0a = collision.multFV0A () * Run2V0AInfo.mhVtxAmpCorrV0A ->GetBinContent (Run2V0AInfo.mhVtxAmpCorrV0A ->FindFixBin (collision.posZ ()));
@@ -441,7 +441,7 @@ struct CentralityTable {
441441 // fill centrality columns
442442 centRun2V0A (cV0A);
443443 }
444- if (isTableEnabled[kCentRun2SPDTrks ]) {
444+ if (isTableEnabled[kRun2SPDTrks ]) {
445445 float cSPD = 105 .0f ;
446446 if (Run2SPDTksInfo.mCalibrationStored ) {
447447 float spdm = collision.multTracklets () * Run2SPDTksInfo.mhVtxAmpCorr ->GetBinContent (Run2SPDTksInfo.mhVtxAmpCorr ->FindFixBin (collision.posZ ()));
@@ -450,7 +450,7 @@ struct CentralityTable {
450450 LOGF (debug, " centSPDTracklets=%.0f" , cSPD);
451451 centRun2SPDTracklets (cSPD);
452452 }
453- if (isTableEnabled[kCentRun2SPDClss ]) {
453+ if (isTableEnabled[kRun2SPDClss ]) {
454454 float cSPD = 105 .0f ;
455455 if (Run2SPDClsInfo.mCalibrationStored ) {
456456 float spdm = bc.spdClustersL0 () * Run2SPDClsInfo.mhVtxAmpCorrCL0 ->GetBinContent (Run2SPDClsInfo.mhVtxAmpCorrCL0 ->FindFixBin (collision.posZ ())) +
@@ -460,7 +460,7 @@ struct CentralityTable {
460460 LOGF (debug, " centSPDClusters=%.0f" , cSPD);
461461 centRun2SPDClusters (cSPD);
462462 }
463- if (isTableEnabled[kCentRun2CL0s ]) {
463+ if (isTableEnabled[kRun2CL0s ]) {
464464 float cCL0 = 105 .0f ;
465465 if (Run2CL0Info.mCalibrationStored ) {
466466 float cl0m = bc.spdClustersL0 () * Run2CL0Info.mhVtxAmpCorr ->GetBinContent (Run2CL0Info.mhVtxAmpCorr ->FindFixBin (collision.posZ ()));
@@ -469,7 +469,7 @@ struct CentralityTable {
469469 LOGF (debug, " centCL0=%.0f" , cCL0);
470470 centRun2CL0 (cCL0);
471471 }
472- if (isTableEnabled[kCentRun2CL1s ]) {
472+ if (isTableEnabled[kRun2CL1s ]) {
473473 float cCL1 = 105 .0f ;
474474 if (Run2CL1Info.mCalibrationStored ) {
475475 float cl1m = bc.spdClustersL1 () * Run2CL1Info.mhVtxAmpCorr ->GetBinContent (Run2CL1Info.mhVtxAmpCorr ->FindFixBin (collision.posZ ()));
@@ -494,31 +494,31 @@ struct CentralityTable {
494494 // do memory reservation for the relevant tables only, please
495495 for (auto const & table : mEnabledTables ) {
496496 switch (table) {
497- case kCentFV0As :
497+ case kFV0As :
498498 centFV0A.reserve (collisions.size ());
499499 break ;
500- case kCentFT0Ms :
500+ case kFT0Ms :
501501 centFT0M.reserve (collisions.size ());
502502 break ;
503- case kCentFT0As :
503+ case kFT0As :
504504 centFT0A.reserve (collisions.size ());
505505 break ;
506- case kCentFT0Cs :
506+ case kFT0Cs :
507507 centFT0C.reserve (collisions.size ());
508508 break ;
509- case kCentFT0CVariant1s :
509+ case kFT0CVariant1s :
510510 centFT0CVariant1.reserve (collisions.size ());
511511 break ;
512- case kCentFDDMs :
512+ case kFDDMs :
513513 centFDDM.reserve (collisions.size ());
514514 break ;
515- case kCentNTPVs :
515+ case kNTPVs :
516516 centNTPV.reserve (collisions.size ());
517517 break ;
518- case kCentNGlobals :
518+ case kNGlobals :
519519 centNGlobals.reserve (collisions.size ());
520520 break ;
521- case kCentMFTs :
521+ case kMFTs :
522522 centMFTs.reserve (collisions.size ());
523523 break ;
524524 default :
@@ -596,31 +596,31 @@ struct CentralityTable {
596596
597597 for (auto const & table : mEnabledTables ) {
598598 switch (table) {
599- case kCentFV0As :
599+ case kFV0As :
600600 getccdb (fv0aInfo, ccdbConfig.genName );
601601 break ;
602- case kCentFT0Ms :
602+ case kFT0Ms :
603603 getccdb (ft0mInfo, ccdbConfig.genName );
604604 break ;
605- case kCentFT0As :
605+ case kFT0As :
606606 getccdb (ft0aInfo, ccdbConfig.genName );
607607 break ;
608- case kCentFT0Cs :
608+ case kFT0Cs :
609609 getccdb (ft0cInfo, ccdbConfig.genName );
610610 break ;
611- case kCentFT0CVariant1s :
611+ case kFT0CVariant1s :
612612 getccdb (ft0cVariant1Info, ccdbConfig.genName );
613613 break ;
614- case kCentFDDMs :
614+ case kFDDMs :
615615 getccdb (fddmInfo, ccdbConfig.genName );
616616 break ;
617- case kCentNTPVs :
617+ case kNTPVs :
618618 getccdb (ntpvInfo, ccdbConfig.genName );
619619 break ;
620- case kCentNGlobals :
620+ case kNGlobals :
621621 getccdb (nGlobalInfo, ccdbConfig.genName );
622622 break ;
623- case kCentMFTs :
623+ case kMFTs :
624624 getccdb (mftInfo, ccdbConfig.genName );
625625 break ;
626626 default :
@@ -669,12 +669,12 @@ struct CentralityTable {
669669
670670 for (auto const & table : mEnabledTables ) {
671671 switch (table) {
672- case kCentFV0As :
672+ case kFV0As :
673673 if constexpr (enableCentFV0) {
674674 populateTable (centFV0A, fv0aInfo, collision.multZeqFV0A ());
675675 }
676676 break ;
677- case kCentFT0Ms :
677+ case kFT0Ms :
678678 if constexpr (enableCentFT0) {
679679 const float perC = populateTable (centFT0M, ft0mInfo, collision.multZeqFT0A () + collision.multZeqFT0C ());
680680 if (produceHistograms.value ) {
@@ -689,7 +689,7 @@ struct CentralityTable {
689689 }
690690 }
691691 break ;
692- case kCentFT0As :
692+ case kFT0As :
693693 if constexpr (enableCentFT0) {
694694 const float perC = populateTable (centFT0A, ft0aInfo, collision.multZeqFT0A ());
695695 if (produceHistograms.value ) {
@@ -704,7 +704,7 @@ struct CentralityTable {
704704 }
705705 }
706706 break ;
707- case kCentFT0Cs :
707+ case kFT0Cs :
708708 if constexpr (enableCentFT0) {
709709 const float perC = populateTable (centFT0C, ft0cInfo, collision.multZeqFT0C ());
710710 if (produceHistograms.value ) {
@@ -719,27 +719,27 @@ struct CentralityTable {
719719 }
720720 }
721721 break ;
722- case kCentFT0CVariant1s :
722+ case kFT0CVariant1s :
723723 if constexpr (enableCentFT0) {
724724 populateTable (centFT0CVariant1, ft0cVariant1Info, collision.multZeqFT0C ());
725725 }
726726 break ;
727- case kCentFDDMs :
727+ case kFDDMs :
728728 if constexpr (enableCentFDD) {
729729 populateTable (centFDDM, fddmInfo, collision.multZeqFDDA () + collision.multZeqFDDC ());
730730 }
731731 break ;
732- case kCentNTPVs :
732+ case kNTPVs :
733733 if constexpr (enableCentNTPV) {
734734 populateTable (centNTPV, ntpvInfo, collision.multZeqNTracksPV ());
735735 }
736736 break ;
737- case kCentNGlobals :
737+ case kNGlobals :
738738 if constexpr (enableCentNGlobal) {
739739 populateTable (centNGlobals, nGlobalInfo, collision.multNTracksGlobal ());
740740 }
741741 break ;
742- case kCentMFTs :
742+ case kMFTs :
743743 if constexpr (enableCentMFT) {
744744 populateTable (centMFTs, mftInfo, collision.mftNtracks ());
745745 }
0 commit comments