@@ -113,6 +113,10 @@ struct Kstarqa {
113113 Configurable<float > cfgITSChi2NCl{" cfgITSChi2NCl" , 36.0 , " ITS Chi2/NCl" };
114114 Configurable<float > cfgTPCChi2NClMax{" cfgTPCChi2NClMax" , 4.0 , " TPC Chi2/NCl" };
115115 Configurable<float > cfgTPCChi2NClMin{" cfgTPCChi2NClMin" , 0.0 , " TPC Chi2/NCl" };
116+ <<<<<<< HEAD
117+ =======
118+ Configurable<bool > hasITS{" hasITS" , true , " Required ITS" };
119+ >>>>>>> 01faa1bf6 (added hasTOF condition)
116120 Configurable<bool > isITSTPCRefit{" isITSTPCRefit" , false , " Require ITS Refit" };
117121 Configurable<bool > isVertexITSTPC{" isVertexITSTPC" , false , " Vertex ITS TPC" };
118122 Configurable<bool > isVertexTOFMatched{" isVertexTOFMatched" , false , " Vertex TOF Matched" };
@@ -551,6 +555,11 @@ struct Kstarqa {
551555 return false ;
552556 if (selectionConfig.cfgPVContributor && !candidate.isPVContributor ())
553557 return false ;
558+ <<<<<<< HEAD
559+ =======
560+ if (selectionConfig.hasITS && !candidate.hasITS ())
561+ return false ;
562+ >>>>>>> 01faa1bf6 (added hasTOF condition)
554563 if (selectionConfig.isITSTPCRefit && (!(o2::aod::track::ITSrefit) || !(o2::aod::track::TPCrefit)))
555564 return false ;
556565 } else if (!selectionConfig.isGlobalTracks ) {
@@ -2135,7 +2144,13 @@ struct Kstarqa {
21352144 hInvMass.fill (HIST (" h1RecMult" ), multiplicity);
21362145 hInvMass.fill (HIST (" h1RecMult2" ), multiplicityRec);
21372146
2147+ <<<<<<< HEAD
21382148 hInvMass.fill (HIST (" h1RecMult" ), multiplicity);
2149+ =======
2150+ if (cQAevents) {
2151+ rEventSelection.fill (HIST (" hVertexZRec" ), collision.posZ ());
2152+ }
2153+ >>>>>>> 01faa1bf6 (added hasTOF condition)
21392154
21402155 auto oldindex = -999 ;
21412156 for (const auto & track1 : tracks) {
@@ -2147,6 +2162,14 @@ struct Kstarqa {
21472162 continue ;
21482163 }
21492164
2165+ <<<<<<< HEAD
2166+ =======
2167+ if (cQAevents) {
2168+ rEventSelection.fill (HIST (" hDcaxy_cent_pt" ), track1.dcaXY (), multiplicity, track1.pt ());
2169+ rEventSelection.fill (HIST (" hDcaz_cent_pt" ), track1.dcaZ (), multiplicity, track1.pt ());
2170+ }
2171+
2172+ >>>>>>> 01faa1bf6 (added hasTOF condition)
21502173 auto track1ID = track1.index ();
21512174 for (const auto & track2 : tracks) {
21522175 rEventSelection.fill (HIST (" recMCparticles" ), 0.5 );
@@ -2188,13 +2211,21 @@ struct Kstarqa {
21882211 hPID.fill (HIST (" Before/hNsigmaTPC_Ka_before" ), track2.pt (), track2.tpcNSigmaKa ());
21892212 hPID.fill (HIST (" Before/hNsigmaTOF_Ka_before" ), track2.pt (), track2.tofNSigmaKa ());
21902213 }
2214+ <<<<<<< HEAD
21912215 if (cQAplots && (mctrack2.pdgCode () == -PDG_t::kPiMinus )) { // negative track pion
2216+ =======
2217+ if (cQAplots && (mctrack2.pdgCode () == PDG_t::kPiMinus )) { // negative track pion
2218+ >>>>>>> 01faa1bf6 (added hasTOF condition)
21922219 hPID.fill (HIST (" Before/h1PID_TPC_neg_pion" ), track2.tpcNSigmaPi ());
21932220 hPID.fill (HIST (" Before/h1PID_TOF_neg_pion" ), track2.tofNSigmaPi ());
21942221 hPID.fill (HIST (" Before/hNsigmaTPC_Pi_before" ), track2.pt (), track2.tpcNSigmaPi ());
21952222 hPID.fill (HIST (" Before/hNsigmaTOF_Pi_before" ), track2.pt (), track2.tofNSigmaPi ());
21962223 }
2224+ <<<<<<< HEAD
21972225 if (cQAplots && (mctrack2.pdgCode () == -PDG_t::kKMinus )) { // negative track kaon
2226+ =======
2227+ if (cQAplots && (mctrack2.pdgCode () == PDG_t::kKMinus )) { // negative track kaon
2228+ >>>>>>> 01faa1bf6 (added hasTOF condition)
21982229 hPID.fill (HIST (" Before/h1PID_TPC_neg_kaon" ), track2.tpcNSigmaKa ());
21992230 hPID.fill (HIST (" Before/h1PID_TOF_neg_kaon" ), track2.tofNSigmaKa ());
22002231 hPID.fill (HIST (" Before/hNsigmaTPC_Ka_before" ), track2.pt (), track2.tpcNSigmaKa ());
@@ -2203,6 +2234,13 @@ struct Kstarqa {
22032234 if (cQAplots && (std::abs (mctrack1.pdgCode ()) == PDG_t::kKPlus && std::abs (mctrack2.pdgCode ()) == PDG_t::kPiPlus )) {
22042235 hPID.fill (HIST (" Before/hNsigma_TPC_TOF_Ka_before" ), track1.tpcNSigmaKa (), track1.tofNSigmaKa ());
22052236 hPID.fill (HIST (" Before/hNsigma_TPC_TOF_Pi_before" ), track2.tpcNSigmaPi (), track2.tofNSigmaPi ());
2237+ <<<<<<< HEAD
2238+ =======
2239+ hPID.fill (HIST (" Before/hTPCnsigKa_mult_pt" ), track1.tpcNSigmaKa (), multiplicity, track1.pt ());
2240+ hPID.fill (HIST (" Before/hTPCnsigPi_mult_pt" ), track2.tpcNSigmaPi (), multiplicity, track2.pt ());
2241+ hPID.fill (HIST (" Before/hTOFnsigKa_mult_pt" ), track1.tofNSigmaKa (), multiplicity, track1.pt ());
2242+ hPID.fill (HIST (" Before/hTOFnsigPi_mult_pt" ), track2.tofNSigmaPi (), multiplicity, track2.pt ());
2243+ >>>>>>> 01faa1bf6 (added hasTOF condition)
22062244 }
22072245
22082246 if (!mctrack1.isPhysicalPrimary ()) {
0 commit comments