@@ -584,32 +584,28 @@ struct UpcRhoAnalysis {
584584 unsigned seed = std::chrono::system_clock::now ().time_since_epoch ().count (); // get time-based seed
585585 std::shuffle (std::begin (indices), std::end (indices), std::default_random_engine (seed)); // shuffle indices
586586 // calculate phi
587- ROOT::Math::PxPyPzMVector pOne = cutTracksLVs[indices[0 ]];
588- ROOT::Math::PxPyPzMVector pTwo = cutTracksLVs[indices[1 ]];
589- ROOT::Math::PxPyPzMVector pPlus = pOne + pTwo;
590- ROOT::Math::PxPyPzMVector pMinus = pOne - pTwo;
587+ ROOT::Math::PxPyPzMVector p1 = cutTracksLVs[indices[0 ]], p2 = cutTracksLVs[indices[1 ]];
588+ ROOT::Math::PxPyPzMVector pPlus = p1 + p2, pMinus = p1 - p2;
591589 return deltaPhi (pPlus, pMinus);
592590 }
593591
594592 template <typename T>
595593 float getPhiCharge (const T& cutTracks, const std::vector<ROOT::Math::PxPyPzMVector>& cutTracksLVs)
596594 { // two possible definitions of phi: charge-based assignment
597- ROOT::Math::PxPyPzMVector pOne, pTwo;
598- pOne = (cutTracks[0 ].sign () > 0 ) ? cutTracksLVs[0 ] : cutTracksLVs[1 ];
599- pTwo = (cutTracks[0 ].sign () > 0 ) ? cutTracksLVs[1 ] : cutTracksLVs[0 ];
600- ROOT::Math::PxPyPzMVector pPlus = pOne + pTwo;
601- ROOT::Math::PxPyPzMVector pMinus = pOne - pTwo;
595+ ROOT::Math::PxPyPzMVector p1, p2;
596+ p1 = (cutTracks[0 ].sign () > 0 ) ? cutTracksLVs[0 ] : cutTracksLVs[1 ];
597+ p2 = (cutTracks[0 ].sign () > 0 ) ? cutTracksLVs[1 ] : cutTracksLVs[0 ];
598+ ROOT::Math::PxPyPzMVector pPlus = p1 + p2, pMinus = p1 - p2;
602599 return deltaPhi (pPlus, pMinus);
603600 }
604601
605602 template <typename T>
606603 float getPhiChargeMC (const T& cutTracks, const std::vector<ROOT::Math::PxPyPzMVector>& cutTracksLVs)
607604 { // the same as for data but using pdg code instead of charge
608- ROOT::Math::PxPyPzMVector pOne, pTwo;
609- pOne = (cutTracks[0 ].pdgCode () > 0 ) ? cutTracksLVs[0 ] : cutTracksLVs[1 ];
610- pTwo = (cutTracks[0 ].pdgCode () > 0 ) ? cutTracksLVs[1 ] : cutTracksLVs[0 ];
611- ROOT::Math::PxPyPzMVector pPlus = pOne + pTwo;
612- ROOT::Math::PxPyPzMVector pMinus = pOne - pTwo;
605+ ROOT::Math::PxPyPzMVector p1, p2;
606+ p1 = (cutTracks[0 ].pdgCode () > 0 ) ? cutTracksLVs[0 ] : cutTracksLVs[1 ];
607+ p2 = (cutTracks[0 ].pdgCode () > 0 ) ? cutTracksLVs[1 ] : cutTracksLVs[0 ];
608+ ROOT::Math::PxPyPzMVector pPlus = p1 + p2, pMinus = p1 - p2;
613609 return deltaPhi (pPlus, pMinus);
614610 }
615611
0 commit comments