@@ -148,7 +148,7 @@ struct UpcPhotonuclearAnalysisJMG {
148148 " Pair cuts on various particles" };
149149 Configurable<float > cfgTwoTrackCut{" cfgTwoTrackCut" , -1 , {" Two track cut" }};
150150 ConfigurableAxis axisVertex{" axisVertex" , {10 , -10 , 10 }, " vertex axis for histograms" };
151- ConfigurableAxis axisDeltaPhi{" axisDeltaPhi" , {72 , -constants::math:: PIHalf, constants::math::PIHalf * 3 }, " delta phi axis for histograms" };
151+ ConfigurableAxis axisDeltaPhi{" axisDeltaPhi" , {72 , -PIHalf, kThreeHalfPi }, " delta phi axis for histograms" };
152152 ConfigurableAxis axisDeltaEta{" axisDeltaEta" , {40 , -2 , 2 }, " delta eta axis for histograms" };
153153 ConfigurableAxis axisPtTrigger{" axisPtTrigger" , {VARIABLE_WIDTH, 0.5 , 1.0 , 1.5 , 2.0 , 3.0 , 4.0 , 6.0 , 10.0 }, " pt trigger axis for histograms" };
154154 ConfigurableAxis axisPtAssoc{" axisPtAssoc" , {VARIABLE_WIDTH, 0.5 , 1.0 , 1.5 , 2.0 , 3.0 , 4.0 , 6.0 }, " pt associated axis for histograms" };
@@ -416,8 +416,9 @@ struct UpcPhotonuclearAnalysisJMG {
416416 if (isTrackCut (track) == false ) {
417417 continue ;
418418 }
419+ float phiVal = RecoDecay::constrainAngle (phi (track.px (), track.py ()), 0 .f , TwoPI);
419420 histos.fill (HIST (" yields" ), multiplicity, track.pt (), eta (track.px (), track.py (), track.pz ()));
420- histos.fill (HIST (" etaphi" ), multiplicity, eta (track.px (), track.py (), track.pz ()), phi (track. px (), track. py ()) );
421+ histos.fill (HIST (" etaphi" ), multiplicity, eta (track.px (), track.py (), track.pz ()), phiVal );
421422 }
422423 }
423424
@@ -449,7 +450,7 @@ struct UpcPhotonuclearAnalysisJMG {
449450 continue;
450451 }*/
451452 float deltaPhi = phi (track1.px (), track1.py ()) - phi (track2.px (), track2.py ());
452- deltaPhi = RecoDecay::constrainAngle (deltaPhi, -PIHalf, kThreeHalfPi );
453+ deltaPhi = RecoDecay::constrainAngle (deltaPhi, -PIHalf);
453454 target->getPairHist ()->Fill (CorrelationContainer::kCFStepReconstructed , eta (track1.px (), track1.py (), track1.pz ()) - eta (track2.px (), track2.py (), track2.pz ()), track2.pt (), track1.pt (), multiplicity, deltaPhi, posZ, 1.0 );
454455 }
455456 }
@@ -529,8 +530,9 @@ struct UpcPhotonuclearAnalysisJMG {
529530 if (isTrackCut (track) == false ) {
530531 continue ;
531532 }
532- histos.fill (HIST (" etaphiVtx" ), reconstructedCollision.posZ (), eta (track.px (), track.py (), track.pz ()), phi (track.px (), track.py ()));
533- histos.fill (HIST (" Tracks/hTrackPhiBeforeCorr" ), phi (track.px (), track.py ()));
533+ float phiVal = RecoDecay::constrainAngle (phi (track.px (), track.py ()), 0 .f , TwoPI);
534+ histos.fill (HIST (" etaphiVtx" ), reconstructedCollision.posZ (), eta (track.px (), track.py (), track.pz ()), phiVal);
535+ histos.fill (HIST (" Tracks/hTrackPhiBeforeCorr" ), phiVal);
534536 }
535537
536538 switch (sgSide) {
@@ -559,14 +561,15 @@ struct UpcPhotonuclearAnalysisJMG {
559561 }
560562 nTracksCharged++;
561563 sumPt += track.pt ();
564+ float phiVal = RecoDecay::constrainAngle (phi (track.px (), track.py ()), 0 .f , TwoPI);
562565 histos.fill (HIST (" Tracks/SGsideA/hTrackPt" ), track.pt ());
563- histos.fill (HIST (" Tracks/SGsideA/hTrackPhi" ), phi (track. px (), track. py ()) );
566+ histos.fill (HIST (" Tracks/SGsideA/hTrackPhi" ), phiVal );
564567 histos.fill (HIST (" Tracks/SGsideA/hTrackEta" ), eta (track.px (), track.py (), track.pz ()));
565568 histos.fill (HIST (" Tracks/SGsideA/hTrackTPCSignnalP" ), momentum (track.px (), track.py (), track.pz ()) * track.sign (), track.tpcSignal ());
566569 histos.fill (HIST (" Tracks/SGsideA/hTrackTOFSignnalP" ), momentum (track.px (), track.py (), track.pz ()) * track.sign (), track.tofSignal ());
567570 vTrackPtSideA.push_back (track.pt ());
568571 vTrackEtaSideA.push_back (eta (track.px (), track.py (), track.pz ()));
569- vTrackPhiSideA.push_back (phi (track. px (), track. py ()) );
572+ vTrackPhiSideA.push_back (phiVal );
570573 vTrackTPCSignalSideA.push_back (track.tpcSignal ());
571574 vTrackTOFSignalSideA.push_back (track.tofSignal ());
572575 vTrackTPCNSigmaPiSideA.push_back (track.tpcNSigmaPi ());
@@ -618,14 +621,15 @@ struct UpcPhotonuclearAnalysisJMG {
618621 }
619622 nTracksCharged++;
620623 sumPt += track.pt ();
624+ float phiVal = RecoDecay::constrainAngle (phi (track.px (), track.py ()), 0 .f , TwoPI);
621625 histos.fill (HIST (" Tracks/SGsideC/hTrackPt" ), track.pt ());
622- histos.fill (HIST (" Tracks/SGsideC/hTrackPhi" ), phi (track. px (), track. py ()) );
626+ histos.fill (HIST (" Tracks/SGsideC/hTrackPhi" ), phiVal );
623627 histos.fill (HIST (" Tracks/SGsideC/hTrackEta" ), eta (track.px (), track.py (), track.pz ()));
624628 histos.fill (HIST (" Tracks/SGsideC/hTrackTPCSignnalP" ), momentum (track.px (), track.py (), track.pz ()) * track.sign (), track.tpcSignal ());
625629 histos.fill (HIST (" Tracks/SGsideC/hTrackTOFSignnalP" ), momentum (track.px (), track.py (), track.pz ()) * track.sign (), track.tofSignal ());
626630 vTrackPtSideC.push_back (track.pt ());
627631 vTrackEtaSideC.push_back (eta (track.px (), track.py (), track.pz ()));
628- vTrackPhiSideC.push_back (phi (track. px (), track. py ()) );
632+ vTrackPhiSideC.push_back (phiVal );
629633 vTrackTPCSignalSideC.push_back (track.tpcSignal ());
630634 vTrackTOFSignalSideC.push_back (track.tofSignal ());
631635 vTrackTPCNSigmaPiSideC.push_back (track.tpcNSigmaPi ());
@@ -855,8 +859,8 @@ struct UpcPhotonuclearAnalysisJMG {
855859 ++multiplicity;
856860
857861 float weightNUA = getNUAWeight (reconstructedCollision.posZ (), eta (track.px (), track.py (), track.pz ()), phi (track.px (), track.py ()));
858-
859- histos.fill (HIST (" Tracks/hTrackPhiAfterCorr" ), phi (track. px (), track. py ()) , weightNUA);
862+ float phiVal = RecoDecay::constrainAngle ( phi (track. px (), track. py ()), 0 . f , TwoPI);
863+ histos.fill (HIST (" Tracks/hTrackPhiAfterCorr" ), phiVal , weightNUA);
860864 }
861865 // multiplicity = reconstructedTracks.size();
862866 if (fillCollisionUD (same, multiplicity) == false ) {
0 commit comments