add psi(2S) and upsilon

Author: DanielSamitz

PWGEM/Dilepton/Tasks/lmeeLFCocktail.cxx

@@ -59,7 +59,9 @@ struct lmeelfcocktail {
     {113, {"rho/", {-1}}},
     {223, {"omega/", {-1, 111}}},
     {333, {"phi/", {-1, 111, 221}}},
-    {443, {"Jpsi/", {-1}}}};
+    {443, {"Jpsi/", {-1}}},
+    {100443, {"psi2S/", {-1}}},
+    {553, {"Upsilon/", {-1}}}};
 
   std::map<TString, int> histogramId;
 
@@ -320,12 +322,12 @@ struct lmeelfcocktail {
       addHistogram1D("OpAng", opAng_axis, i);
       addHistogram1D("Mee", mass_axis, i);
       addHistogram1D("Ptee", ptee_axis, i);
-      addHistogram1D_stage("Dca", dca_axis, i, "rec/");
-      addHistogram1D_stage("Dcaee", dcaee_axis, i, "rec/");
+      //addHistogram1D_stage("Dca", dca_axis, i, "rec/");
+      //addHistogram1D_stage("Dcaee", dcaee_axis, i, "rec/");
       i = -1;
-      addHistogram2D_stage("DcaVsPt", dca_axis, pt_axis, i, "rec/");
-      addHistogram2D_stage("DcaeeVsPtee", dcaee_axis, ptee_axis, i, "rec/");
-      addHistogram2D_stage("DcaeeVsMee", dcaee_axis, mass_axis, i, "rec/");
+      //addHistogram2D_stage("DcaVsPt", dca_axis, pt_axis, i, "rec/");
+      //addHistogram2D_stage("DcaeeVsPtee", dcaee_axis, ptee_axis, i, "rec/");
+      //addHistogram2D_stage("DcaeeVsMee", dcaee_axis, mass_axis, i, "rec/");
       i = -1;
       addHistogramND("MeeVsPteeVsCos2DPhiRP", std::vector<AxisSpec>{mass_axis, ptee_axis, cos2dphi_axis}, i);
     }
@@ -352,7 +354,7 @@ struct lmeelfcocktail {
       int nPos = 0;
 
       ROOT::Math::PtEtaPhiMVector pEleGen, pPosGen, pEleRec, pPosRec;
-      float weight(1.), effEle(1.), effPos(1.), dcaEle(0.), dcaPos(0.);
+      float weight(1.), effEle(1.), effPos(1.);//, dcaEle(0.), dcaPos(0.);
       for (const auto& daughter : particle.daughters_as<McParticlesSmeared>()) {
         int temp_pdg = daughter.pdgCode();
         if (temp_pdg == 11) {
@@ -436,12 +438,12 @@ struct lmeelfcocktail {
 
         if (s == kRec) { // dca only at rec. level
           if (acceptedEle) {
-            fillHistogram1D("Dca", s, pdg, other_daughter_pdg, dcaEle, weightEle);
-            fillHistogram2D("DcaVsPt", s, pdg, other_daughter_pdg, dcaEle, pEle.Pt(), weightEle);
+            //fillHistogram1D("Dca", s, pdg, other_daughter_pdg, dcaEle, weightEle);
+            //fillHistogram2D("DcaVsPt", s, pdg, other_daughter_pdg, dcaEle, pEle.Pt(), weightEle);
           }
           if (acceptedPos) {
-            fillHistogram1D("Dca", s, pdg, other_daughter_pdg, dcaPos, weightPos);
-            fillHistogram2D("DcaVsPt", s, pdg, other_daughter_pdg, dcaPos, pPos.Pt(), weightPos);
+            //fillHistogram1D("Dca", s, pdg, other_daughter_pdg, dcaPos, weightPos);
+            //fillHistogram2D("DcaVsPt", s, pdg, other_daughter_pdg, dcaPos, pPos.Pt(), weightPos);
           }
         }
 
@@ -459,7 +461,7 @@ struct lmeelfcocktail {
           float ptee = p12.Pt();
           float opAng = o2::aod::pwgem::dilepton::utils::pairutil::getOpeningAngle(pPos.Px(), pPos.Py(), pPos.Pz(), pEle.Px(), pEle.Py(), pEle.Pz());
           float phiV = o2::aod::pwgem::dilepton::utils::pairutil::getPhivPair(pPos.Px(), pPos.Py(), pPos.Pz(), pEle.Px(), pEle.Py(), pEle.Pz(), 1, -1, 1);
-          float dcaee = sqrt((pow(dcaEle, 2) + pow(dcaPos, 2)) / 2);
+          //float dcaee = sqrt((pow(dcaEle, 2) + pow(dcaPos, 2)) / 2);
           float cos2dphi = std::cos(2.f * p12.Phi()); // PsiRP = 0 rad.
           double values[3] = {mee, ptee, cos2dphi};
           fillHistogramND("MeeVsPteeVsCos2DPhiRP", s, pdg, other_daughter_pdg, values, pairWeight);
@@ -468,9 +470,9 @@ struct lmeelfcocktail {
           fillHistogram1D("PhiV", s, pdg, other_daughter_pdg, phiV, pairWeight);
           fillHistogram1D("OpAng", s, pdg, other_daughter_pdg, opAng, pairWeight);
           if (s == kRec) { // dca only at rec. level
-            fillHistogram1D("Dcaee", s, pdg, other_daughter_pdg, dcaee, pairWeight);
-            fillHistogram2D("DcaeeVsPtee", s, pdg, other_daughter_pdg, dcaee, ptee, pairWeight);
-            fillHistogram2D("DcaeeVsMee", s, pdg, other_daughter_pdg, dcaee, mee, pairWeight);
+            //fillHistogram1D("Dcaee", s, pdg, other_daughter_pdg, dcaee, pairWeight);
+            //fillHistogram2D("DcaeeVsPtee", s, pdg, other_daughter_pdg, dcaee, ptee, pairWeight);
+            //fillHistogram2D("DcaeeVsMee", s, pdg, other_daughter_pdg, dcaee, mee, pairWeight);
           }
         }
       }