PWGEM/PhotonMeson: fix RZ cut in MC (#5605)

Author: dsekihat

PWGEM/PhotonMeson/Tasks/MaterialBudgetMC.cxx

@@ -262,10 +262,10 @@ struct MaterialBudgetMC {
             continue;
           }
           auto mcphoton = mcparticles.iteratorAt(photonid);
-          if (!IsConversionPointInAcceptance(mcphoton, maxRgen, maxY, margin_z_mc, mcparticles)) {
+          if (!(mcphoton.isPhysicalPrimary() || mcphoton.producedByGenerator())) {
             continue;
           }
-          if (!(mcphoton.isPhysicalPrimary() || mcphoton.producedByGenerator())) {
+          if (!IsConversionPointInAcceptance(mcphoton, maxRgen, maxY, margin_z_mc, mcparticles)) {
             continue;
           }
 

PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMC.cxx

@@ -69,7 +69,7 @@ struct Pi0EtaToGammaGammaMC {
   Configurable<float> maxY_track{"maxY_track", 0.9, "maximum rapidity for generated particles"};                 // for PCM and dielectron
   Configurable<float> minPhi_track{"minPhi_track", 0, "minimum azimuthal angle for generated particles"};        // for PCM and dielectron
   Configurable<float> maxPhi_track{"maxPhi_track", 2 * M_PI, "maximum azimuthal angle for generated particles"}; // for PCM and dielectron
-  Configurable<float> maxRgen{"maxRgen", 100.f, "maximum radius for generated particles"};
+  Configurable<float> maxRgen{"maxRgen", 90.f, "maximum radius for generated particles"};
   Configurable<float> margin_z_mc{"margin_z_mc", 7.0, "margin for z cut in cm for MC"};
 
   Configurable<float> maxY_phos{"maxY_phos", 0.9, "maximum rapidity for generated particles"};                     // for EMC

PWGEM/PhotonMeson/Tasks/SinglePhotonMC.cxx

@@ -68,7 +68,7 @@ struct SinglePhotonMC {
   Configurable<float> cfgCentMax{"cfgCentMax", 999, "max. centrality"};
 
   Configurable<float> maxY{"maxY", 0.9, "maximum rapidity for reconstructed particles"};
-  Configurable<float> maxRgen{"maxRgen", 100.f, "maximum radius for generated particles"};
+  Configurable<float> maxRgen{"maxRgen", 90.f, "maximum radius for generated particles"};
   Configurable<float> margin_z_mc{"margin_z_mc", 7.0, "margin for z cut in cm for MC"};
 
   Configurable<std::string> fConfigPCMCuts{"cfgPCMCuts", "analysis,qc,nocut", "Comma separated list of V0 photon cuts"};
@@ -327,13 +327,13 @@ struct SinglePhotonMC {
           }
 
           auto mcphoton = mcparticles.iteratorAt(photonid);
-          if constexpr (photontype == EMDetType::kPCM) {
-            if (!IsConversionPointInAcceptance(mcphoton, maxRgen, maxY, margin_z_mc, mcparticles)) {
-              continue;
-            }
-          }
 
           if (mcphoton.isPhysicalPrimary() || mcphoton.producedByGenerator()) {
+            if constexpr (photontype == EMDetType::kPCM) {
+              if (!IsConversionPointInAcceptance(mcphoton, maxRgen, maxY, margin_z_mc, mcparticles)) {
+                continue;
+              }
+            }
             reinterpret_cast<TH1F*>(list_photon_det_cut->FindObject("hPt_Photon_Primary"))->Fill(v1.Pt());
             reinterpret_cast<TH1F*>(list_photon_det_cut->FindObject("hY_Photon_Primary"))->Fill(v1.Rapidity());
             reinterpret_cast<TH1F*>(list_photon_det_cut->FindObject("hPhi_Photon_Primary"))->Fill(v1.Phi() < 0.0 ? v1.Phi() + TMath::TwoPi() : v1.Phi());

PWGEM/PhotonMeson/Tasks/TaggingPi0MC.cxx

@@ -64,7 +64,7 @@ struct TaggingPi0MC {
   Configurable<float> cfgCentMax{"cfgCentMax", 999, "max. centrality"};
 
   Configurable<float> maxY{"maxY", 0.9, "maximum rapidity for reconstructed particles"};
-  Configurable<float> maxRgen{"maxRgen", 100.f, "maximum radius for generated particles"};
+  Configurable<float> maxRgen{"maxRgen", 90.f, "maximum radius for generated particles"};
   Configurable<float> margin_z_mc{"margin_z_mc", 7.0, "margin for z cut in cm for MC"};
 
   Configurable<std::string> fConfigPCMCuts{"cfgPCMCuts", "qc", "Comma separated list of V0 photon cuts"};
@@ -363,9 +363,6 @@ struct TaggingPi0MC {
             continue;
           }
           auto mcphoton1 = mcparticles.iteratorAt(photonid1);
-          if (!IsConversionPointInAcceptance(mcphoton1, maxRgen, maxY, margin_z_mc, mcparticles)) {
-            continue;
-          }
 
           int pi0id1 = IsXFromY(mcphoton1, mcparticles, 22, 111);
           if (pi0id1 < 0) { // photon from pi0 decay
@@ -378,6 +375,9 @@ struct TaggingPi0MC {
           //     mcphoton1.isPhysicalPrimary(), mcphoton1.producedByGenerator(), mcpi01.isPhysicalPrimary(), mcpi01.producedByGenerator());
 
           if (mcpi01.isPhysicalPrimary() || mcpi01.producedByGenerator()) {
+            if (!IsConversionPointInAcceptance(mcphoton1, maxRgen, maxY, margin_z_mc, mcparticles)) {
+              continue;
+            }
             reinterpret_cast<TH1F*>(list_pcm->FindObject(cut1.GetName())->FindObject("hPt_v0photon_Pi0_Primary"))->Fill(g1.pt());
           } else if (IsFromWD(mcpi01.emmcevent(), mcpi01, mcparticles)) {
             reinterpret_cast<TH1F*>(list_pcm->FindObject(cut1.GetName())->FindObject("hPt_v0photon_Pi0_FromWD"))->Fill(g1.pt());
@@ -422,9 +422,6 @@ struct TaggingPi0MC {
               }
 
               auto g1mc = mcparticles.iteratorAt(photonid1);
-              if (!IsConversionPointInAcceptance(g1mc, maxRgen, maxY, margin_z_mc, mcparticles)) {
-                continue;
-              }
 
               int pi0id = -1;
               if constexpr (pairtype == PairType::kPCMDalitzEE) {
@@ -454,6 +451,9 @@ struct TaggingPi0MC {
               if (pi0id > 0) {
                 auto mcpi0 = mcparticles.iteratorAt(pi0id);
                 if (mcpi0.isPhysicalPrimary() || mcpi0.producedByGenerator()) {
+                  if (!IsConversionPointInAcceptance(g1mc, maxRgen, maxY, margin_z_mc, mcparticles)) {
+                    continue;
+                  }
                   reinterpret_cast<TH2F*>(list_pair_ss->FindObject(Form("%s_%s", cut1.GetName(), cut2.GetName()))->FindObject(paircut.GetName())->FindObject("hMggPt_Pi0_Primary"))->Fill(v12.M(), v1.Pt());
                 } else if (IsFromWD(mcpi0.emmcevent(), mcpi0, mcparticles)) {
                   reinterpret_cast<TH2F*>(list_pair_ss->FindObject(Form("%s_%s", cut1.GetName(), cut2.GetName()))->FindObject(paircut.GetName())->FindObject("hMggPt_Pi0_FromWD"))->Fill(v12.M(), v1.Pt());