Ticket #214: exotic_remnant_1.patch

SHERPA/Initialization/Initialization_Handler.C

@@ -341 +341 @@
   okay = okay && InitializeThePDFs();
   if (!p_model->ModelInit(m_isrhandlers))
     THROW(critical_error,"Model cannot be initialized");
+  okay = okay && p_beamspectra->Init();
   p_model->InitializeInteractionModel();
   okay = okay && InitializeTheAnalyses();
   if (!CheckBeamISRConsistency()) return 0.;

BEAM/Main/Beam_Base.C

@@ -11 +11 @@
   m_energy(_energy), m_polarisation(_polarisation),
   m_x(1.), m_Q2(0.), m_weight(1.)
 {
-  double disc      =  1.-ATOOLS::sqr(m_beam.Mass()/m_energy);
+  Init();
+}
+
+bool Beam_Base::Init(int mode)
+{
+  double disc      =  mode?1.0:1.0-ATOOLS::sqr(m_beam.Mass()/m_energy);
   if (disc<0) {
     msg_Error()<<"Error in Beam_Base :"<<m_type<<std::endl
                        <<"   Mismatch of energy and mass of beam particle : "
@@ -19 +24 @@
                        <<"   Will lead to termination of program."<<std::endl;
     abort();
   }
-  m_lab    = ATOOLS::Vec4D(m_energy,0.,0.,_dir*m_energy*sqrt(disc));
-  m_vecout = ATOOLS::Vec4D(m_energy,0.,0.,_dir*m_energy*sqrt(disc));
+  m_lab    = ATOOLS::Vec4D(m_energy,0.,0.,m_dir*m_energy*sqrt(disc));
+  m_vecout = ATOOLS::Vec4D(m_energy,0.,0.,m_dir*m_energy*sqrt(disc));
+  return true;
 }
 
 Beam_Base::~Beam_Base() 

BEAM/Main/Beam_Spectra_Handler.C

@@ -46 +46 @@
   if (p_BeamBase) { delete [] p_BeamBase; p_BeamBase = NULL; }
 }
 
+bool Beam_Spectra_Handler::Init()
+{
+  bool init(p_BeamBase[0]->Init());
+  if (!p_BeamBase[1]->Init()) init=false;
+  return init;
+}
 
 bool Beam_Spectra_Handler::SpecifySpectra(Data_Reader * dataread)
 {

BEAM/Main/Beam_Base.H

@@ -51 +51 @@
 
     virtual ~Beam_Base();
 
+    virtual bool Init(int mode=0);
+
     virtual Beam_Base * Copy()                                     = 0;
     virtual bool        CalculateWeight(const double,const double) = 0;
 

BEAM/Main/Beam_Spectra_Handler.H

@@ -42 +42 @@
     Beam_Spectra_Handler(ATOOLS::Data_Reader *);
     ~Beam_Spectra_Handler();
     
+    bool   Init();
     void   Output();
     bool   CheckConsistency(ATOOLS::Flavour *,ATOOLS::Flavour *);
     bool   CheckConsistency(ATOOLS::Flavour *);

PDF/Remnant/Remnant_Base.C

@@ -64 +64 @@
   m_pzrem=(p_beam->OutMomentum()+
            p_partner->p_beam->OutMomentum())[3];
   if ((p_last[1]==NULL || p_last[0]==NULL) &&
-      (Type()==rtp::electron || p_partner->Type()==rtp::electron)) return true;
+      (Type()==rtp::electron || p_partner->Type()==rtp::electron ||
+       Type()==rtp::intact || p_partner->Type()==rtp::intact)) return true;
   for (size_t i=0;i<2;++i) {
     ATOOLS::Blob *cur=p_beamblob;
     if (i==1) cur=p_partner->p_beamblob;