added some missing parts in RadM1Dynamics

Examples/benchmark/epem/startparams.dat

-J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag	1	1
-J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag	0.5773502691896258	0.5773502691896258
-J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag	0.5773502691896258	0.5773502691896258
-J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonMag	0.5773502691896258	0.5773502691896258
-J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonPhi	0	0.3
-J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonPhi	0	0.3
-J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonPhi	0	0.3
-J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonPhi	0	0.3
-L1S1_eta(2225)Toomega1_omega2Mag	1	1
-L0S2_f2(1910)Toomega1_omega2Mag	0.5	0.5
-L2S0_f2(1910)Toomega1_omega2Mag	0.3	0.5
-L2S2_f2(1910)Toomega1_omega2Mag	0.5	0.5
-L4S2_f2(1910)Toomega1_omega2Mag	0.5	0.5
-L1S0_omega1Topion1+_pion1-_pion10Mag	1	1
-L1S0_omega2Topion2+_pion2-_pion20Mag	1	1
-L1S1_eta(2225)Toomega1_omega2Phi	0	0.3
-L0S2_f2(1910)Toomega1_omega2Phi	0	0.3
-L2S0_f2(1910)Toomega1_omega2Phi	0	0.3
-L2S2_f2(1910)Toomega1_omega2Phi	0	0.3
-L4S2_f2(1910)Toomega1_omega2Phi	0	0.3
-L1S0_omega1Topion1+_pion1-_pion10Phi	0	0.3
-L1S0_omega2Topion2+_pion2-_pion20Phi	0	0.3
-eta(2225)Mass	2.15	0.03
-f2(1910)Mass	1.97	0.03
-eta(2225)Width	0.14	0.03
-f2(1910)Width	0.16	0.034
-channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScaling	1	0.01
+J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag	1	0.5	0	16
+J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonPhi	0	0.2
+L1S1_eta(2225)Toomega1_omega2Mag	1	0.5	0	16
+L1S1_eta(2225)Toomega1_omega2Phi	0	0.2
+eta(2225)Mass	2.15	0.03	2.08	2.38
+eta(2225)Width	0.14	0.03	0	0.3
+L1S0_omega1Topion1+_pion1-_pion10Mag	1	0.5	0	16
+L1S0_omega1Topion1+_pion1-_pion10Phi	0	0.2
+L1S0_omega2Topion2+_pion2-_pion20Mag	1	0.5	0	16
+L1S0_omega2Topion2+_pion2-_pion20Phi	0	0.2
+J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonMag	0.57735	0.288675	0	9.2376
+J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonPhi	0	0.2
+J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag	0.57735	0.288675	0	9.2376
+J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonPhi	0	0.2
+J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag	0.57735	0.288675	0	9.2376
+J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonPhi	0	0.2
+L2S0_f2(1910)Toomega1_omega2Mag	0.5	0.25	0	8
+L2S0_f2(1910)Toomega1_omega2Phi	0	0.2
+L0S2_f2(1910)Toomega1_omega2Mag	0.5	0.25	0	8
+L0S2_f2(1910)Toomega1_omega2Phi	0	0.2
+L2S2_f2(1910)Toomega1_omega2Mag	0.5	0.25	0	8
+L2S2_f2(1910)Toomega1_omega2Phi	0	0.2
+L4S2_f2(1910)Toomega1_omega2Mag	0.5	0.25	0	8
+L4S2_f2(1910)Toomega1_omega2Phi	0	0.2
+f2(1910)Mass	1.97	0.03	1.791	2.091
+f2(1910)Width	0.16	0.034	0	0.34
+channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScaling	1	0.01	0	20

PwaUtils/RadM1Dynamics.cc

@@ -42,6 +42,8 @@ RadM1Dynamics::RadM1Dynamics(std::string& name, std::vector<Particle*>& fsPartic
   ,_fsParticlesDaughter2(fsParticlesDaughter2)
   ,_dynMassKeyDaughter1(_dynKey+FunctionUtils::particleListName(fsParticlesDaughter1))
   ,_dynMassKeyDaughter2(_dynKey+FunctionUtils::particleListName(fsParticlesDaughter2))
+  ,_dynEgammaCMmotherKey(_dynKey+FunctionUtils::particleListName(fsParticlesDaughter1)+"Gamma")
+  ,_isP1Gamma(true)
 {
   Info << "RadM1Dynamics for " << _name <<endmsg;
   _isLdependent=false;
@@ -60,7 +62,7 @@ complex<double> RadM1Dynamics::eval(EvtData* theData, AbsXdecAmp* grandmaAmp, Sp
   // Which Daughter particle is the radiative photon?
   double massB = 1.; // DUMMY VALUE - needs to be mass of non-gamma dacay particle, e.g. eta_c
   double currentMassB = 1.; // DUMMY VALUE - needs to be current mass (fit parameter!) of non-gamma decay particle, e.g. eta_c
-  double Egamma = 1.; // how to access Egamma?
+  double Egamma = theData->DoubleString.at(_dynEgammaCMmotherKey); // how to access Egamma?
 
   complex<double> result(1.,0.);
   result=RadMultipoleFormFactor::PureM1(theData->DoubleString.at(_dynKey), massB, currentMassB, Egamma);
@@ -99,4 +101,25 @@ void RadM1Dynamics::fillMasses(EvtData* theData){
     mass4VecD2+=theData->FourVecsString[(*it)->name()];
   }
   theData->DoubleString[_dynMassKeyDaughter2]=mass4VecD2.Mass();
+
+  Vector4<double> mother4Vec(0.,0.,0.,0.);
+  mother4Vec=mass4VecD1+mass4VecD2;
+
+  Vector4<double> photonCMmother4Vec(0.,0.,0.,0.);
+  if( mass4VecD1.Mass() < 1.e-6){  //this is the photon work around
+    photonCMmother4Vec=mass4VecD1;
+  }    
+  else if ( mass4VecD2.Mass() < 1.e-6){  //this is the photon work around 
+    _dynEgammaCMmotherKey=_dynMassKeyDaughter2+"Gamma";
+    _isP1Gamma=false;
+    photonCMmother4Vec=mass4VecD2;
+  }
+  else{
+    Alert << "neither particle 1 with mass " << mass4VecD1.Mass() 
+	  << "\tnor particle 2 with mass " << mass4VecD2.Mass()
+	  << "\tcan be assigned to the photon!!!" << endmsg;
+    exit(1); 
+  }
+  photonCMmother4Vec.Boost(mother4Vec);
+  theData->DoubleString[_dynEgammaCMmotherKey]=photonCMmother4Vec.E();
 }

PwaUtils/RadM1Dynamics.hh

@@ -60,6 +60,8 @@ protected:
   std::vector<Particle*> _fsParticlesDaughter2;
   std::string _dynMassKeyDaughter1;
   std::string _dynMassKeyDaughter2;
+  std::string _dynEgammaCMmotherKey;
+  bool _isP1Gamma;
 
 private: