Ticket #36: sherpa-weight.1.1.3.patch

SHERPA/Tools/Output_HepMC2.C

@@ -7 +7 @@
 
 void Output_HepMC2::Output(Blob_List* blobs, const double weight) 
 {
-  m_hepmc2.Sherpa2HepMC(blobs);
+  m_hepmc2.Sherpa2HepMC(blobs, weight);
   m_hepmc2.GenEvent()->print(m_outstream);
 }

SHERPA/Tools/HepMC2_Interface.C

@@ -29 +29 @@
 }
 
 bool HepMC2_Interface::Sherpa2HepMC(ATOOLS::Blob_List *const blobs,
-                                    HepMC::GenEvent& event)
+                                    HepMC::GenEvent& event, double weight)
 {
 #ifdef USING__HEPMC2__UNITS
   event.use_units(HepMC::Units::GEV,
@@ -60 +60 @@
           HepMC::PdfInfo pdfinfo(fl1, fl2, x1, x2, q, p1, p2);
           event.set_pdf_info(pdfinfo);
         }
-        Blob_Data_Base *info((**blit)["ME_Weight"]);
-        double weight=1.0;
-        if (info!=NULL) weight=info->Get<double>();
         std::vector<double> weights; weights.push_back(weight);
         event.weights()=weights;
       }
@@ -79 +76 @@
   return true;
 }
 
-bool HepMC2_Interface::Sherpa2HepMC(ATOOLS::Blob_List *const blobs)
+bool HepMC2_Interface::Sherpa2HepMC(ATOOLS::Blob_List *const blobs,
+                                    double weight)
 {
   if (blobs->empty()) {
     msg_Error()<<"Error in "<<METHOD<<"."<<std::endl
@@ -89 +87 @@
   }
   if (p_event!=NULL) delete p_event;
   p_event = new HepMC::GenEvent();
-  return Sherpa2HepMC(blobs, *p_event);
+  return Sherpa2HepMC(blobs, *p_event, weight);
 }
 
 bool HepMC2_Interface::Sherpa2HepMC(ATOOLS::Blob * blob, HepMC::GenVertex *& vertex)

SHERPA/Tools/HepMC2_Interface.H

@@ -39 +39 @@
     ~HepMC2_Interface();
 
     // member functions
-    bool Sherpa2HepMC(ATOOLS::Blob_List *const blobs, HepMC::GenEvent& event);
-    bool Sherpa2HepMC(ATOOLS::Blob_List *const blobs);
+    bool Sherpa2HepMC(ATOOLS::Blob_List *const blobs, HepMC::GenEvent& event,
+                      double weight=1.0);
+    bool Sherpa2HepMC(ATOOLS::Blob_List *const blobs, double weight=1.0);
     bool Sherpa2HepMC(ATOOLS::Blob *,HepMC::GenVertex *&);
     bool Sherpa2HepMC(ATOOLS::Particle *,HepMC::GenParticle *&);
 

SHERPA/Tools/Output_HepMC2_Ascii.C

@@ -24 +24 @@
 
 void Output_HepMC2_Ascii::Output(Blob_List* blobs, const double weight) 
 {
-  m_hepmc2.Sherpa2HepMC(blobs);
+  m_hepmc2.Sherpa2HepMC(blobs, weight);
   p_ioascii->write_event(m_hepmc2.GenEvent());
 }
 

SHERPA/Tools/Input_Output_Handler.C

@@ -163 +163 @@
   }
 }
 
-bool Input_Output_Handler::OutputToFormat(ATOOLS::Blob_List *const blobs,
-                                          const double weight) 
+bool Input_Output_Handler::OutputToFormat(ATOOLS::Blob_List *const blobs)
 {
   ResetInterfaces();
+  
+  double weight=1.0;
+  for (Blob_List::const_iterator blit=blobs->begin();blit!=blobs->end();++blit){
+    if ((*blit)->Type()==btp::Signal_Process) {
+      Blob_Data_Base *info((**blit)["ME_Weight"]);
+      if (info!=NULL) weight*=info->Get<double>();
+      info=(**blit)["Process_Weight"];
+      if (info!=NULL) weight/=info->Get<double>();
+    }
+  }
 
   for (map<string,Output_Base *>::iterator oit=m_outmap.begin();
        oit!=m_outmap.end();oit++) {

SHERPA/Tools/Input_Output_Handler.H

@@ -40 +40 @@
     // destructor
     ~Input_Output_Handler();
 
-    bool OutputToFormat(ATOOLS::Blob_List * const,const double=1.);
+    bool OutputToFormat(ATOOLS::Blob_List * const);
     bool InputFromFormat(ATOOLS::Blob_List * const) { return false; }
 
     void PrintEvent(ATOOLS::Blob_List *const);

SHERPA/Tools/Output_HepMC2_Genevent.C

@@ -31 +31 @@
 void Output_HepMC2_Genevent::Output(Blob_List* blobs, const double weight) 
 {
 #ifdef USING__HEPMC2__IOGENEVENT
-  m_hepmc2.Sherpa2HepMC(blobs);
+  m_hepmc2.Sherpa2HepMC(blobs, weight);
   p_iogenevent->write_event(m_hepmc2.GenEvent());
 #endif
 }