Merge branch 'AliceO2Group:master' into nj-ditto

Author: njacazio

MC/bin/o2dpg_sim_workflow_anchored.py

@@ -742,7 +742,7 @@ def main():
     forwardargs += " -tf " + str(args.tf) + " --sor " + str(effective_run_start) + " --timestamp " + str(timestamp) + " --production-offset " + str(prod_offset) + " -run " + str(args.run_number) + " --run-anchored --first-orbit "       \
                    + str(effective_first_orbit) + " --orbitsPerTF " + str(GLOparams["OrbitsPerTF"]) + str(energyarg)
     # the following options can be overwritten/influenced from the outside
-    if not '-col' in forwardargs:
+    if not re.search(r'(?<!\S)-col(?=[\s=])', forwardargs):
        forwardargs += ' -col ' + ColSystem
     if not '--readoutDets' in forwardargs:
        forwardargs += ' --readoutDets ' + GLOparams['detList']

MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C

@@ -259,7 +259,8 @@ FairGenerator*
   TString pathO2 = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen");
   //gen->SetDecayTable(Form("%s/BPLUSTOKAONJPSITOELE.DEC", pathO2.Data()));
   //gen->SetDecayTable(Form("%s/BPLUSTOKAONJPSITOELEALLMODES.DEC", pathO2.Data())); // decay table including decay modes for correlated background
-  gen->SetDecayTable(Form("%s/BTOJPSITOELE.DEC", pathO2.Data())); // decay table including decay modes for correlated background
+  //gen->SetDecayTable(Form("%s/BTOJPSITOELE.DEC", pathO2.Data())); // decay table including decay modes for correlated background
+	gen->SetDecayTable(Form("%s/BTOPSIJPSITODIELECTRON.DEC", pathO2.Data())); // decay table including decay modes for correlated background and jpsi feeddown
   // print debug
   // gen->PrintDebug();
   // set random seed

MC/config/PWGEM/external/generator/Generator_pythia8_embed_HFLepton.C

@@ -92,10 +92,10 @@ public:
 
         /// number of events to be embedded in a background event
         // gen->setFormula("max(1.,120.*(x<5.)+80.*(1.-x/20.)*(x>5.)*(x<11.)+240.*(1.-x/13.)*(x>11.))");
-        //mNumSigEvs = static_cast<int>(std::lround(5.0 + 0.886202881 * std::pow(std::max(0.0f, 17.5f - x), 1.7)));
-        mNumSigEvs = static_cast<int>(std::max(1.,120.*(x<5.)+80.*(1.-x/20.)*(x>5.)*(x<11.)+240.*(1.-x/13.)*(x>11.)));
-	//mNumSigEvs = 1;
-	LOG(info) << "[notifyEmbedding] ----- generating " << mNumSigEvs << " signal events " << std::endl;
+        mNumSigEvs = static_cast<int>(std::lround(5.0 + 0.886202881 * std::pow(std::max(0.0f, 17.5f - x), 1.7)));
+        //mNumSigEvs = static_cast<int>(std::max(1.,120.*(x<5.)+80.*(1.-x/20.)*(x>5.)*(x<11.)+240.*(1.-x/13.)*(x>11.)));
+        //mNumSigEvs = 1;
+        LOG(info) << "[notifyEmbedding] ----- generating " << mNumSigEvs << " signal events " << std::endl;
     };
 
 protected:

MC/config/PWGHF/ini/tests/GeneratorHF_D2H_bbbar_Bforced_gap5_Mode2.C

@@ -6,17 +6,14 @@ int External() {
 
     std::vector<int> checkPdgHadron{411, 421, 431, 4122, 4132, 4232, 4332, 511, 521, 531, 5122};
     std::map<int, std::vector<std::vector<int>>> checkHadronDecays{ // sorted pdg of daughters
-        {411, {{-321, 211, 211}, {-313, 211}, {211, 311}, {211, 333}}}, // D+
+        {411, {{-321, 211, 211}, {-313, 211}, {211, 333}}}, // D+
         {421, {{-321, 211}, {-321, 111, 211}}}, // D0
         {431, {{211, 333}, {-313, 321}}}, // Ds+
-        {4122, {{-313, 2212}, {-321, 2224}, {211, 102134}, {-321, 211, 2212}, {311, 2212}}}, // Lc+
-        {4132, {{211, 3312}}}, // Xic0
-        {4232, {{-313, 2212}, {-321, 3324}, {211, 211, 3312}, {-321, 211, 2212}}}, // Xic+
-        {4332, {{211, 3334}}}, // Omegac+
-        {511, {{-411, 211}, {-413, 211}, {-411, 213}, {431, -211}}}, // B0
-        {521, {{-421, 211}, {-423, 211}, {-421, 213}}}, // B+
+        {4122, {{-313, 2212}, {-321, 2224}, {211, 102134}, {-321, 211, 2212}}}, // Lc+
+        {511, {{-411, 211}, {-413, 211}, {-411, 213}, {-411, 321}, {-413, 213}, {-413, 321}}}, // B0
+        {521, {{-421, 211}, {-423, 211}, {-421, 213}, {-421, 321}}}, // B+
         {531, {{-431, 211}, {-433, 211}, {-431, 213}}}, // Bs0
-        {5122, {{4122, -211}, {4122, -213}, {4122, 211, -211, -211}, {4212, -211}}} // Lb0
+        {5122, {{4122, -211}, {4122, -213}, {14122, -211}, {4124, -211}, {4212, -211}}} // Lb0
     };
 
     TFile file(path.c_str(), "READ");

MC/config/PWGHF/pythia8/generator/pythia8_beautyhadronic_with_decays_Mode2.cfg

@@ -48,24 +48,12 @@ BeamRemnants:saturation 5
 ### add D+ decays absent in PYTHIA8 decay table and set BRs from PDG for other
 411:oneChannel = 1 0.0752 0 -321 211 211
 411:addChannel = 1 0.0104 0 -313 211
-411:addChannel = 1 0.0156 0 311 211
-411:addChannel = 1 0.0752 0 333 211 # to have the same amount of D+->KKpi and D+->Kpipi
+411:addChannel = 1 0.0100 0 333 211 # to have the same amount of D+->KKpi and D+->Kpipi
 ## add Lc decays absent in PYTHIA8 decay table and set BRs from PDG for other
 4122:oneChannel = 1 0.0196 100 2212 -313
 4122:addChannel = 1 0.0108 100 2224 -321
 4122:addChannel = 1 0.022 100 102134 211
 4122:addChannel = 1 0.035 0 2212 -321 211
-4122:addChannel = 1 0.0159 0 2212 311
-### add Xic+ decays absent in PYTHIA8 decay table
-4232:addChannel = 1 0.2 0 2212 -313
-4232:addChannel = 1 0.2 0 2212 -321 211
-4232:addChannel = 1 0.2 0 3324 211
-4232:addChannel = 1 0.2 0 3312 211 211
-### add Xic0 decays absent in PYTHIA8 decay table
-4132:addChannel = 1 0.0143 0 3312 211
-### add OmegaC decays absent in PYTHIA8 decay table
-4332:addChannel = 1 0.5 0 3334 211
-4332:addChannel = 1 0.5 0 3312 211
 
 ### K* -> K pi
 313:onMode = off
@@ -82,25 +70,12 @@ BeamRemnants:saturation 5
 ### for Lambda_c -> Lambda(1520) K-
 102134:onMode = off
 102134:onIfAll = 2212 321
-### for Xic0 -> pi Xi -> pi pi Lambda -> pi pi pi p 
-### and Omega_c -> pi Xi -> pi pi Lambda -> pi pi pi p
-3312:onMode = off
-3312:onIfAll = 3122 -211
-3122:onMode = off
-3122:onIfAll = 2212 -211
-### for Omega_c -> pi Omega -> pi K Lambda -> pi K pi p
-3334:onMode = off
-3334:onIfAll = 3122 -321
 
 ### switch off all decay channels
 411:onMode = off
 421:onMode = off
 431:onMode = off
 4122:onMode = off
-4232:onMode = off
-4132:onMode = off
-443:onMode = off
-4332:onMode = off
 511:onMode = off
 521:onMode = off
 531:onMode = off
@@ -131,60 +106,46 @@ BeamRemnants:saturation 5
 4122:onIfMatch = 102134 211
 ### Lambda_c -> p K pi
 4122:onIfMatch = 2212 321 211
-### Lambda_c -> pK0s
-4122:onIfMatch = 2212 311 
-
-### Xic+ -> pK*0
-4232:onIfMatch = 2212 313
-### Xic+ -> p K- pi+
-4232:onIfMatch = 2212 321 211
-### Xic+ -> Xi*0 pi+, Xi*->Xi- pi+
-4232:onIfMatch = 3324 211
-### Xic+ -> Xi- pi+ pi+
-4232:onIfMatch = 3312 211 211
-    
-### Xic0 -> Xi- pi+
-4132:onIfMatch = 3312 211
-
-### Omega_c -> Omega pi
-4332:onIfMatch = 3334 211
-### Omega_c -> Xi pi
-4332:onIfMatch = 3312 211
 
 ### Force also golden beauty hadrons decay modes for D2H studies
 ### add B0 decays
-511:oneChannel = 1 0.4 0 -411 211
-511:addChannel = 1 0.3 0 -413 211
-511:addChannel = 1 0.2 0 431 -211
+511:oneChannel = 1 0.35 0 -411 211
+511:addChannel = 1 0.35 0 -413 211
 ### add B+ decays
-521:oneChannel = 1 0.8 0 -421 211
+521:oneChannel = 1 0.7 0 -421 211
 ### add Bs0 decays
-531:oneChannel = 1 0.8 0 -431 211
+531:oneChannel = 1 0.7 0 -431 211
 ### add Lb decays
-5122:oneChannel = 1 0.8 0 4122 -211
+5122:oneChannel = 1 0.6 0 4122 -211
 
 ### we also add channels useful for studies of partly reconstructed decays / correlated backgrounds
 ### add B0 decays
 511:addChannel = 1 0.1 0 -411 213
+511:addChannel = 1 0.1 0 -413 213
+511:addChannel = 1 0.05 0 -411 321
+511:addChannel = 1 0.05 0 -413 321
 ### add B+ decays
 521:addChannel = 1 0.1 0 -421 213
 521:addChannel = 1 0.1 0 -423 211
+521:addChannel = 1 0.1 0 -421 321
 ### add Bs0 decays
 531:addChannel = 1 0.1 0 -431 213
 531:addChannel = 1 0.1 0 -433 211
+531:addChannel = 1 0.1 0 -433 321
 ### add Lb decays
-5122:addChannel = 1 0.1 0 4122 -213
-5122:addChannel = 1 0.05 0 4122 211 -211 -211
-5122:addChannel = 1 0.05 0 4212 -211
+5122:addChannel = 1 0.10 0 14122 -211
+5122:addChannel = 1 0.10 0 4124 -211
+5122:addChannel = 1 0.10 0 4212 -211
+5122:addChannel = 1 0.10 0 4122 -321
 
 ### B0 -> D pi
 511:onIfMatch = 411 211
 ### B0 -> D* pi
 511:onIfMatch = 413 211
-### B0 -> Ds pi
-511:onIfMatch = 431 211
 ### B0 -> D rho
 511:onIfMatch = 411 213
+### B0 -> D rho
+511:onIfMatch = 411 321
 
 ### B+ -> D0 pi
 521:onIfMatch = 421 211
@@ -202,9 +163,9 @@ BeamRemnants:saturation 5
 
 ### Lb -> Lc pi
 5122:onIfMatch = 4122 211
-### Lb -> Lc rho
-5122:onIfMatch = 4122 213
-### Lb -> Lc pi pi pi
-5122:onIfMatch = 4122 211 211 211
-### Lb -> Sc pi
+### Lb -> Lc(2595)+ pi
+5122:onIfMatch = 14122 211
+### Lb -> Lc(2625)+ pi
+5122:onIfMatch = 4124 211
+### Lb -> Sc(2455)+ pi
 5122:onIfMatch = 4212 211

MC/config/PWGLF/ini/GeneratorLF_phiphiInvMass.ini

@@ -0,0 +1,10 @@
+[GeneratorExternal]
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/GeneratorLF_phiphi.C
+funcName=generatePhiResonanceGun(999999, 0.0, 50.0, -1.0, 1.0, "${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/pythia8_inel_136tev.cfg", 3)
+
+[GeneratorPythia8]
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/pythia8_inel_136tev.cfg
+
+[DecayerPythia8]
+config[0]=${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/decayer/base.cfg
+config[1]=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGLF/pythia8/generator/resonances.cfg

MC/config/PWGLF/ini/tests/GeneratorLF_phiphiInvMass.C

@@ -0,0 +1,168 @@
+int External()
+{
+    const std::string path{"o2sim_Kine.root"};
+
+    TFile file(path.c_str(), "READ");
+    if (file.IsZombie())
+    {
+        std::cerr << "Cannot open ROOT file " << path << "\n";
+        return 1;
+    }
+
+    auto tree = (TTree *)file.Get("o2sim");
+    if (!tree)
+    {
+        std::cerr << "Cannot find tree o2sim in file " << path << "\n";
+        return 1;
+    }
+
+    std::vector<o2::MCTrack> *tracks{};
+    tree->SetBranchAddress("MCTrack", &tracks);
+
+    // Counters
+    int nResonance999999 = 0;
+    int nNotDecayed999999 = 0;
+    int nPhiFromResonance = 0;
+
+    // Decay counts into K+ K- (PDG 321, -321)
+    int nKPlusFromResonancePhi = 0;
+    int nKMinusFromResonancePhi = 0;
+
+    int nDirectInjectedPhi = 0;
+    int nMBPhi = 0;
+
+    int nKPlusFromDirectPhi = 0;
+    int nKMinusFromDirectPhi = 0;
+    int nKPlusFromMBPhi = 0;
+    int nKMinusFromMBPhi = 0;
+
+    int numberOfEventsProcessed = 0;
+    int numberOfEventsProcessedWithoutInjection = 0;
+
+    for (Long64_t i = 0; i < tree->GetEntries(); ++i)
+    {
+        tree->GetEntry(i);
+        ++numberOfEventsProcessed;
+        bool hasInjection = false;
+
+        for (size_t idx = 0; idx < tracks->size(); ++idx)
+        {
+            const auto &track = tracks->at(idx);
+            const auto pdg = track.GetPdgCode();
+
+            // 1. Process Custom Resonance 999999
+            if (pdg == 999999)
+            {
+                ++nResonance999999;
+                hasInjection = true;
+
+                if (track.getFirstDaughterTrackId() < 0)
+                {
+                    ++nNotDecayed999999;
+                    continue;
+                }
+
+                // Loop through daughters of 999999 (Phi mesons)
+                for (int j = track.getFirstDaughterTrackId(); j <= track.getLastDaughterTrackId(); ++j)
+                {
+                    const auto &phiTrack = tracks->at(j);
+                    if (phiTrack.GetPdgCode() == 333)
+                    {
+                        ++nPhiFromResonance;
+
+                        // Check daughters of this Phi (granddaughters of 999999)
+                        if (phiTrack.getFirstDaughterTrackId() >= 0)
+                        {
+                            for (int k = phiTrack.getFirstDaughterTrackId(); k <= phiTrack.getLastDaughterTrackId(); ++k)
+                            {
+                                auto grandDauPdg = tracks->at(k).GetPdgCode();
+                                if (grandDauPdg == 321) ++nKPlusFromResonancePhi;
+                                if (grandDauPdg == -321) ++nKMinusFromResonancePhi;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // 2. Process Phi (333) Mesons
+            else if (pdg == 333)
+            {
+                int motherId = track.getMotherTrackId();
+                int motherPdg = (motherId >= 0 && motherId < (int)tracks->size()) ? tracks->at(motherId).GetPdgCode() : 0;
+
+                // Skip Phi from 999999 here as it was handled above
+                if (motherPdg == 999999)
+                {
+                    continue;
+                }
+
+                bool isDirectInjected = (motherId < 0);
+
+                if (isDirectInjected)
+                {
+                    ++nDirectInjectedPhi;
+                    hasInjection = true;
+
+                    if (track.getFirstDaughterTrackId() >= 0)
+                    {
+                        for (int j = track.getFirstDaughterTrackId(); j <= track.getLastDaughterTrackId(); ++j)
+                        {
+                            auto dauPdg = tracks->at(j).GetPdgCode();
+                            if (dauPdg == 321) ++nKPlusFromDirectPhi;
+                            if (dauPdg == -321) ++nKMinusFromDirectPhi;
+                        }
+                    }
+                }
+                else
+                {
+                    // Minimum Bias Phi
+                    ++nMBPhi;
+
+                    if (track.getFirstDaughterTrackId() >= 0)
+                    {
+                        for (int j = track.getFirstDaughterTrackId(); j <= track.getLastDaughterTrackId(); ++j)
+                        {
+                            auto dauPdg = tracks->at(j).GetPdgCode();
+                            if (dauPdg == 321) ++nKPlusFromMBPhi;
+                            if (dauPdg == -321) ++nKMinusFromMBPhi;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!hasInjection)
+        {
+            ++numberOfEventsProcessedWithoutInjection;
+        }
+    }
+
+    std::cout << "--------------------------------\n";
+    std::cout << "Total Events Processed: " << tree->GetEntries() << "\n\n";
+
+    std::cout << "--- 1. INJECTED RESONANCE (999999) ---\n";
+    std::cout << "Total Injected Resonance 999999: " << nResonance999999 << "\n";
+    std::cout << "Resonances not decayed: " << nNotDecayed999999 << "\n";
+    std::cout << "Daughter Phi (333) produced from 999999: " << nPhiFromResonance << "\n";
+    std::cout << "  -> Decayed to K+: " << nKPlusFromResonancePhi << "\n";
+    std::cout << "  -> Decayed to K-: " << nKMinusFromResonancePhi << "\n\n";
+
+    std::cout << "--- 2. DIRECTLY INJECTED PHI (333) ---\n";
+    std::cout << "Total Directly Injected Phi (333): " << nDirectInjectedPhi << "\n";
+    std::cout << "  -> Decayed to K+: " << nKPlusFromDirectPhi << "\n";
+    std::cout << "  -> Decayed to K-: " << nKMinusFromDirectPhi << "\n\n";
+
+    std::cout << "--- 3. MINIMUM BIAS PHI (333) ---\n";
+    std::cout << "Total Minimum Bias Phi (333): " << nMBPhi << "\n";
+    std::cout << "  -> Decayed to K+: " << nKPlusFromMBPhi << "\n";
+    std::cout << "  -> Decayed to K-: " << nKMinusFromMBPhi << "\n";
+    std::cout << "--------------------------------\n";
+    std::cout << "Events processed without signal injection: " << numberOfEventsProcessedWithoutInjection << "\n";
+
+    return 0;
+}
+
+void GeneratorLF_phiphiInvMass()
+{
+    External();
+}