Merge branch '21.6' into '21.6'

Fixining conflicts in UserPhotonFlux from Pythia8.303

See merge request atlas/athena!36367

Generators/Pythia8_i/src/Pythia8Custom/UserPhotonFlux.cxx

@@ -29,11 +29,11 @@
     }
     else if(m_process ==2 || m_process ==3) {    
       ATH_MSG_INFO( "InitializePythiaInfo " << name() << " using nuclear photon flux with Z = " << m_flux_Z << ", bmin = " << m_flux_min_b);
-      Nucleus2gammaPtr photonFlux = PNEW(Nucleus2gamma,-11);
+      Nucleus2gammaPtr photonFlux = PNEW(Nucleus2gamma2,-11);
       photonFlux->setZ(m_flux_Z);
       photonFlux->setMinB(m_flux_min_b);
       photonFlux->setMinX(m_flux_min_x);
-      Nucleus2gammaPtr photonFlux2 = nullptr; PNEW(Nucleus2gamma,-11);
+      Nucleus2gammaPtr photonFlux2 = nullptr; PNEW(Nucleus2gamma2,-11);
       if(m_process==3) photonFlux2=photonFlux;
       pythia.setPhotonFluxPtr(photonFlux, photonFlux2);
       return StatusCode::SUCCESS;

Generators/Pythia8_i/src/Pythia8Custom/UserPhotonFlux.h

@@ -28,13 +28,13 @@ public:
   }
 };
 
-class Nucleus2gamma : public PDF {
+class Nucleus2gamma2 : public PDF {
 
 public:
 
   // Constructor.
   //defaults for m_Z m_min_b=2*nuclear radius are for Pb208 (Z=82, R=6.62fm)
-  Nucleus2gamma(int idBeamIn) : PDF(idBeamIn),
+  Nucleus2gamma2(int idBeamIn) : PDF(idBeamIn),
 				m_Z(82.),
 				m_min_b(13.24),
 				m_min_x(-1)
@@ -109,15 +109,15 @@ class UserPhotonFlux: public AthAlgTool, virtual public IPythia8Custom {
 #ifdef PYTHIA_VERSION_INTEGER
   #if PYTHIA_VERSION_INTEGER > 8300
     typedef shared_ptr<PDF> PDFPtr;
-    typedef shared_ptr<Nucleus2gamma> Nucleus2gammaPtr;
+    typedef shared_ptr<Nucleus2gamma2> Nucleus2gammaPtr;
     #define PNEW(X, Y) make_shared<X>(Y);
   #else
-    typedef Nucleus2gamma* Nucleus2gammaPtr;
+    typedef Nucleus2gamma2* Nucleus2gammaPtr;
     typedef PDF* PDFPtr;
     #define PNEW(X, Y) new X(Y);
   #endif
 #else
-  typedef Nucleus2gamma* Nucleus2gammaPtr;
+  typedef Nucleus2gamma2* Nucleus2gammaPtr;
   typedef PDF* PDFPtr;
   #define PNEW(X, Y) new X(Y);
 #endif