@@ -50,6 +50,7 @@ struct DedxAnalysis {
5050 true ,
5151 true };
5252 // Constant values
53+ <<<<<<< HEAD
5354 const int etaIntervals = 8 ;
5455 const int particlesType = 4 ;
5556 const float tpcCut = 0.6 ;
@@ -61,6 +62,19 @@ struct DedxAnalysis {
6162 const float pionTofCut = 1.0 ;
6263 const float invMassCut = 0.01 ;
6364 const float invMassCutGamma = 0.0015 ;
65+ =======
66+ static constexpr int kEtaIntervals = 8 ;
67+ static constexpr int kParticlesType = 4 ;
68+ float tpcCut = 0.6 ;
69+ float centMin = 0.0 ;
70+ float centMax = 100.0 ;
71+ float pionMin = 0.35 ;
72+ float pionMax = 0.45 ;
73+ float elTofCut = 0.1 ;
74+ float pionTofCut = 1.0 ;
75+ float invMassCut = 0.01 ;
76+ float invMassCutGamma = 0.0015 ;
77+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
6478
6579 // Configurable Parameters
6680 // Tracks cuts
@@ -96,9 +110,15 @@ struct DedxAnalysis {
96110 " Maximum Mass Gamma" };
97111 Configurable<bool > calibrationMode{" calibrationMode" , false , " calibration mode" };
98112 // Histograms names
113+ <<<<<<< HEAD
99114 static constexpr std::string_view kDedxvsMomentumPos [ParticlesType] = {" dEdx_vs_Momentum_all_Pos" , " dEdx_vs_Momentum_Pi_v0_Pos" , " dEdx_vs_Momentum_Pr_v0_Pos" , " dEdx_vs_Momentum_El_v0_Pos" };
100115 static constexpr std::string_view kDedxvsMomentumNeg [ParticlesType] = {" dEdx_vs_Momentum_all_Neg" , " dEdx_vs_Momentum_Pi_v0_Neg" , " dEdx_vs_Momentum_Pr_v0_Neg" , " dEdx_vs_Momentum_El_v0_Neg" };
101116 static constexpr double EtaCut[EtaIntervals + 1 ] = {-0.8 , -0.6 , -0.4 , -0.2 , 0.0 , 0.2 , 0.4 , 0.6 , 0.8 };
117+ =======
118+ static constexpr std::string_view kDedxvsMomentumPos [kParticlesType ] = {" dEdx_vs_Momentum_all_Pos" , " dEdx_vs_Momentum_Pi_v0_Pos" , " dEdx_vs_Momentum_Pr_v0_Pos" , " dEdx_vs_Momentum_El_v0_Pos" };
119+ static constexpr std::string_view kDedxvsMomentumNeg [kParticlesType ] = {" dEdx_vs_Momentum_all_Neg" , " dEdx_vs_Momentum_Pi_v0_Neg" , " dEdx_vs_Momentum_Pr_v0_Neg" , " dEdx_vs_Momentum_El_v0_Neg" };
120+ static constexpr double EtaCut[kEtaIntervals + 1 ] = {-0.8 , -0.6 , -0.4 , -0.2 , 0.0 , 0.2 , 0.4 , 0.6 , 0.8 };
121+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
102122 Configurable<std::vector<float >> calibrationFactorNeg{" calibrationFactorNeg" , {50.4011 , 50.4764 , 50.186 , 49.2955 , 48.8222 , 49.4273 , 49.9292 , 50.0556 }, " negative calibration factors" };
103123 Configurable<std::vector<float >> calibrationFactorPos{" calibrationFactorPos" , {50.5157 , 50.6359 , 50.3198 , 49.3345 , 48.9197 , 49.4931 , 50.0188 , 50.1406 }, " positive calibration factors" };
104124 ConfigurableAxis binP{" binP" , {VARIABLE_WIDTH, 0.1 , 0.12 , 0.14 , 0.16 , 0.18 , 0.2 , 0.25 , 0.3 , 0.35 , 0.4 , 0.45 , 0.5 , 0.55 , 0.6 , 0.65 , 0.7 , 0.75 , 0.8 , 0.85 , 0.9 , 0.95 , 1.0 , 1.1 , 1.2 , 1.3 , 1.4 , 1.5 , 1.6 , 1.7 , 1.8 , 1.9 , 2.0 , 2.1 , 2.2 , 2.3 , 2.4 , 2.5 , 2.6 , 2.7 , 2.8 , 2.9 , 3.0 , 3.2 , 3.4 , 3.6 , 3.8 , 4.0 , 4.5 , 5.0 , 5.5 , 6.0 , 6.5 , 7.0 , 8.0 , 9.0 , 10.0 , 11.0 , 12.0 , 13.0 , 14.0 , 15.0 , 16.0 , 18.0 , 20.0 }, " " };
@@ -189,7 +209,11 @@ struct DedxAnalysis {
189209 {{ptAxis}, {pAxis}});
190210
191211 // De/Dx for ch and v0 particles
212+ <<<<<<< HEAD
192213 for (int i = 0 ; i < ParticlesType; ++i) {
214+ =======
215+ for (int i = 0 ; i < kParticlesType ; ++i) {
216+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
193217 registryDeDx.add (kDedxvsMomentumPos [i].data (), " dE/dx" , HistType::kTH3F ,
194218 {{pAxis}, {dedxAxis}, {etaAxis}});
195219 registryDeDx.add (kDedxvsMomentumNeg [i].data (), " dE/dx" , HistType::kTH3F ,
@@ -412,7 +436,11 @@ struct DedxAnalysis {
412436 }
413437
414438 } else {
439+ <<<<<<< HEAD
415440 for (int i = 0 ; i < EtaIntervals; ++i) {
441+ =======
442+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
443+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
416444 if (trk.eta () > EtaCut[i] && trk.eta () < EtaCut[i + 1 ]) {
417445 if (signedP < 0 ) {
418446 registryDeDx.fill (HIST (" hdEdx_vs_eta_Neg_calibrated_Pi" ), trk.eta (), trk.tpcSignal () * 50 / calibrationFactorNeg->at (i));
@@ -438,7 +466,11 @@ struct DedxAnalysis {
438466 registryDeDx.fill (HIST (" hdEdx_vs_eta_vs_p_Pos_El" ), trk.eta (), trk.tpcSignal (), signedP);
439467 }
440468 } else {
469+ <<<<<<< HEAD
441470 for (int i = 0 ; i < EtaIntervals; ++i) {
471+ =======
472+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
473+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
442474 if (trk.eta () > EtaCut[i] && trk.eta () < EtaCut[i + 1 ]) {
443475 if (signedP < 0 ) {
444476 registryDeDx.fill (HIST (" hdEdx_vs_eta_vs_p_Neg_calibrated_El" ), trk.eta (), trk.tpcSignal () * 50 / calibrationFactorNeg->at (i), std::abs (signedP));
@@ -458,7 +490,11 @@ struct DedxAnalysis {
458490 registryDeDx.fill (HIST (" hdEdx_vs_eta_vs_p_Pos_TOF" ), trk.eta (), trk.tpcSignal (), signedP);
459491 }
460492 } else {
493+ <<<<<<< HEAD
461494 for (int i = 0 ; i < EtaIntervals; ++i) {
495+ =======
496+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
497+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
462498 if (trk.eta () > EtaCut[i] && trk.eta () < EtaCut[i + 1 ]) {
463499 if (signedP < 0 ) {
464500 registryDeDx.fill (HIST (" hdEdx_vs_eta_vs_p_Neg_calibrated_TOF" ), trk.eta (), trk.tpcSignal () * 50 / calibrationFactorNeg->at (i), std::abs (signedP));
@@ -473,7 +509,11 @@ struct DedxAnalysis {
473509 registryDeDx.fill (HIST (" hdEdx_vs_phi" ), trk.phi (), trk.tpcSignal ());
474510
475511 if (!calibrationMode) {
512+ <<<<<<< HEAD
476513 for (int i = 0 ; i < EtaIntervals; ++i) {
514+ =======
515+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
516+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
477517 if (trk.eta () > EtaCut[i] && trk.eta () < EtaCut[i + 1 ]) {
478518 if (signedP > 0 ) {
479519 registryDeDx.fill (HIST (kDedxvsMomentumPos [0 ]), signedP, trk.tpcSignal () * 50 / calibrationFactorPos->at (i), trk.eta ());
@@ -533,7 +573,11 @@ struct DedxAnalysis {
533573 continue ;
534574 }
535575
576+ <<<<<<< HEAD
536577 for (int i = 0 ; i < EtaIntervals; ++i) {
578+ =======
579+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
580+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
537581 if (negTrack.eta () > EtaCut[i] && negTrack.eta () < EtaCut[i + 1 ]) {
538582 registryDeDx.fill (HIST (kDedxvsMomentumNeg [1 ]), std::abs (signedPneg), negTrack.tpcSignal () * 50 / calibrationFactorNeg->at (i), negTrack.eta ());
539583 }
@@ -555,7 +599,11 @@ struct DedxAnalysis {
555599 continue ;
556600 }
557601
602+ <<<<<<< HEAD
558603 for (int i = 0 ; i < EtaIntervals; ++i) {
604+ =======
605+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
606+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
559607 if (negTrack.eta () > EtaCut[i] && negTrack.eta () < EtaCut[i + 1 ]) {
560608 registryDeDx.fill (HIST (kDedxvsMomentumNeg [1 ]), std::abs (signedPneg), negTrack.tpcSignal () * 50 / calibrationFactorNeg->at (i), negTrack.eta ());
561609 }
@@ -577,7 +625,11 @@ struct DedxAnalysis {
577625 continue ;
578626 }
579627
628+ <<<<<<< HEAD
580629 for (int i = 0 ; i < EtaIntervals; ++i) {
630+ =======
631+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
632+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
581633 if (negTrack.eta () > EtaCut[i] && negTrack.eta () < EtaCut[i + 1 ]) {
582634 registryDeDx.fill (HIST (kDedxvsMomentumNeg [2 ]), std::abs (signedPneg), negTrack.tpcSignal () * 50 / calibrationFactorNeg->at (i), negTrack.eta ());
583635 }
@@ -599,7 +651,11 @@ struct DedxAnalysis {
599651 continue ;
600652 }
601653
654+ <<<<<<< HEAD
602655 for (int i = 0 ; i < EtaIntervals; ++i) {
656+ =======
657+ for (int i = 0 ; i < kEtaIntervals ; ++i) {
658+ >>>>>>> 0b143aa2d (A new histogram p vs pT was added)
603659 if (negTrack.eta () > EtaCut[i] && negTrack.eta () < EtaCut[i + 1 ]) {
604660 registryDeDx.fill (HIST (kDedxvsMomentumNeg [3 ]), std::abs (signedPneg), negTrack.tpcSignal () * 50 / calibrationFactorNeg->at (i), negTrack.eta ());
605661 }
0 commit comments