@@ -177,11 +177,11 @@ struct FlowGFWOmegaXi {
177177 registry.add (" hMult" , " " , {HistType::kTH1D , {{3000 , 0.5 , 3000.5 }}});
178178 registry.add (" hCent" , " " , {HistType::kTH1D , {{90 , 0 , 90 }}});
179179 registry.add (" hPt" , " " , {HistType::kTH1D , {cfgaxisPt}});
180- registry.add (" hEtaPhiVtxzREF" , " " , {HistType::kTH3D , {cfgaxisEta, cfgaxisPhi , {20 , -10 , 10 }}});
181- registry.add (" hEtaPhiVtxzPOIXi" , " " , {HistType::kTH3D , {cfgaxisEta, cfgaxisPhi , {20 , -10 , 10 }}});
182- registry.add (" hEtaPhiVtxzPOIOmega" , " " , {HistType::kTH3D , {cfgaxisEta, cfgaxisPhi , {20 , -10 , 10 }}});
183- registry.add (" hEtaPhiVtxzPOIK0s" , " " , {HistType::kTH3D , {cfgaxisEta, cfgaxisPhi , {20 , -10 , 10 }}});
184- registry.add (" hEtaPhiVtxzPOILambda" , " " , {HistType::kTH3D , {cfgaxisEta, cfgaxisPhi , {20 , -10 , 10 }}});
180+ registry.add (" hEtaPhiVtxzREF" , " " , {HistType::kTH3D , {cfgaxisPhi, cfgaxisEta , {20 , -10 , 10 }}});
181+ registry.add (" hEtaPhiVtxzPOIXi" , " " , {HistType::kTH3D , {cfgaxisPhi, cfgaxisEta , {20 , -10 , 10 }}});
182+ registry.add (" hEtaPhiVtxzPOIOmega" , " " , {HistType::kTH3D , {cfgaxisPhi, cfgaxisEta , {20 , -10 , 10 }}});
183+ registry.add (" hEtaPhiVtxzPOIK0s" , " " , {HistType::kTH3D , {cfgaxisPhi, cfgaxisEta , {20 , -10 , 10 }}});
184+ registry.add (" hEtaPhiVtxzPOILambda" , " " , {HistType::kTH3D , {cfgaxisPhi, cfgaxisEta , {20 , -10 , 10 }}});
185185 registry.add (" hEventCount" , " " , {HistType::kTH2D , {{4 , 0 , 4 }, {4 , 0 , 4 }}});
186186 registry.get <TH2>(HIST (" hEventCount" ))->GetXaxis ()->SetBinLabel (1 , " Filtered event" );
187187 registry.get <TH2>(HIST (" hEventCount" ))->GetXaxis ()->SetBinLabel (2 , " after sel8" );
@@ -241,27 +241,27 @@ struct FlowGFWOmegaXi {
241241
242242 fGFW ->AddRegion (" reffull" , -0.8 , 0.8 , 1 , 1 ); // ("name", etamin, etamax, ptbinnum, bitmask)eta region -0.8 to 0.8
243243 // with (-0.5, 0.5) eta gap
244- fGFW ->AddRegion (" refN10" , -0.8 , -0.5 , 1 , 1 );
245- fGFW ->AddRegion (" refP10" , 0.5 , 0.8 , 1 , 1 );
246- fGFW ->AddRegion (" refN10dpt" , -0.8 , -0.5 , nPtBins, 1 );
247- fGFW ->AddRegion (" refP10dpt" , 0.5 , 0.8 , nPtBins, 1 );
244+ fGFW ->AddRegion (" refN10" , -0.8 , -0.4 , 1 , 1 );
245+ fGFW ->AddRegion (" refP10" , 0.4 , 0.8 , 1 , 1 );
246+ fGFW ->AddRegion (" refN10dpt" , -0.8 , -0.4 , nPtBins, 1 );
247+ fGFW ->AddRegion (" refP10dpt" , 0.4 , 0.8 , nPtBins, 1 );
248248 fGFW ->AddRegion (" reffulldpt" , -0.8 , 0.8 , nPtBins, 1 );
249249 fGFW ->AddRegion (" refoldpt" , -0.8 , 0.8 , nPtBins, 1 );
250250 int nXiptMassBins = nXiPtBins * cfgXiMassbins;
251- fGFW ->AddRegion (" poiXiP" , 0.5 , 0.8 , nXiptMassBins, 2 );
252- fGFW ->AddRegion (" poiXiN" , -0.8 , -0.5 , nXiptMassBins, 2 );
251+ fGFW ->AddRegion (" poiXiP" , 0.4 , 0.8 , nXiptMassBins, 2 );
252+ fGFW ->AddRegion (" poiXiN" , -0.8 , -0.4 , nXiptMassBins, 2 );
253253 fGFW ->AddRegion (" poiXifull" , -0.8 , 0.8 , nXiptMassBins, 2 );
254254 int nOmegaptMassBins = nXiPtBins * cfgOmegaMassbins;
255- fGFW ->AddRegion (" poiOmegaP" , 0.5 , 0.8 , nOmegaptMassBins, 4 );
256- fGFW ->AddRegion (" poiOmegaN" , -0.8 , -0.5 , nOmegaptMassBins, 4 );
255+ fGFW ->AddRegion (" poiOmegaP" , 0.4 , 0.8 , nOmegaptMassBins, 4 );
256+ fGFW ->AddRegion (" poiOmegaN" , -0.8 , -0.4 , nOmegaptMassBins, 4 );
257257 fGFW ->AddRegion (" poiOmegafull" , -0.8 , 0.8 , nOmegaptMassBins, 4 );
258258 int nK0sptMassBins = nV0PtBins * cfgK0sMassbins;
259- fGFW ->AddRegion (" poiK0sP" , 0.5 , 0.8 , nK0sptMassBins, 8 );
260- fGFW ->AddRegion (" poiK0sN" , -0.8 , -0.5 , nK0sptMassBins, 8 );
259+ fGFW ->AddRegion (" poiK0sP" , 0.4 , 0.8 , nK0sptMassBins, 8 );
260+ fGFW ->AddRegion (" poiK0sN" , -0.8 , -0.4 , nK0sptMassBins, 8 );
261261 fGFW ->AddRegion (" poiK0sfull" , -0.8 , 0.8 , nK0sptMassBins, 8 );
262262 int nLambdaptMassBins = nV0PtBins * cfgLambdaMassbins;
263- fGFW ->AddRegion (" poiLambdaP" , 0.5 , 0.8 , nLambdaptMassBins, 16 );
264- fGFW ->AddRegion (" poiLambdaN" , -0.8 , -0.5 , nLambdaptMassBins, 16 );
263+ fGFW ->AddRegion (" poiLambdaP" , 0.4 , 0.8 , nLambdaptMassBins, 16 );
264+ fGFW ->AddRegion (" poiLambdaN" , -0.8 , -0.4 , nLambdaptMassBins, 16 );
265265 fGFW ->AddRegion (" poiLambdafull" , -0.8 , 0.8 , nLambdaptMassBins, 16 );
266266 // pushback
267267 corrconfigs.push_back (fGFW ->GetCorrelatorConfig (" refP10dpt {2} refN10dpt {-2}" , " Ref10Gap22" , kTRUE ));
@@ -362,17 +362,17 @@ struct FlowGFWOmegaXi {
362362 if (cfgAcceptance.size () == 5 && cfgEfficiency.size () == 5 ) {
363363 for (int i = 0 ; i <= 4 ; i++) {
364364 mAcceptance .push_back (ccdb->getForTimeStamp <GFWWeights>(cfgAcceptance[i], timestamp));
365- if (mAcceptance .size () == 4 )
366- LOGF (info, " Loaded acceptance weights of REF particle from %s (%p)" , cfgAcceptance[i], (void *)mAcceptance [i]);
367- else
368- LOGF (warning, " Could not load acceptance weights of REF particle from %s (%p)" , cfgAcceptance[i], (void *)mAcceptance [i]);
369-
370365 mEfficiency .push_back (ccdb->getForTimeStamp <TH1D>(cfgEfficiency[i], timestamp));
371- if (mEfficiency .size () == 4 )
372- LOGF (fatal, " Could not load efficiency of REF particle histogram for trigger particles from %s" , cfgEfficiency[i]);
373-
374- LOGF (info, " Loaded efficiency of REF particle histogram from %s (%p)" , cfgEfficiency[i], (void *)mEfficiency [i]);
375366 }
367+ if (mAcceptance .size () == 5 )
368+ LOGF (info, " Loaded acceptance weights" );
369+ else
370+ LOGF (warning, " Could not load acceptance weights" );
371+
372+ if (mEfficiency .size () == 5 )
373+ LOGF (fatal, " Could not load efficiency histogram" );
374+
375+ LOGF (info, " Loaded efficiency histogram" );
376376 }
377377 correctionsLoaded = true ;
378378 }
@@ -381,14 +381,14 @@ struct FlowGFWOmegaXi {
381381 bool setCurrentParticleWeights (float & weight_nue, float & weight_nua, TrackObject track, float vtxz, int ispecies)
382382 {
383383 float eff = 1 .;
384- if (mEfficiency .size () == 4 )
384+ if (mEfficiency .size () == 5 )
385385 eff = mEfficiency [ispecies]->GetBinContent (mEfficiency [ispecies]->FindBin (track.pt ()));
386386 else
387387 eff = 1.0 ;
388388 if (eff == 0 )
389389 return false ;
390390 weight_nue = 1 . / eff;
391- if (mAcceptance .size () == 4 )
391+ if (mAcceptance .size () == 5 )
392392 weight_nua = mAcceptance [ispecies]->GetNUA (track.phi (), track.eta (), vtxz);
393393 else
394394 weight_nua = 1 ;
@@ -483,7 +483,7 @@ struct FlowGFWOmegaXi {
483483 continue ;
484484 registry.fill (HIST (" hPhi" ), track.phi ());
485485 registry.fill (HIST (" hEta" ), track.eta ());
486- registry.fill (HIST (" hEtaPhiVtxzREF" ), track.eta (), track.phi (), vtxz);
486+ registry.fill (HIST (" hEtaPhiVtxzREF" ), track.phi (), track.eta (), vtxz);
487487 registry.fill (HIST (" hPt" ), track.pt ());
488488 int ptbin = fPtAxis ->FindBin (track.pt ()) - 1 ;
489489 if ((track.pt () > cfgCutPtMin) && (track.pt () < cfgCutPtMax)) {
@@ -529,14 +529,14 @@ struct FlowGFWOmegaXi {
529529 if (TMath::Abs (v0.mK0Short () - 0.49761 ) < cfgv0_mk0swindow) {
530530 CandNum[0 ] = CandNum[0 ] + 1 ;
531531 registry.fill (HIST (" InvMassK0s" ), v0.pt (), v0.mK0Short (), v0.eta (), cent);
532- registry.fill (HIST (" hEtaPhiVtxzPOIK0s" ), v0.eta (), v0.phi (), vtxz);
532+ registry.fill (HIST (" hEtaPhiVtxzPOIK0s" ), v0.phi (), v0.eta (), vtxz);
533533 fGFW ->Fill (v0.eta (), fV0PtAxis ->FindBin (v0.pt ()) - 1 + ((fK0sMass ->FindBin (v0.mK0Short ()) - 1 ) * nV0PtBins), v0.phi (), wacc * weff, 8 );
534534 }
535535 } else if (PDGCode == kLambda0 ) {
536536 if (TMath::Abs (v0.mLambda () - 1.115683 ) < cfgv0_mlambdawindow) {
537537 CandNum[1 ] = CandNum[1 ] + 1 ;
538538 registry.fill (HIST (" InvMassLambda" ), v0.pt (), v0.mLambda (), v0.eta (), cent);
539- registry.fill (HIST (" hEtaPhiVtxzPOILambda" ), v0.eta (), v0.phi (), vtxz);
539+ registry.fill (HIST (" hEtaPhiVtxzPOILambda" ), v0.phi (), v0.eta (), vtxz);
540540 fGFW ->Fill (v0.eta (), fV0PtAxis ->FindBin (v0.pt ()) - 1 + ((fLambdaMass ->FindBin (v0.mLambda ()) - 1 ) * nV0PtBins), v0.phi (), wacc * weff, 16 );
541541 }
542542 }
@@ -598,15 +598,15 @@ struct FlowGFWOmegaXi {
598598 continue ;
599599 if (PDGCode == kOmegaMinus ) {
600600 CandNum[3 ] = CandNum[3 ] + 1 ;
601- registry.fill (HIST (" hEtaPhiVtxzPOIOmega" ), casc.eta (), casc.phi (), vtxz);
601+ registry.fill (HIST (" hEtaPhiVtxzPOIOmega" ), casc.phi (), casc.eta (), vtxz);
602602 registry.fill (HIST (" InvMassOmegaMinus" ), casc.pt (), casc.mOmega (), casc.eta (), cent);
603603 if ((casc.pt () < cfgCutPtPOIMax) && (casc.pt () > cfgCutPtPOIMin) && (casc.mOmega () > 1.63 ) && (casc.mOmega () < 1.71 )) {
604604 fGFW ->Fill (casc.eta (), fXiPtAxis ->FindBin (casc.pt ()) - 1 + ((fOmegaMass ->FindBin (casc.mOmega ()) - 1 ) * nXiPtBins), casc.phi (), wacc * weff, 4 );
605605 }
606606 }
607607 if (PDGCode == kXiMinus ) {
608608 CandNum[2 ] = CandNum[2 ] + 1 ;
609- registry.fill (HIST (" hEtaPhiVtxzPOIXi" ), casc.eta (), casc.phi (), vtxz);
609+ registry.fill (HIST (" hEtaPhiVtxzPOIXi" ), casc.phi (), casc.eta (), vtxz);
610610 registry.fill (HIST (" InvMassXiMinus" ), casc.pt (), casc.mXi (), casc.eta (), cent);
611611 if ((casc.pt () < cfgCutPtPOIMax) && (casc.pt () > cfgCutPtPOIMin) && (casc.mXi () > 1.30 ) && (casc.mXi () < 1.37 )) {
612612 fGFW ->Fill (casc.eta (), fXiPtAxis ->FindBin (casc.pt ()) - 1 + ((fXiMass ->FindBin (casc.mXi ()) - 1 ) * nXiPtBins), casc.phi (), wacc * weff, 2 );
0 commit comments