1414
1515#include < iostream>
1616#include < string>
17+ #include < memory>
18+ #include < vector>
19+ #include < map>
1720
1821#include " TF1.h"
1922#include " TGraphErrors.h"
@@ -82,7 +85,7 @@ struct RobustFluctuationObservables {
8285 // for vertex vs time:
8386 bool flagShowInfo = false ;
8487 int lastRunNumber = -1 ;
85- int nBCsPerOrbit = 3564 ;
88+ uint64_t nBCsPerOrbit = 3564 ;
8689
8790 // bc position correlations
8891 int64_t prevOrbit = -1 ;
@@ -101,7 +104,7 @@ struct RobustFluctuationObservables {
101104 int64_t orbitSOR = -1 ;
102105 // int64_t bcSORbis = -1; // global bc of the start of the first orbit - try alternative
103106 int64_t nBCsPerTF = 1 ; // 128*3564; // duration of TF in bcs
104- int64_t TFid = - 1 ; // count time frames in a given run
107+ uint64_t TFid = 0 ; // count time frames in a given run
105108 bool flagWaitForNewTF = false ;
106109 uint32_t nOrbitsPerTF = 0 ;
107110
@@ -154,7 +157,7 @@ struct RobustFluctuationObservables {
154157 // hand-made ITS ROF cut
155158 Configurable<int > nITSROF{" nITSROF" , 6 , " nITSROF" };
156159 Configurable<int > nITSROF_BC_offset{" nITSROF_BC_offset" , 65 , " nITSROF_BC_offset" };
157- Configurable<int > nITSROF_BC_cutWidth{" nITSROF_BC_cutWidth" , 40 , " nITSROF_BC_cutWidth" };
160+ Configurable<uint64_t > nITSROF_BC_cutWidth{" nITSROF_BC_cutWidth" , 40 , " nITSROF_BC_cutWidth" };
158161 // Configurable<int> nITSROF_middle_cut_forITSonlyVert{"nITSROF_middle_cut_forITSonlyVert", 198/2 /*ROF=198 in pp*/, "nITSROF_middle_cut_forITSonlyVert"};
159162 // Configurable<int> nNoITSonlyVertices{"nNoITSonlyVertices", false, "nITSROF_middle_cut_forITSonlyVert"};
160163
@@ -163,7 +166,7 @@ struct RobustFluctuationObservables {
163166 Configurable<float > cutVzTrackT0diffUpper{" cutVzTrackT0diffUpper" , 1 ., " cutVzTrackT0diffUpper, cm" };
164167
165168 // splitting of the orbit into several BC ranges
166- Configurable<std::vector<int >> vSplitBCpointsOfTheOrbit{" SplitBCpointsOfTheOrbit" , {1200 , 2000 , 3000 }, " BC split points of the orbit" };
169+ Configurable<std::vector<uint64_t >> vSplitBCpointsOfTheOrbit{" SplitBCpointsOfTheOrbit" , {1200 , 2000 , 3000 }, " BC split points of the orbit" };
167170
168171 // orbit QA
169172 uint32_t orbitAtCollIndexZero = 0 ;
@@ -968,7 +971,7 @@ struct RobustFluctuationObservables {
968971 }
969972
970973 if (myDF_ID >= 0 && myDF_ID < nHistQAplotsDF) {
971- int diffOrbits = ( int32_t ) orbit - ( int32_t ) orbitAtCollIndexZero;
974+ int diffOrbits = static_cast < int32_t >( orbit) - static_cast < int32_t >( orbitAtCollIndexZero) ;
972975 TString strDF = Form (" DF_%d" , static_cast <int >(DF_ID_raw));
973976 fV_h1D_Orbit_vs_CollIndex [myDF_ID]->Fill (collision.index (), diffOrbits);
974977 fV_h1D_Orbit_vs_CollIndex [myDF_ID]->SetTitle (strDF);
@@ -1474,23 +1477,23 @@ struct RobustFluctuationObservables {
14741477 // ##### check how often we analyze collision in the same BC (and also the vZ difference)
14751478 if (collision.selection_bit (o2::aod::evsel::kNoTimeFrameBorder )) {
14761479 if (prevBC != 9999 ) {
1477- int32_t diff = ( int32_t ) collBC - ( int32_t ) prevBC;
1480+ int32_t diff = static_cast < int32_t >( collBC) - static_cast < int32_t >( prevBC) ;
14781481 histosEvent.fill (HIST (" hBC_DIFF_to_previous" ), diff);
14791482 if (diff == 0 )
14801483 histosEvent.fill (HIST (" hBC_DIFF_to_previous_vZvZ_2D" ), vZ, prev_vZ);
14811484 }
14821485 if (prevBcInTF >= 0 ) {
1483- int32_t diffBcInTF = ( int32_t ) bcInTF - ( int32_t ) prevBcInTF;
1486+ int32_t diffBcInTF = static_cast < int32_t >( bcInTF) - static_cast < int32_t >( prevBcInTF) ;
14841487 histosEvent.fill (HIST (" hBCinTF_DIFF_to_previous" ), diffBcInTF);
14851488 }
14861489 if (prevFoundBcInTF >= 0 ) {
1487- int32_t diffGlobalBcInTF = ( int32_t ) foundBcInTF - ( int32_t ) prevFoundBcInTF;
1490+ int32_t diffGlobalBcInTF = static_cast < int32_t >( foundBcInTF) - static_cast < int32_t >( prevFoundBcInTF) ;
14881491 histosEvent.fill (HIST (" hBCinTF_DIFF_to_previous_FOUND_BC" ), diffGlobalBcInTF);
14891492 }
14901493
14911494 // global found BC:
14921495 if (prevGlobalFoundBC != 9999 ) {
1493- int32_t diff = ( int32_t ) globalFoundBC - ( int32_t ) prevGlobalFoundBC;
1496+ int32_t diff = static_cast < int32_t >( globalFoundBC) - static_cast < int32_t >( prevGlobalFoundBC) ;
14941497 histosEvent.fill (HIST (" hBC_DIFF_to_previous_FOUND_BC" ), diff);
14951498
14961499 if (counterPVcontributorsAfterTPCcuts > 0 ) {
@@ -1620,8 +1623,8 @@ struct RobustFluctuationObservables {
16201623
16211624 histosEventBcInTF.fill (HIST (" hGlobalTracks_vs_bcInTF" ), bcInTF, nTracksGlobalAccepted);
16221625 }
1623- histosEvent.fill (HIST (" hOrbitStartFromCollIndexZeroAft" ), ( int32_t ) orbit - ( int32_t ) orbitAtCollIndexZero);
1624- histosEvent.fill (HIST (" h2D_Orbit_vs_CollIndex_Aft" ), collision.index (), ( int32_t ) orbit - ( int32_t ) orbitAtCollIndexZero);
1626+ histosEvent.fill (HIST (" hOrbitStartFromCollIndexZeroAft" ), static_cast < int32_t >( orbit) - static_cast < int32_t >( orbitAtCollIndexZero) );
1627+ histosEvent.fill (HIST (" h2D_Orbit_vs_CollIndex_Aft" ), collision.index (), static_cast < int32_t >( orbit) - static_cast < int32_t >( orbitAtCollIndexZero) );
16251628
16261629 histosEvent.fill (HIST (" hMF" ), magneticField);
16271630 int MFsign = magneticField > 0 ? +1 : -1 ;
@@ -1680,11 +1683,11 @@ struct RobustFluctuationObservables {
16801683 histosEvent.fill (HIST (" hBCFound_Aft" ), globalFoundBC);
16811684 histosEvent.fill (HIST (" h2D_numContrib_vs_BC" ), collBC, collision.numContrib ());
16821685
1683- int64_t diffFoundBC_vs_BC = ( int64_t ) globalFoundBC - ( int64_t ) collBC;
1686+ int64_t diffFoundBC_vs_BC = static_cast < int64_t >( globalFoundBC) - static_cast < int64_t >( collBC) ;
16841687 histosEvent.fill (HIST (" h2D_diffFoundBC_vs_BC" ), collBC, diffFoundBC_vs_BC);
16851688
16861689 if (collision.has_foundBC ())
1687- histosEvent.fill (HIST (" h2D_diffFoundBC_vs_BC_inTF" ), collBC, ( int64_t ) foundBcInTF - ( int64_t ) bcInTF);
1690+ histosEvent.fill (HIST (" h2D_diffFoundBC_vs_BC_inTF" ), collBC, static_cast < int64_t >( foundBcInTF) - static_cast < int64_t >( bcInTF) );
16881691
16891692 // with FT0 conditions
16901693 if (isFT0) {
0 commit comments