@@ -258,7 +258,7 @@ struct FlowSP {
258258 double meanPxC = 0 ;
259259 } spm;
260260
261- struct ptMaps {
261+ struct ptMaps {
262262 TProfile* meanPTMap = new TProfile(" meanPTMap" , " meanPTMap" , 8 , -0.8 , 0.8 );
263263 TProfile* meanPTMapPos = new TProfile(" meanPTMapPos" , " meanPTMapPos" , 8 , -0.8 , 0.8 );
264264 TProfile* meanPTMapNeg = new TProfile(" meanPTMapNeg" , " meanPTMapNeg" , 8 , -0.8 , 0.8 );
@@ -271,7 +271,7 @@ struct FlowSP {
271271
272272 TProfile* relPxCNeg = new TProfile(" relPxCNeg" , " relPxCNeg" , 8 , -0.8 , 0.8 );
273273 TProfile* relPxCPos = new TProfile(" relPxCPos" , " relPxCPos" , 8 , -0.8 , 0.8 );
274- } ptmaps;
274+ } ptmaps;
275275
276276 OutputObj<GFWWeights> fWeights {GFWWeights (" weights" )};
277277 OutputObj<GFWWeights> fWeightsPOS {GFWWeights (" weights_positive" )};
@@ -700,42 +700,42 @@ struct FlowSP {
700700 fMultCutHigh = new TF1 (" fMultCutHigh" , " [0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x" , 0 , 100 );
701701
702702 std::vector<double > paramsMultPVCut;
703- std::vector<double > paramsMultCut;
704- int y2023 = 2023 ;
705- int y2024 = 2024 ;
706- std::array<int > nSigma = {1 ,2 ,3 };
707-
708- if (cfg.cUsePredeFinedSigma ){
709- if (cfg.cUsePredeFinedSigmaYear == y2023) {
710- if (cfg.cUsePredeFinedSigmaNsigma == nSigma[0 ]){
711- paramsMultPVCut = {2615.47 , -90.5747 , 1.25125 , -0.00847075 , 2.41183e-05 , 3399.72 , -121.652 , 1.84077 , -0.0142886 , 4.71449e-05 };
712- paramsMultCut = {1716.84 , -56.5663 , 0.715202 , -0.00426007 , 1.05075e-05 , 2550.82 , -87.4873 , 1.22205 , -0.00852644 , 2.54248e-05 };
713- } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[1 ]){
714- paramsMultPVCut = {2223.49 , -75.1444 , 0.963572 , -0.00570399 , 1.34877e-05 , 3790.99 , -137.064 , 2.13044 , -0.017122 , 5.82834e-05 };
715- paramsMultCut = {1301.56 , -41.4615 , 0.478224 , -0.00239449 , 4.46966e-06 , 2967.6 , -102.927 , 1.47488 , -0.0106534 , 3.28622e-05 };
716- } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[2 ]){
717- paramsMultPVCut = {1837.75 , -60.852 , 0.724331 , -0.00366975 , 6.47562e-06 , 4182.12 , -152.459 , 2.41955 , -0.0199481 , 6.93894e-05 };
718- paramsMultCut = {885.976 , -26.3397 , 0.240114 , -0.000496168 , -1.82704e-06 , 3384.43 , -118.377 , 1.72823 , -0.0127887 , 4.03432e-05 };
719- } else {
720- LOGF (fatal, " nSigma can only be 1-3 please reset the variable or give the parameters manually and set cfg.cUsePredeFinedSigma to FALSE" );
721- }
722- } else if (cfg.cUsePredeFinedSigmaYear == y2024){
723- if (cfg.cUsePredeFinedSigmaNsigma == nSigma[0 ]){
724- paramsMultPVCut = {2726.93 , -100.128 , 1.45046 , -0.0099354 , 2.71182e-05 , 3404.72 , -126.569 , 1.92500 , -0.0142653 , 4.31645e-05 };
725- paramsMultCut = {1858.77 , -66.6070 , 0.929146 , -0.00606961 , 1.57639e-05 , 2672.43 , -96.7708 , 1.39109 , -0.00942498 , 2.54268e-05 };
726- } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[1 ]){
727- paramsMultPVCut = {2390.04 , -87.3154 , 1.23176 , -0.00806869 , 2.06624e-05 , 3744.26 , -139.927 , 2.16863 , -0.0165329 , 5.17269e-05 };
728- paramsMultCut = {1451.23 , -51.4314 , 0.694609 , -0.00433959 , 1.06698e-05 , 3080.42 , -112.071 , 1.63166 , -0.0112533 , 3.10348e-05 };
729- } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[2 ]){
730- paramsMultPVCut = {2053.64 , -74.5950 , 1.01563 , -0.00621473 , 1.41276e-05 , 4083.79 , -153.304 , 2.41333 , -0.0188198 , 6.03974e-05 };
731- paramsMultCut = {1042.50 , -35.9374 , 0.440681 , -0.00222218 , 3.20643e-06 , 3488.53 , -127.396 , 1.87339 , -0.0131007 , 3.67434e-05 };
732- } else {
733- LOGF (fatal, " cUsePredeFinedSigmaNsigma can only be 1-3 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE" );
734- }
735- } else {
736- LOGF (fatal, " cUsePredeFinedSigmaYear can only be 2023/2024 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE" );
703+ std::vector<double > paramsMultCut;
704+ int y2023 = 2023 ;
705+ int y2024 = 2024 ;
706+ std::array<int > nSigma = {1 , 2 , 3 };
707+
708+ if (cfg.cUsePredeFinedSigma ) {
709+ if (cfg.cUsePredeFinedSigmaYear == y2023) {
710+ if (cfg.cUsePredeFinedSigmaNsigma == nSigma[0 ]) {
711+ paramsMultPVCut = {2615.47 , -90.5747 , 1.25125 , -0.00847075 , 2.41183e-05 , 3399.72 , -121.652 , 1.84077 , -0.0142886 , 4.71449e-05 };
712+ paramsMultCut = {1716.84 , -56.5663 , 0.715202 , -0.00426007 , 1.05075e-05 , 2550.82 , -87.4873 , 1.22205 , -0.00852644 , 2.54248e-05 };
713+ } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[1 ]) {
714+ paramsMultPVCut = {2223.49 , -75.1444 , 0.963572 , -0.00570399 , 1.34877e-05 , 3790.99 , -137.064 , 2.13044 , -0.017122 , 5.82834e-05 };
715+ paramsMultCut = {1301.56 , -41.4615 , 0.478224 , -0.00239449 , 4.46966e-06 , 2967.6 , -102.927 , 1.47488 , -0.0106534 , 3.28622e-05 };
716+ } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[2 ]) {
717+ paramsMultPVCut = {1837.75 , -60.852 , 0.724331 , -0.00366975 , 6.47562e-06 , 4182.12 , -152.459 , 2.41955 , -0.0199481 , 6.93894e-05 };
718+ paramsMultCut = {885.976 , -26.3397 , 0.240114 , -0.000496168 , -1.82704e-06 , 3384.43 , -118.377 , 1.72823 , -0.0127887 , 4.03432e-05 };
719+ } else {
720+ LOGF (fatal, " nSigma can only be 1-3 please reset the variable or give the parameters manually and set cfg.cUsePredeFinedSigma to FALSE" );
721+ }
722+ } else if (cfg.cUsePredeFinedSigmaYear == y2024) {
723+ if (cfg.cUsePredeFinedSigmaNsigma == nSigma[0 ]) {
724+ paramsMultPVCut = {2726.93 , -100.128 , 1.45046 , -0.0099354 , 2.71182e-05 , 3404.72 , -126.569 , 1.92500 , -0.0142653 , 4.31645e-05 };
725+ paramsMultCut = {1858.77 , -66.6070 , 0.929146 , -0.00606961 , 1.57639e-05 , 2672.43 , -96.7708 , 1.39109 , -0.00942498 , 2.54268e-05 };
726+ } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[1 ]) {
727+ paramsMultPVCut = {2390.04 , -87.3154 , 1.23176 , -0.00806869 , 2.06624e-05 , 3744.26 , -139.927 , 2.16863 , -0.0165329 , 5.17269e-05 };
728+ paramsMultCut = {1451.23 , -51.4314 , 0.694609 , -0.00433959 , 1.06698e-05 , 3080.42 , -112.071 , 1.63166 , -0.0112533 , 3.10348e-05 };
729+ } else if (cfg.cUsePredeFinedSigmaNsigma == nSigma[2 ]) {
730+ paramsMultPVCut = {2053.64 , -74.5950 , 1.01563 , -0.00621473 , 1.41276e-05 , 4083.79 , -153.304 , 2.41333 , -0.0188198 , 6.03974e-05 };
731+ paramsMultCut = {1042.50 , -35.9374 , 0.440681 , -0.00222218 , 3.20643e-06 , 3488.53 , -127.396 , 1.87339 , -0.0131007 , 3.67434e-05 };
732+ } else {
733+ LOGF (fatal, " cUsePredeFinedSigmaNsigma can only be 1-3 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE" );
737734 }
738- } else {
735+ } else {
736+ LOGF (fatal, " cUsePredeFinedSigmaYear can only be 2023/2024 please reset the variable or give the parameters manually and set cUsePredeFinedSigma to FALSE" );
737+ }
738+ } else {
739739 paramsMultPVCut = cfg.cEvSelsMultPv ;
740740 paramsMultCut = cfg.cEvSelsMult ;
741741 }
@@ -1192,20 +1192,20 @@ struct FlowSP {
11921192 if (track.eta () < 0 )
11931193 scale = -1.0 ;
11941194
1195- const double invSqrtQQ = 1.0 / std::sqrt (std::fabs (spm.corrQQ ));
1195+ const double invSqrtQQ = 1.0 / std::sqrt (std::fabs (spm.corrQQ ));
11961196 const double invSqrtQQx = 1.0 / std::sqrt (std::fabs (spm.corrQQx ));
11971197 const double invSqrtQQy = 1.0 / std::sqrt (std::fabs (spm.corrQQy ));
1198- const double uqA = spm.uy * spm.qyA + spm.ux * spm.qxA ;
1199- const double uqC = spm.uy * spm.qyC + spm.ux * spm.qxC ;
1200- const double invMeanPtQQ = 1.0 / spm.meanPtWeight ;
1198+ const double uqA = spm.uy * spm.qyA + spm.ux * spm.qxA ;
1199+ const double uqC = spm.uy * spm.qyC + spm.ux * spm.qxC ;
1200+ const double invMeanPtQQ = 1.0 / spm.meanPtWeight ;
12011201
12021202 if (cfg.cFillGeneralV1Histos ) {
1203- registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnAodd" ), track.pt (), track.eta (), spm.centrality , scale * (uqA) * invSqrtQQ, weight);
1204- registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnCodd" ), track.pt (), track.eta (), spm.centrality , scale * (uqC) * invSqrtQQ, weight);
1203+ registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnAodd" ), track.pt (), track.eta (), spm.centrality , scale * (uqA)* invSqrtQQ, weight);
1204+ registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnCodd" ), track.pt (), track.eta (), spm.centrality , scale * (uqC)* invSqrtQQ, weight);
12051205 registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnOdd" ), track.pt (), track.eta (), spm.centrality , scale * 0.5 * ((uqA) - (uqC)) * invSqrtQQ, weight);
12061206 registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnEven" ), track.pt (), track.eta (), spm.centrality , 0.5 * ((uqA) + (uqC)) * invSqrtQQ, weight);
1207- registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnA" ), track.pt (), track.eta (), spm.centrality , (uqA) * invSqrtQQ, weight);
1208- registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnC" ), track.pt (), track.eta (), spm.centrality , (uqC) * invSqrtQQ, weight);
1207+ registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnA" ), track.pt (), track.eta (), spm.centrality , (uqA)* invSqrtQQ, weight);
1208+ registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnC" ), track.pt (), track.eta (), spm.centrality , (uqC)* invSqrtQQ, weight);
12091209 registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnCSetPlane" ), track.pt (), track.eta (), spm.centrality , (spm.uy + spm.ux ) * invSqrtQQ, weight);
12101210 registry.fill (HIST (Charge[ct]) + HIST (Species[pt]) + HIST (" vnASetPlane" ), track.pt (), track.eta (), spm.centrality , (minusQ * spm.ux - spm.uy ) * invSqrtQQ, weight);
12111211 }
@@ -1258,7 +1258,7 @@ struct FlowSP {
12581258 if (!cfg.cFillTrackQA )
12591259 return ;
12601260
1261- double weight = spm.wacc [ct][par] * spm.weff [ct][par] * spm.centWeight ;
1261+ double weight = spm.wacc [ct][par] * spm.weff [ct][par] * spm.centWeight ;
12621262
12631263 static constexpr std::string_view Time[] = {" before/" , " after/" };
12641264 // NOTE: species[kUnidentified] = "" (when nocfg.cTrackSelDo) {
@@ -1492,30 +1492,28 @@ struct FlowSP {
14921492 if (centW <= 0 ) {
14931493 spm.centWeight = 0 .;
14941494 LOGF (fatal, " Centrality weight cannot be negative .. setting to 0. for (%.2f)" , spm.centrality );
1495- } else {
1496- spm.centWeight = centW;
1495+ } else {
1496+ spm.centWeight = centW;
14971497 }
14981498 }
14991499
15001500 // Always fill centrality histogram after event selections!
15011501 histos.fill (HIST (" hCentralityCW" ), spm.centrality );
15021502
1503-
15041503 fillEventQA<kAfter >(collision, tracks);
15051504
1506- ptmaps.meanPTMap ->Reset ();
1507- ptmaps.meanPTMapPos ->Reset ();
1508- ptmaps.meanPTMapNeg ->Reset ();
1505+ ptmaps.meanPTMap ->Reset ();
1506+ ptmaps.meanPTMapPos ->Reset ();
1507+ ptmaps.meanPTMapNeg ->Reset ();
15091508
1510- ptmaps.relPxA ->Reset ();
1511- ptmaps.relPxC ->Reset ();
1509+ ptmaps.relPxA ->Reset ();
1510+ ptmaps.relPxC ->Reset ();
15121511
1513- ptmaps.relPxANeg ->Reset ();
1514- ptmaps.relPxAPos ->Reset ();
1515-
1516- ptmaps.relPxCNeg ->Reset ();
1517- ptmaps.relPxCPos ->Reset ();
1512+ ptmaps.relPxANeg ->Reset ();
1513+ ptmaps.relPxAPos ->Reset ();
15181514
1515+ ptmaps.relPxCNeg ->Reset ();
1516+ ptmaps.relPxCPos ->Reset ();
15191517
15201518 double sumPxAEvent = 0 ;
15211519 double meanPxEventCount = 0 ;
@@ -1641,11 +1639,10 @@ struct FlowSP {
16411639
16421640 } // end of track loop
16431641
1642+ double meanPxAEvent = 0 ;
1643+ double meanPxCEvent = 0 ;
16441644
1645- double meanPxAEvent = 0 ;
1646- double meanPxCEvent = 0 ;
1647-
1648- if (meanPxEventCount > 0 ) {
1645+ if (meanPxEventCount > 0 ) {
16491646 meanPxAEvent = sumPxAEvent / meanPxEventCount;
16501647 meanPxCEvent = sumPxCEvent / meanPxEventCount;
16511648 }
@@ -2061,7 +2058,7 @@ struct FlowSP {
20612058 auto trackSlice = tracks.sliceBy (trackPerCollision, col.globalIndex ());
20622059
20632060 // get filtered tracks that belong to reconstructed collision
2064- // mcReco uses filtered tracks
2061+ // mcReco uses filtered tracks
20652062 auto filteredTrackSlice = filteredTracks.sliceBy (trackPerCollision, col.globalIndex ());
20662063
20672064 spm.centrality = col.centFT0C ();
0 commit comments