@@ -108,30 +108,27 @@ struct HfCandidateCreatorXic0Omegac0Qa {
108108 Configurable<bool > refitWithMaterialCorrection{" refitWithMaterialCorrection" , false , " Do refit after material correction applied" };
109109 // Options for internal V0 building
110110 // ...Initial values taken from PWGLF/Utiles/strangenessBuilderModule.h
111- // ...Modified according to the configurable in core wagon
112111 Configurable<int > minCrossedRows{" minCrossedRows" , 50 , " minimun TPC crossed rows for daughter tracks. Used for internal V0 Building" };
113- Configurable<float > dcanegtopv{" dcanegtopv" , .1 , " DCV Neg to PV" };
114- Configurable<float > dcapostopv{" dcapostopv" , .1 , " DCV Pos To PV" };
112+ Configurable<float > dcanegtopv{" dcanegtopv" , 0 .1 , " DCV Neg to PV" };
113+ Configurable<float > dcapostopv{" dcapostopv" , 0 .1 , " DCV Pos To PV" };
115114 Configurable<float > v0cospa{" v0cospa" , 0.95 , " V0 CosPA" };
116115 Configurable<float > dcav0dau{" dcav0dau" , 1.0 , " DCA V0 Daughters" };
117116 Configurable<float > v0radius{" v0radius" , 0.9 , " v0radius" };
118117 Configurable<float > maxDaughterEta{" maxDaughterEta" , 5.0 , " Maximun daughter eta (in abs value)" };
119118 // Options for internal cascade building
120119 // ...Initial values taken from PWGLF/Utiles/strangenessBuilderModule.h
121- // ...Modified according to the configurable in core wagon
122- Configurable<float > dcabachtopv{" dcabachtopv" , .05 , " DCV Bach to PV" };
123- Configurable<float > cascradius{" cascradius" , .9 , " DCV Bach to PV" };
120+ Configurable<float > dcabachtopv{" dcabachtopv" , 0.05 , " DCV Bach to PV" };
121+ Configurable<float > cascradius{" cascradius" , 0.9 , " DCV Bach to PV" };
124122 Configurable<float > casccospa{" casccospa" , 0.95 , " Cascade CosPA" };
125123 Configurable<float > dcacascdau{" dcacascdau" , 1.0 , " DCA cascade daughters" };
126- Configurable<float > lambdaMassWindow{" lambdaMassWindow" , 0.01 , " Distance from Lambda mass(does not apply to KF path) " };
127- // Options for internal cascade building - KF Building specifics
124+ Configurable<float > lambdaMassWindow{" lambdaMassWindow" , 0.01 , " Distance from Lambda mass" };
125+ // Options for LF and charm-baryon building - KF Building specifics
128126 // ...Initial values taken from PWGLF/Utiles/strangenessBuilderModule.h
129- Configurable<bool > kfTuneForOmega{" kfTuneForOmega" , false , " if enabled, take main cascade properties from omega fit instead of Xi fit(=default)" };
130127 Configurable<int > kfConstructMethod{" kfConstructMethod" , 2 , " 0: simplifyed fast mathematics ignoring constraint on fixed mass, 2 : daughter particle masses stay fixed in construction process" };
131128 Configurable<bool > kfUseV0MassConstraint{" kfUseV0MassConstraint" , true , " KF : Use Lambda mass constraint" };
132- Configurable<bool > kfUseCascadeMassConstraint{" kfUseCascadeMassConstraint" , false , " KF : Use Cascade mass constraint - WARNING : Not adequate for inv mass analysis of Xi" };
129+ Configurable<bool > kfUseCascadeMassConstraint{" kfUseCascadeMassConstraint" , true , " KF : Use Cascade mass constraint - WARNING : Not adequate for inv mass analysis of Xi and Omega " };
133130 Configurable<bool > kfDoDCAFitterPreMinimV0{" kfDoDCAFitterPreMinimV0" , true , " KF : do DCAFitter pre-optimization before KF fit to include material correction for V0" };
134- Configurable<bool > kfDoDCAFitterPreMinimCasc{" kfDoDCAFitterPreMinimCasc" , false , " KF : do DCAFitter pre-optimization before KF fit to include material correction for Xi" };
131+ Configurable<bool > kfDoDCAFitterPreMinimCasc{" kfDoDCAFitterPreMinimCasc" , true , " KF : do DCAFitter pre-optimization before KF fit to include material correction for Xi and Omega " };
135132 } lfConfigs;
136133
137134 struct : ConfigurableGroup {
@@ -148,11 +145,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
148145 Configurable<bool > createOmegaCToOmegaPi{" createOmegaCToOmegaPi" , false , " enable OmegaC0 -> Omega Pi candidate creation" };
149146 Configurable<bool > createOmegaCToOmegaK{" createOmegaCToOmegaK" , false , " enable OmegaC0 -> Omega K candidate creation" };
150147 // Cascade pre selection
151- Configurable<bool > doCascadePreselection{" doCascadePreselection" , true , " Use invariant mass and dcaXY cuts to preselect cascade candidates" };
152- Configurable<float > massToleranceCascade{" massToleranceCascade" , 0.01 , " Invariant mass tolerance for cascades" };
153- Configurable<float > dcaXYToPVCascadeMax{" dcaXYToPVCascadeMax" , 3 , " Max cascade DCA to PV in XY plane" };
154- Configurable<float > dcaV0DaughtersMax{" dcaV0DaughtersMax" , 1.0 , " Max DCA of V0 daughter" };
155- Configurable<float > dcaCascDaughtersMax{" dcaCascDaughtersMax" , 1.0 , " Max DCA of cascade daughter" };
148+ Configurable<float > cascadeMassWindow{" cascadeMassWindow" , 0.01 , " Invariant mass tolerance for cascades" };
156149 // Options for DCAFitter
157150 Configurable<bool > propagateToPCA{" propagateToPCA" , true , " Create tracks version propagated to PCA" };
158151 Configurable<float > maxR{" maxR" , 200 ., " Reject PCA's above this radius" };
@@ -163,11 +156,6 @@ struct HfCandidateCreatorXic0Omegac0Qa {
163156 Configurable<float > maxChi2{" maxChi2" , 100 , " Discard vertices with Chi2/Nprongs > this(or sum {DCAi^2}/Nprongs for abs. distance minimization)" };
164157 Configurable<bool > useAbsDCA{" useAbsDCA" , true , " Minimise abs. distance rather than chi2" };
165158 Configurable<bool > useWeightedFinalPCA{" useWeightedFinalPCA" , true , " Recalculate vertex position using track covariance, effective only if useAbsDCA is true" };
166- // Options for KFParticle
167- Configurable<float > lambdaMassWindow{" lambdaMassWindow" , 0.0075 , " Distance from LambdaMass" };
168- Configurable<int > kfConstructMethod{" kfConstructMethod" , 2 , " KF Construct method" };
169- Configurable<bool > kfUseV0MassConstraint{" kfUseV0MassConstraint" , false , " KF: Use lambda mass constraint" };
170- Configurable<bool > kfUseCascadeMassConstraint{" kfUseCascadeMassConstraint" , false , " KF: Use lambda mass constraint" };
171159 } configs;
172160
173161 Service<o2::ccdb::BasicCCDBManager> ccdb{};
@@ -379,7 +367,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
379367 }
380368 }
381369
382- // template function for running charm baryon reconstruction with DCAFitter for single candidate and decay channel
370+ // template function for running charm- baryon reconstruction with DCAFitter for single candidate and decay channel
383371 // / \brief decayChannel is for different decay channels
384372 // / \brief Colls is for collision tables joined with different centraltiy estimators
385373 // / \brief Hist is for QA histograms
@@ -422,10 +410,13 @@ struct HfCandidateCreatorXic0Omegac0Qa {
422410 return ;
423411 }
424412
425- float storeMass = (decayChannel == 0 ) ? straHelper.cascade .massXi : straHelper.cascade .massOmega ;
426- float storePt = RecoDecay::pt (straHelper.cascade .cascadeMomentum );
427- registry.fill (HIST (" hCascMass" ), storeMass);
428- registry.fill (HIST (" hCascPt" ), storePt);
413+ float mCasc = (decayChannel != hf_cand_casc_lf::DecayType2Prong::XiczeroOmegaczeroToXiPi) ? straHelper.cascade .massOmega : straHelper.cascade .massXi ;
414+ if (std::abs (mCasc - massOfCascade) > configs.cascadeMassWindow ) {
415+ return ;
416+ }
417+
418+ registry.fill (HIST (" hCascMass" ), mCasc );
419+ registry.fill (HIST (" hCascPt" ), RecoDecay::pt (straHelper.cascade .cascadeMomentum ));
429420 if (configs.fillHistograms ) {
430421 hCandCounter->Fill (CascReconstructed);
431422 }
@@ -442,15 +433,12 @@ struct HfCandidateCreatorXic0Omegac0Qa {
442433 }
443434
444435 // ------------------------------Create cascade track------------------------------
445- o2::track::TrackParCov trackCasc;
446- if (bachTrack.sign () < 0 ) { // Xi- or Omega-
447- trackCasc = o2::track::TrackParCov (straHelper.cascade .cascadePosition , straHelper.cascade .cascadeMomentum , covCasc, -1 , true );
448- } else if (bachTrack.sign () > 0 ) { // Xi+ or Omega+
449- trackCasc = o2::track::TrackParCov (straHelper.cascade .cascadePosition , straHelper.cascade .cascadeMomentum , covCasc, 1 , true );
450- } else {
436+ if (bachTrack.sign () == 0 ) {
451437 return ;
452438 }
439+ const int bachTrackSign = bachTrack.sign () < 0 ? -1 : 1 ;
453440
441+ o2::track::TrackParCov trackCasc = o2::track::TrackParCov (straHelper.cascade .cascadePosition , straHelper.cascade .cascadeMomentum , covCasc, bachTrackSign, true );
454442 trackCasc.setAbsCharge (1 );
455443 trackCasc.setPID (trackPidOfCascade);
456444
@@ -506,8 +494,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
506494 o2::base::Propagator::Instance ()->propagateToDCABxByBz (primaryVertex, trackCasc, 2 .f , matCorr, &impactParameterCasc);
507495 o2::base::Propagator::Instance ()->propagateToDCABxByBz (primaryVertex, trackParCovCharmBachelor, 2 .f , matCorr, &impactParameterCharmBach);
508496
509- // get Casc and Lambda invariant mass - from LF Table
510- float mCasc = (decayChannel != hf_cand_casc_lf::DecayType2Prong::XiczeroOmegaczeroToXiPi) ? straHelper.cascade .massOmega : straHelper.cascade .massXi ;
497+ // get Lambda invariant mass - from LF Table
511498 float mLambda = (straHelper.cascade .charge < 0 ) ? straHelper.v0 .massLambda : straHelper.v0 .massAntiLambda ;
512499
513500 // calculate quantities related to cascade and v0
@@ -553,7 +540,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
553540 BIT (decayChannel));
554541 }
555542
556- // template function for running charm baryon reconstruction with KFParticle for single candidate and decay channel
543+ // template function for running charm- baryon reconstruction with KFParticle for single candidate and decay channel
557544 // / \brief decayChannel is for different decay channels
558545 // / \brief Colls is for collision tables joined with different centraltiy estimators
559546 // / \brief Hist is for QA histograms
@@ -578,6 +565,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
578565 int pdgIdOfCascade = kXiMinus ;
579566 int pdgIdOfCharmBaryon = kXiC0 ;
580567 double massOfCascade = o2::constants::physics::MassXiMinus;
568+ bool kfTuneForOmega = false ;
581569
582570 if constexpr (decayChannel == hf_cand_casc_lf::DecayType2Prong::OmegaczeroToOmegaPi) {
583571 pdgIdOfBach = kKMinus ;
@@ -586,6 +574,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
586574 pdgIdOfCascade = kOmegaMinus ;
587575 pdgIdOfCharmBaryon = kOmegaC0 ;
588576 massOfCascade = o2::constants::physics::MassOmegaMinus;
577+ kfTuneForOmega = true ;
589578 }
590579
591580 if constexpr (decayChannel == hf_cand_casc_lf::DecayType2Prong::OmegaczeroToOmegaK) {
@@ -595,6 +584,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
595584 pdgIdOfCascade = kOmegaMinus ;
596585 pdgIdOfCharmBaryon = kOmegaC0 ;
597586 massOfCascade = o2::constants::physics::MassOmegaMinus;
587+ kfTuneForOmega = true ;
598588 }
599589
600590 // Make cascade starting from V0
@@ -606,45 +596,15 @@ struct HfCandidateCreatorXic0Omegac0Qa {
606596 bachTrack,
607597 false , // calculateBachelorBaryonVariables
608598 lfConfigs.kfConstructMethod ,
609- lfConfigs. kfTuneForOmega ,
599+ kfTuneForOmega,
610600 lfConfigs.kfUseV0MassConstraint ,
611601 lfConfigs.kfUseCascadeMassConstraint ,
612602 lfConfigs.kfDoDCAFitterPreMinimV0 ,
613603 lfConfigs.kfDoDCAFitterPreMinimCasc )) {
614604 return ;
615605 }
616606
617- float storeMass = (decayChannel == 0 ) ? straHelper.cascade .massXi : straHelper.cascade .massOmega ;
618- float storePt = RecoDecay::pt (straHelper.cascade .cascadeMomentum );
619- registry.fill (HIST (" hCascMass" ), storeMass);
620- registry.fill (HIST (" hCascPt" ), storePt);
621- if (configs.fillHistograms ) {
622- hCandCounter->Fill (CascReconstructed);
623- }
624-
625- // ------------------------------Cascade pre-selection------------------------------
626- // ! only for Xic0, Omegac0 -> Omega K
627- if constexpr (decayChannel == hf_cand_casc_lf::DecayType2Prong::OmegaczeroToOmegaK) {
628- if (configs.doCascadePreselection ) {
629- if (std::abs (straHelper.cascade .cascadeDCAxy ) > configs.dcaXYToPVCascadeMax ) {
630- return ;
631- }
632- // pre selection on dcaV0Daughters
633- if (std::abs (straHelper.cascade .v0DaughterDCA ) > configs.dcaV0DaughtersMax ) {
634- return ;
635- }
636- // pre selection on dcaCascDaughters
637- if (std::abs (straHelper.cascade .cascadeDaughterDCA ) > configs.dcaCascDaughtersMax ) {
638- return ;
639- }
640- // pre selection on invariantmass
641- if (std::abs (straHelper.cascade .massOmega - massOfCascade) > configs.massToleranceCascade ) {
642- return ;
643- }
644- }
645- }
646-
647- // ----------Create charm bayron as KF Particle object starting from V0----------
607+ // ----------Create charm baryon as KF Particle object starting from V0----------
648608 // Create KFParticle object of V0 Daughter & Bachelor
649609 const KFPTrack kfTrack0 = createKFPTrackFromTrack (posTrack);
650610 const KFPTrack kfTrack1 = createKFPTrackFromTrack (negTrack);
@@ -656,12 +616,11 @@ struct HfCandidateCreatorXic0Omegac0Qa {
656616 KFParticle kfPos (kfTrack0, (isAnti ? -pdgIdOfV0DauNeg : pdgIdOfV0DauPos));
657617 KFParticle kfNeg (kfTrack1, (isAnti ? -pdgIdOfV0DauPos : pdgIdOfV0DauNeg));
658618 KFParticle kfBach (kfTrackBach, (isAnti ? -pdgIdOfBach : pdgIdOfBach));
659- KFParticle kfBachRej (kfTrackBach, (isAnti ? -pdgIdOfBachRej : pdgIdOfBachRej)); // Rej -> Used for Omegac0->OmegaPi only
660619
661620 // ~~~~~~~Construct V0 with KF~~~~~~~
662621 const KFParticle* v0Daughters[2 ] = {&kfPos, &kfNeg};
663622 KFParticle kfV0;
664- kfV0.SetConstructMethod (configs .kfConstructMethod );
623+ kfV0.SetConstructMethod (lfConfigs .kfConstructMethod );
665624 try {
666625 kfV0.Construct (v0Daughters, 2 );
667626 } catch (std::runtime_error& e) {
@@ -672,7 +631,7 @@ struct HfCandidateCreatorXic0Omegac0Qa {
672631 // Require lambda pre-selection before mass constraint
673632 float massLam{}, sigMassLam{};
674633 kfV0.GetMass (massLam, sigMassLam);
675- if (std::abs (massLam - MassLambda0 ) > configs .lambdaMassWindow ) {
634+ if (std::abs (massLam - massOfV0 ) > lfConfigs .lambdaMassWindow ) {
676635 return ;
677636 }
678637 if (sigMassLam <= 0 ) {
@@ -681,68 +640,57 @@ struct HfCandidateCreatorXic0Omegac0Qa {
681640 if ((kfV0.GetNDF () <= 0 ) || (kfV0.GetChi2 () <= 0 )) {
682641 return ;
683642 }
643+ kfV0.SetPDG (pdgIdOfV0);
684644
685645 // Set mass constraint to lambda
686- if (configs .kfUseV0MassConstraint ) {
646+ if (lfConfigs .kfUseV0MassConstraint ) {
687647 kfV0.SetNonlinearMassConstraint (massOfV0);
688648 }
689649 kfV0.TransportToDecayVertex ();
690- kfV0.SetPDG (pdgIdOfV0);
691650
692651 // ~~~~~~~Construct cascade with KF~~~~~~~
693652 const KFParticle* cascDaughters[2 ] = {&kfBach, &kfV0};
694- const KFParticle* cascDaughtersRej[2 ] = {&kfBachRej, &kfV0};
695- KFParticle kfCasc, kfCascRej;
696-
697- kfCasc.SetConstructMethod (configs.kfConstructMethod );
653+ KFParticle kfCasc;
654+ kfCasc.SetConstructMethod (lfConfigs.kfConstructMethod );
698655 try {
699656 kfCasc.Construct (cascDaughters, 2 );
700657 } catch (std::runtime_error& e) {
701658 LOG (debug) << " Failed to construct Cascade: " << e.what ();
702659 return ;
703660 }
704661
705- float massCasc{}, sigMassCasc{}, massCascRej{}, sigMassCascRej{} ;
662+ float massCasc{}, sigMassCasc{};
706663 kfCasc.GetMass (massCasc, sigMassCasc);
707-
708- if (sigMassCasc <= 0 ) {
664+ if (std::abs (massCasc - massOfCascade) > configs.cascadeMassWindow ) {
709665 return ;
710666 }
711- if (std::abs (massCasc - massOfCascade) > configs. massToleranceCascade ) {
667+ if (sigMassCasc <= 0 ) {
712668 return ;
713669 }
714670 if (kfCasc.GetNDF () <= 0 || kfCasc.GetChi2 () <= 0 ) {
715671 return ;
716672 }
717673 kfCasc.SetPDG (pdgIdOfCascade);
718674
719- // perform cascade building on casc_rej - only for Omega
720- if constexpr (decayChannel != hf_cand_casc_lf::DecayType2Prong::XiczeroOmegaczeroToXiPi) {
721- kfCascRej.SetConstructMethod (configs.kfConstructMethod );
722- try {
723- kfCascRej.Construct (cascDaughtersRej, 2 );
724- } catch (std::runtime_error& e) {
725- LOG (debug) << " Failed to construct Cascade_rej: " << e.what ();
726- return ;
727- }
728-
729- kfCascRej.GetMass (massCascRej, sigMassCascRej);
730- kfCascRej.SetPDG (pdgIdOfCascade);
731- }
732-
733675 // Set mass constraint to cascade
734- if (configs .kfUseCascadeMassConstraint ) {
676+ if (lfConfigs .kfUseCascadeMassConstraint ) {
735677 kfCasc.SetNonlinearMassConstraint (massOfCascade);
736678 }
737679 kfCasc.TransportToDecayVertex ();
738680
681+ registry.fill (HIST (" hCascMass" ), massCasc);
682+ registry.fill (HIST (" hCascPt" ), RecoDecay::pt (kfCasc.GetPx (), kfCasc.GetPy ()));
683+ if (configs.fillHistograms ) {
684+ hCandCounter->Fill (CascReconstructed);
685+ }
686+
739687 // ~~~~~~~Construct Charm Baryon with KF~~~~~~~
740688 const KFPTrack kfTrackCharmBach = createKFPTrackFromTrack (trackCharmBachelor);
741689 const KFParticle kfCharmBach (kfTrackCharmBach, (isAnti ? -pdgIdOfCharmBach : pdgIdOfCharmBach));
742690 const KFParticle* charmBaryonDaughters[2 ] = {&kfCharmBach, &kfCasc};
743691
744692 KFParticle kfCharmBaryon;
745- kfCharmBaryon.SetConstructMethod (configs .kfConstructMethod );
693+ kfCharmBaryon.SetConstructMethod (lfConfigs .kfConstructMethod );
746694 try {
747695 kfCharmBaryon.Construct (charmBaryonDaughters, 2 );
748696 } catch (std::runtime_error& e) {
@@ -758,7 +706,6 @@ struct HfCandidateCreatorXic0Omegac0Qa {
758706 if (kfCharmBaryon.GetNDF () <= 0 || kfCharmBaryon.GetChi2 () <= 0 ) {
759707 return ;
760708 }
761-
762709 kfCharmBaryon.SetPDG (pdgIdOfCharmBaryon);
763710 kfCharmBaryon.TransportToDecayVertex ();
764711
0 commit comments