Ticket #92: sc-crash.patch

SHERPA/Single_Events/Signal_Processes.C

@@ -11 +11 @@
 using namespace ATOOLS;
 
 Signal_Processes::Signal_Processes(Matrix_Element_Handler * mehandler) :
-  p_mehandler(mehandler)
+  p_mehandler(mehandler), p_amps(NULL)
 {
   m_name="Signal_Processes";
   m_type=eph::Perturbative;
@@ -23 +23 @@
 
 Signal_Processes::~Signal_Processes()
 {
+  if (p_amps) delete p_amps; p_amps=NULL;
 }
 
 Return_Value::code Signal_Processes::Treat(Blob_List * bloblist, double & weight)
@@ -104 +105 @@
     Particle_Vector outparticles = blob->GetOutParticles();
     Particle_Vector particles(inparticles.begin(),inparticles.end());
     particles.insert(particles.end(),outparticles.begin(),outparticles.end());
-    METOOLS::Amplitude_Tensor* amps = new METOOLS::Amplitude_Tensor(particles);
+    if (p_amps) delete p_amps;
+    p_amps = new METOOLS::Amplitude_Tensor(particles);
     
     AMEGIC::Single_Process* aproc = dynamic_cast<AMEGIC::Single_Process*>(proc);
     if (!aproc) {
       THROW(fatal_error, "Spin correlations can only be enabled when using "+
             std::string("Amegic as matrix element generator."));
     }
-    aproc->FillAmplitudes(amps);
-    blob->AddData("amps",new Blob_Data<METOOLS::Amplitude_Tensor*>(amps));
+    aproc->FillAmplitudes(p_amps);
+    blob->AddData("amps",new Blob_Data<METOOLS::Amplitude_Tensor*>(p_amps));
   }
 
   return success;

SHERPA/Single_Events/Signal_Processes.H

@@ -5 +5 @@
 #include "SHERPA/PerturbativePhysics/Matrix_Element_Handler.H"
 #include "PDF/Remnant/Remnant_Base.H"
 
+namespace METOOLS {
+  class Amplitude_Tensor;
+}
+
 namespace SHERPA {
 
   class Signal_Processes: public Event_Phase_Handler {
@@ -12 +16 @@
 
     Matrix_Element_Handler *p_mehandler;
     PDF::Remnant_Base      *p_remnants[2];
+    METOOLS::Amplitude_Tensor *p_amps;
     bool FillBlob(ATOOLS::Blob_List *const bl,ATOOLS::Blob *const b);
 
   public:

METOOLS/Main/Spin_Structure.C

@@ -248 +248 @@
 }
 
 namespace ATOOLS {
-  template <> Blob_Data<Amplitude_Tensor*>::~Blob_Data() {
-    if(m_data) delete m_data; m_data=NULL;
-  }
+  template <> Blob_Data<Amplitude_Tensor*>::~Blob_Data() {}
   template class Blob_Data<Amplitude_Tensor*>;
   template Amplitude_Tensor* &Blob_Data_Base::Get<Amplitude_Tensor*>();
 }