@@ -551,6 +551,12 @@ struct PidFlowPtCorr {
551551 oba4Ch->Add (new TNamed (" ptSquareAve" , " ptSquareAve" ));
552552 oba4Ch->Add (new TNamed (" ptAve" , " ptAve" ));
553553 oba4Ch->Add (new TNamed (" hMeanPt" , " hMeanPt" ));
554+
555+ oba4Ch->Add (new TNamed (" covV2PtWeightOne" , " covV2PtWeightOne" ));
556+ oba4Ch->Add (new TNamed (" c22TrackWeightOne" , " c22TrackWeightOne" ));
557+ oba4Ch->Add (new TNamed (" hMeanPtWeightOne" , " hMeanPtWeightOne" ));
558+ oba4Ch->Add (new TNamed (" ptAveWeightOne" , " ptAveWeightOne" ));
559+ oba4Ch->Add (new TNamed (" ptSquareAveWeightOne" , " ptSquareAveWeightOne" ));
554560 // end fill TObjArray for charged
555561
556562 // init fFCCh
@@ -591,7 +597,7 @@ struct PidFlowPtCorr {
591597 registry.add (" meanptCentNbs/hChargedPionWithNpair" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
592598 registry.add (" meanptCentNbs/hChargedPionFull" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
593599 registry.add (" meanptCentNbs/hPion" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
594- registry.add (" meanptCentNbs/hPionMeanptWeightPidflow " , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
600+ registry.add (" meanptCentNbs/hPionMeanpt " , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
595601
596602 if (switchsOpts.cfgClosureTest .value != 0 ) {
597603 registry.add (" meanptCentNbs/hPionMeanptWeightC22pure" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
@@ -602,12 +608,12 @@ struct PidFlowPtCorr {
602608 registry.add (" meanptCentNbs/hChargedKaonWithNpair" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
603609 registry.add (" meanptCentNbs/hChargedKaonFull" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
604610 registry.add (" meanptCentNbs/hKaon" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
605- registry.add (" meanptCentNbs/hKaonMeanptWeightPidflow " , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
611+ registry.add (" meanptCentNbs/hKaonMeanpt " , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
606612
607613 registry.add (" meanptCentNbs/hChargedProtonWithNpair" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
608614 registry.add (" meanptCentNbs/hChargedProtonFull" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
609615 registry.add (" meanptCentNbs/hProton" , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
610- registry.add (" meanptCentNbs/hProtonMeanptWeightPidflow " , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
616+ registry.add (" meanptCentNbs/hProtonMeanpt " , " " , {HistType::kTProfile3D , {cfgaxisMeanPt, axisMultiplicity, meanptC22GraphOpts.cfgaxisBootstrap }});
611617 // end pid
612618 // end init tprofile3d for <2'> - meanpt
613619
@@ -689,9 +695,9 @@ struct PidFlowPtCorr {
689695 corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPiN08 {2} poiPiP08 {-2}" , " PiPi08gap22" , false ));
690696 corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiKaN08 {2} poiKaP08 {-2}" , " KaKa08gap22" , false )); // 30
691697 corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPrN08 {2} poiPrP08 {-2}" , " PrPr08gap22" , false ));
692- corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPiN08 {3} poiPiP08 {-3}" , " PiPi08gap22 " , false ));
693- corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiKaN08 {3} poiKaP08 {-3}" , " KaKa08gap22 " , false ));
694- corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPrN08 {3} poiPrP08 {-3}" , " PrPr08gap22 " , false ));
698+ corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPiN08 {3} poiPiP08 {-3}" , " PiPi08gap33 " , false ));
699+ corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiKaN08 {3} poiKaP08 {-3}" , " KaKa08gap33 " , false ));
700+ corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPrN08 {3} poiPrP08 {-3}" , " PrPr08gap33 " , false ));
695701
696702 corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPiN {2} refP {-2}" , " Pion0gap22a" , false )); // 35
697703 corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" poiPiP {2} refN {-2}" , " Pion0gap22b" , false ));
@@ -1075,7 +1081,7 @@ struct PidFlowPtCorr {
10751081 return ;
10761082
10771083 registry.fill (HIST (" meanptCentNbs/hCharged" ), ptSum / nch, cent, rndm * cfgFlowNbootstrap, val, nch * dnx);
1078- registry.fill (HIST (" meanptCentNbs/hChargedMeanpt" ), ptSum / nch, cent, rndm * cfgFlowNbootstrap, ptSum / nch, nch * dnx * val );
1084+ registry.fill (HIST (" meanptCentNbs/hChargedMeanpt" ), ptSum / nch, cent, rndm * cfgFlowNbootstrap, ptSum / nch, 1 . );
10791085 }
10801086
10811087 /* *
@@ -1116,7 +1122,7 @@ struct PidFlowPtCorr {
11161122 registry.fill (HIST (" meanptCentNbs/hPion" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidc22, nPid * npairPid);
11171123 registry.fill (HIST (" meanptCentNbs/hChargedPionFull" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, val, dnx * nPid);
11181124 registry.fill (HIST (" meanptCentNbs/hChargedPionWithNpair" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, val, dnx);
1119- registry.fill (HIST (" meanptCentNbs/hPionMeanptWeightPidflow " ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidPtSum / nPid, nPid * npairPid * pidc22 * pidc22 / val );
1125+ registry.fill (HIST (" meanptCentNbs/hPionMeanpt " ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidPtSum / nPid, 1 . );
11201126
11211127 if (switchsOpts.cfgClosureTest .value != 0 ) {
11221128 double npair4c22pure = fGFW ->Calculate (corrconfigs.at (29 ), 0 , true ).real ();
@@ -1151,7 +1157,7 @@ struct PidFlowPtCorr {
11511157 registry.fill (HIST (" meanptCentNbs/hKaon" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidc22, nPid * npairPid);
11521158 registry.fill (HIST (" meanptCentNbs/hChargedKaonFull" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, val, dnx * nPid);
11531159 registry.fill (HIST (" meanptCentNbs/hChargedKaonWithNpair" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, val, dnx);
1154- registry.fill (HIST (" meanptCentNbs/hKaonMeanptWeightPidflow " ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidPtSum / nPid, nPid * npairPid * pidc22 * pidc22 / val );
1160+ registry.fill (HIST (" meanptCentNbs/hKaonMeanpt " ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidPtSum / nPid, 1 . );
11551161
11561162 break ;
11571163 // end kaon
@@ -1168,7 +1174,7 @@ struct PidFlowPtCorr {
11681174 registry.fill (HIST (" meanptCentNbs/hProton" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidc22, nPid * npairPid);
11691175 registry.fill (HIST (" meanptCentNbs/hChargedProtonFull" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, val, dnx * nPid);
11701176 registry.fill (HIST (" meanptCentNbs/hChargedProtonWithNpair" ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, val, dnx);
1171- registry.fill (HIST (" meanptCentNbs/hProtonMeanptWeightPidflow " ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidPtSum / nPid, nPid * npairPid * pidc22 * pidc22 / val );
1177+ registry.fill (HIST (" meanptCentNbs/hProtonMeanpt " ), pidPtSum / nPid, cent, rndm * cfgFlowNbootstrap, pidPtSum / nPid, 1 . );
11721178
11731179 break ;
11741180 // end proton
@@ -1247,7 +1253,14 @@ struct PidFlowPtCorr {
12471253 return ;
12481254 }
12491255
1250- void fillFCvnpt (MyParticleType type, const GFW::CorrConfig& corrconf, const double & cent, const double & rndm, const double & ptSum, const double & nch, const char * tarName)
1256+ void fillFCvnpt (MyParticleType type,
1257+ const GFW::CorrConfig& corrconf,
1258+ const double & cent,
1259+ const double & rndm,
1260+ const double & ptSum,
1261+ const double & nch,
1262+ const char * tarName,
1263+ bool useWeightOne = false )
12511264 {
12521265 double dnx, val;
12531266 dnx = fGFW ->Calculate (corrconf, 0 , true ).real ();
@@ -1257,17 +1270,17 @@ struct PidFlowPtCorr {
12571270 if (std::fabs (val) < 1 ) {
12581271 switch (type) {
12591272 case MyParticleType::kCharged :
1260- fFCCh ->FillProfile (tarName, cent, val * (ptSum / nch), dnx * nch, rndm);
1273+ fFCCh ->FillProfile (tarName, cent, val * (ptSum / nch), useWeightOne ? 1.0 : dnx * nch, rndm);
12611274 break ;
12621275
12631276 case MyParticleType::kPion :
1264- fFCPi ->FillProfile (tarName, cent, val * (ptSum / nch), dnx * nch, rndm);
1277+ fFCPi ->FillProfile (tarName, cent, val * (ptSum / nch), useWeightOne ? 1.0 : dnx * nch, rndm);
12651278 break ;
12661279 case MyParticleType::kKaon :
1267- fFCKa ->FillProfile (tarName, cent, val * (ptSum / nch), dnx * nch, rndm);
1280+ fFCKa ->FillProfile (tarName, cent, val * (ptSum / nch), useWeightOne ? 1.0 : dnx * nch, rndm);
12681281 break ;
12691282 case MyParticleType::kProton :
1270- fFCPr ->FillProfile (tarName, cent, val * (ptSum / nch), dnx * nch, rndm);
1283+ fFCPr ->FillProfile (tarName, cent, val * (ptSum / nch), useWeightOne ? 1.0 : dnx * nch, rndm);
12711284 break ;
12721285
12731286 default :
@@ -2123,6 +2136,8 @@ struct PidFlowPtCorr {
21232136 fillFC (MyParticleType::kProton , corrconfigs.at (10 ), cent, rndm, " c22" );
21242137 }
21252138 fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (0 ), cent, rndm, nch, nch, " c22TrackWeight" );
2139+ fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (0 ), cent, rndm, nch, nch, " c22TrackWeightOne" , true );
2140+
21262141 fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (1 ), cent, rndm, nch, nch, " c24TrackWeight" );
21272142 fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (2 ), cent, rndm, nch, nch, " c22FullTrackWeight" );
21282143 fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (3 ), cent, rndm, nch, nch, " c32TrackWeight" );
@@ -2137,6 +2152,8 @@ struct PidFlowPtCorr {
21372152 fillFCvnpt (MyParticleType::kProton , corrconfigs.at (34 ), cent, rndm, nch, nch, " c32TrackWeight" );
21382153
21392154 fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (0 ), cent, rndm, ptSum, nch, " covV2Pt" );
2155+ fillFCvnpt (MyParticleType::kCharged , corrconfigs.at (0 ), cent, rndm, ptSum, nch, " covV2PtWeightOne" , true );
2156+
21402157 fillFCvnpt (MyParticleType::kPion , corrconfigs.at (29 ), cent, rndm, ptSum, nch, " covV2Pt" );
21412158 fillFCvnpt (MyParticleType::kKaon , corrconfigs.at (30 ), cent, rndm, ptSum, nch, " covV2Pt" );
21422159 fillFCvnpt (MyParticleType::kProton , corrconfigs.at (31 ), cent, rndm, ptSum, nch, " covV2Pt" );
@@ -2190,21 +2207,25 @@ struct PidFlowPtCorr {
21902207 }
21912208
21922209 fFCCh ->FillProfile (" hMeanPt" , cent, (ptSum / nch), nch, rndm);
2210+ fFCCh ->FillProfile (" hMeanPtWeightOne" , cent, (ptSum / nch), 1 ., rndm);
21932211
21942212 if (nPionWeighted > 0 ) {
21952213 fFCPi ->FillProfile (" hMeanPt" , cent, (pionPtSum / nPionWeighted), nPionWeighted, rndm);
2214+ fFCPi ->FillProfile (" hMeanPtWeightOne" , cent, (pionPtSum / nPionWeighted), 1 ., rndm);
21962215 fillFCvnpt (MyParticleType::kPion , corrconfigs.at (29 ), cent, rndm, pionPtSum, nPionWeighted, " covV2PtPID" );
21972216 fillFCvnpt (MyParticleType::kPion , corrconfigs.at (29 ), cent, rndm, nPionWeighted, nPionWeighted, " c22TrackWeightPID" );
21982217 }
21992218
22002219 if (nKaonWeighted > 0 ) {
22012220 fFCKa ->FillProfile (" hMeanPt" , cent, (kaonPtSum / nKaonWeighted), nKaonWeighted, rndm);
2221+ fFCKa ->FillProfile (" hMeanPtWeightOne" , cent, (kaonPtSum / nKaonWeighted), 1 ., rndm);
22022222 fillFCvnpt (MyParticleType::kKaon , corrconfigs.at (30 ), cent, rndm, kaonPtSum, nKaonWeighted, " covV2PtPID" );
22032223 fillFCvnpt (MyParticleType::kKaon , corrconfigs.at (30 ), cent, rndm, nKaonWeighted, nKaonWeighted, " c22TrackWeightPID" );
22042224 }
22052225
22062226 if (nProtonWeighted > 0 ) {
22072227 fFCPr ->FillProfile (" hMeanPt" , cent, (protonPtSum / nProtonWeighted), nProtonWeighted, rndm);
2228+ fFCPr ->FillProfile (" hMeanPtWeightOne" , cent, (protonPtSum / nProtonWeighted), 1 ., rndm);
22082229 fillFCvnpt (MyParticleType::kProton , corrconfigs.at (31 ), cent, rndm, protonPtSum, nProtonWeighted, " covV2PtPID" );
22092230 fillFCvnpt (MyParticleType::kProton , corrconfigs.at (31 ), cent, rndm, nProtonWeighted, nProtonWeighted, " c22TrackWeightPID" );
22102231 }
@@ -2215,9 +2236,17 @@ struct PidFlowPtCorr {
22152236 (ptSum * ptSum - ptSquareSum) / nchDiff,
22162237 nchDiff, rndm);
22172238
2239+ fFCCh ->FillProfile (" ptSquareAveWeightOne" , cent,
2240+ (ptSum * ptSum - ptSquareSum) / nchDiff,
2241+ 1 ., rndm);
2242+
22182243 fFCCh ->FillProfile (" ptAve" , cent,
22192244 (nch * ptSum - ptSumw2) / nchDiff,
22202245 nchDiff, rndm);
2246+
2247+ fFCCh ->FillProfile (" ptAveWeightOne" , cent,
2248+ (nch * ptSum - ptSumw2) / nchDiff,
2249+ 1 ., rndm);
22212250 }
22222251
22232252 double pionDiff = nPionWeighted * nPionWeighted - nPionSquare;
@@ -2226,9 +2255,17 @@ struct PidFlowPtCorr {
22262255 (pionPtSum * pionPtSum - pionPtSquareSum) / pionDiff,
22272256 pionDiff, rndm);
22282257
2258+ fFCPi ->FillProfile (" ptSquareAveWeightOne" , cent,
2259+ (pionPtSum * pionPtSum - pionPtSquareSum) / pionDiff,
2260+ 1 ., rndm);
2261+
22292262 fFCPi ->FillProfile (" ptAve" , cent,
22302263 (nPionWeighted * pionPtSum - pionPtSumw2) / pionDiff,
22312264 pionDiff, rndm);
2265+
2266+ fFCPi ->FillProfile (" ptAveWeightOne" , cent,
2267+ (nPionWeighted * pionPtSum - pionPtSumw2) / pionDiff,
2268+ 1 ., rndm);
22322269 }
22332270
22342271 double kaonDiff = nKaonWeighted * nKaonWeighted - nKaonSquare;
@@ -2237,9 +2274,17 @@ struct PidFlowPtCorr {
22372274 (kaonPtSum * kaonPtSum - kaonPtSquareSum) / kaonDiff,
22382275 kaonDiff, rndm);
22392276
2277+ fFCKa ->FillProfile (" ptSquareAveWeightOne" , cent,
2278+ (kaonPtSum * kaonPtSum - kaonPtSquareSum) / kaonDiff,
2279+ 1 ., rndm);
2280+
22402281 fFCKa ->FillProfile (" ptAve" , cent,
22412282 (nKaonWeighted * kaonPtSum - kaonPtSumw2) / kaonDiff,
22422283 kaonDiff, rndm);
2284+
2285+ fFCKa ->FillProfile (" ptAveWeightOne" , cent,
2286+ (nKaonWeighted * kaonPtSum - kaonPtSumw2) / kaonDiff,
2287+ 1 ., rndm);
22432288 }
22442289
22452290 double protonDiff = nProtonWeighted * nProtonWeighted - nProtonSquare;
@@ -2248,9 +2293,17 @@ struct PidFlowPtCorr {
22482293 (protonPtSum * protonPtSum - protonPtSquareSum) / protonDiff,
22492294 protonDiff, rndm);
22502295
2296+ fFCPr ->FillProfile (" ptSquareAveWeightOne" , cent,
2297+ (protonPtSum * protonPtSum - protonPtSquareSum) / protonDiff,
2298+ 1 ., rndm);
2299+
22512300 fFCPr ->FillProfile (" ptAve" , cent,
22522301 (nProtonWeighted * protonPtSum - protonPtSumw2) / protonDiff,
22532302 protonDiff, rndm);
2303+
2304+ fFCPr ->FillProfile (" ptAveWeightOne" , cent,
2305+ (nProtonWeighted * protonPtSum - protonPtSumw2) / protonDiff,
2306+ 1 ., rndm);
22542307 }
22552308
22562309 } // end fill hist using fillProfile
0 commit comments