Resolve remaining rebase conflicts in Pi0EtaToGammaGamma headers

Author: Youssef El Mard Bouziani

PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h

@@ -910,7 +910,6 @@ struct Pi0EtaToGammaGamma {
             continue;
           }
 
-          fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), weight);
           float wpair = weight;
 
           if constexpr (requires { g1.omegaMBWeight(); }) {

PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h

@@ -700,6 +700,8 @@ struct Pi0EtaToGammaGammaMC {
           }
           if (alphaMeson > alphaCut) {
             continue;
+          }
+
           float wpair = weight;
 
           if constexpr (requires { g1.omegaMBWeight(); }) {
@@ -813,8 +815,8 @@ struct Pi0EtaToGammaGammaMC {
               }
               o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, veeg, etamc, mcparticles, mccollisions, f1fd_k0s_to_pi0, weight);
             }
-          }    // end of dielectron loop
-        }      // end of pcm loop
+          } // end of dielectron loop
+        } // end of pcm loop
       } else { // PCM-EMC, PCM-PHOS.
         // TODO: implement proper functionality if we ever want to run this in Pb-Pb
         auto photons1_per_collision = photons1.sliceByCached(TDetectorTag1::perCollision(), collision.globalIndex(), cache);
@@ -861,8 +863,8 @@ struct Pi0EtaToGammaGammaMC {
           //   o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, etamc, mcparticles, mccollisions, f1fd_k0s_to_pi0, weight);
           // }
         } // end of pairing loop
-      }   // end of pairing in same event
-    }     // end of collision loop
+      } // end of pairing in same event
+    } // end of collision loop
   }
 
   template <int par_id, typename TBinnedData>