@@ -83,25 +83,9 @@ struct lambdaspincorrderived {
8383 histos.add (" hCentrality" , " Centrality distribution" , kTH1F , {{configThnAxisCentrality}});
8484 histos.add (" deltaPhiSame" , " deltaPhiSame" , HistType::kTH1D , {{72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
8585 histos.add (" deltaPhiMix" , " deltaPhiMix" , HistType::kTH1D , {{72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
86- histos.add (" ptCent" , " ptCent" , HistType::kTH2D , {{100 , 0.0 , 10.0 }, {8 , 0.0 , 80.0 }}, true );
87- histos.add (" etaCent" , " etaCent" , HistType::kTH2D , {{32 , -0.8 , 0.8 }, {8 , 0.0 , 80.0 }}, true );
88-
89- histos.add (" hLambdaSameForLL" , " hLambdaSameForLL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
90- histos.add (" hLambdaSameForLAL" , " hLambdaSameForLAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
91- histos.add (" hAntiLambdaSameForALAL" , " hAntiLambdaSameForALAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
92-
93- histos.add (" hLambdaMixForLL" , " hLambdaMixForLL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
94- histos.add (" hLambdaMixForLAL" , " hLambdaMixForLAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
95- histos.add (" hAntiLambdaMixForALAL" , " hAntiLambdaMixForALAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
96-
97- histos.add (" hLambdaSameForLL" , " hLambdaSameForLL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
98- histos.add (" hLambdaSameForLAL" , " hLambdaSameForLAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
99- histos.add (" hAntiLambdaSameForALAL" , " hAntiLambdaSameForALAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
100-
101- histos.add (" hLambdaMixForLL" , " hLambdaMixForLL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
102- histos.add (" hLambdaMixForLAL" , " hLambdaMixForLAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
103- histos.add (" hAntiLambdaMixForALAL" , " hAntiLambdaMixForALAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
104-
86+ histos.add (" ptCent" , " ptCent" , HistType::kTH2D , {{100 ,0.0 ,10.0 }, {8 ,0.0 ,80.0 }}, true );
87+ histos.add (" etaCent" , " etaCent" , HistType::kTH2D , {{32 ,-0.8 ,0.8 }, {8 ,0.0 ,80.0 }}, true );
88+
10589 histos.add (" hLambdaSameForLL" , " hLambdaSameForLL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
10690 histos.add (" hLambdaSameForLAL" , " hLambdaSameForLAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
10791 histos.add (" hAntiLambdaSameForALAL" , " hAntiLambdaSameForALAL" , HistType::kTH3D , {{50 , 0.0 , 5.0 }, {32 , -0.8 , 0.8 }, {72 , 0.0 , 2.0 * TMath::Pi ()}}, true );
@@ -255,8 +239,13 @@ struct lambdaspincorrderived {
255239 if (!selectionV0 (v0)) {
256240 continue ;
257241 }
242+ <<<<<<< HEAD
258243 histos.fill (HIST (" ptCent" ), v0.lambdaPt (), centrality);
259244 histos.fill (HIST (" etaCent" ), v0.lambdaEta (), centrality);
245+ =======
246+ histos.fill (HIST (" ptCent" ),v0.lambdaPt (),centrality);
247+ histos.fill (HIST (" etaCent" ),v0.lambdaEta (),centrality);
248+ >>>>>>> af5b95163 (Modify azimuthal distribution)
260249 proton = ROOT::Math::PtEtaPhiMVector (v0.protonPt (), v0.protonEta (), v0.protonPhi (), o2::constants::physics::MassProton);
261250 lambda = ROOT::Math::PtEtaPhiMVector (v0.lambdaPt (), v0.lambdaEta (), v0.lambdaPhi (), v0.lambdaMass ());
262251 for (const auto & v02 : V0s) {
@@ -274,7 +263,11 @@ struct lambdaspincorrderived {
274263 }
275264 proton2 = ROOT::Math::PtEtaPhiMVector (v02.protonPt (), v02.protonEta (), v02.protonPhi (), o2::constants::physics::MassProton);
276265 lambda2 = ROOT::Math::PtEtaPhiMVector (v02.lambdaPt (), v02.lambdaEta (), v02.lambdaPhi (), v02.lambdaMass ());
266+ <<<<<<< HEAD
277267 histos.fill (HIST (" deltaPhiSame" ), std::abs (RecoDecay::constrainAngle (v0.lambdaPhi (), 0 .0F ) - RecoDecay::constrainAngle (v02.lambdaPhi (), 0 .0F )));
268+ =======
269+ histos.fill (HIST (" deltaPhiSame" ), std::abs (RecoDecay::constrainAngle (v0.lambdaPhi (), 0 .0F ) - RecoDecay::constrainAngle (v02.lambdaPhi (), 0 .0F )));
270+ >>>>>>> af5b95163 (Modify azimuthal distribution)
278271 if (v0.v0Status () == 0 && v02.v0Status () == 0 ) {
279272 fillHistograms (0 , 0 , lambda, lambda2, proton, proton2, centrality, 0 );
280273 }
@@ -346,7 +339,11 @@ struct lambdaspincorrderived {
346339 lambda = ROOT::Math::PtEtaPhiMVector (t3.lambdaPt (), t3.lambdaEta (), t3.lambdaPhi (), t3.lambdaMass ());
347340 proton2 = ROOT::Math::PtEtaPhiMVector (t2.protonPt (), t2.protonEta (), t2.protonPhi (), o2::constants::physics::MassProton);
348341 lambda2 = ROOT::Math::PtEtaPhiMVector (t2.lambdaPt (), t2.lambdaEta (), t2.lambdaPhi (), t2.lambdaMass ());
342+ <<<<<<< HEAD
349343 histos.fill (HIST (" deltaPhiMix" ), std::abs (RecoDecay::constrainAngle (t3.lambdaPhi (), 0 .0F ) - RecoDecay::constrainAngle (t2.lambdaPhi (), 0 .0F )));
344+ =======
345+ histos.fill (HIST (" deltaPhiMix" ), std::abs (RecoDecay::constrainAngle (t3.lambdaPhi (), 0 .0F ) - RecoDecay::constrainAngle (t2.lambdaPhi (), 0 .0F )));
346+ >>>>>>> af5b95163 (Modify azimuthal distribution)
350347 if (t3.v0Status () == 0 && t2.v0Status () == 0 ) {
351348 fillHistograms (0 , 0 , lambda, lambda2, proton, proton2, centrality, 1 );
352349 }
0 commit comments