Changeset 367 in svn for trunk

Timestamp:

May 10, 2009, 8:08:45 PM (15 years ago)

Author:

Xavier Rouby

Message:

bug fix if no mother written in the input data. small code-cleaning

File:

• trunk/src/HepMCConverter.cc (modified) (4 diffs)

trunk/src/HepMCConverter.cc

@@ -27 +27 @@
 **                      Copyright (C) 2008-2009,                      **
 **                        All rights reserved.                        **  
-  //
 **                                                                    **
 ***********************************************************************/
@@ -115 +114 @@
       if ( index_to_particle[j]->production_vertex() ) 
         {
-            //HepLorentzVector p = index_to_particle[j]->production_vertex()->position();
-      
           int num_mothers = index_to_particle[j]->production_vertex()->particles_in_size();
-          int first_mother = find_in_map( particle_to_index,*(index_to_particle[j]->production_vertex()->particles_in_const_begin()));
-          int last_mother = first_mother + num_mothers - 1;
-          if ( first_mother == 0 ) last_mother = 0;
-          mo1=first_mother;
-          mo2=last_mother;
+          if (num_mothers ==0) { 
+            mo1 = 0; 
+            mo2 = 0; 
+          }
+          else {
+            int first_mother = find_in_map( particle_to_index,*(index_to_particle[j]->production_vertex()->particles_in_const_begin()));
+            int last_mother = first_mother + num_mothers - 1;
+            if ( first_mother == 0 ) last_mother = 0;
+            mo1=first_mother;
+            mo2=last_mother;
+          } // if num_mothers !=0
         } 
-      else 
+      else // no data on production_vertex
         {
           mo1 =0;
@@ -173 +176 @@
 //---------------------------------------------------------------------------
 
-void HepMCConverter::AnalyseParticles(ExRootTreeBranch *branch,HepMC::GenEvent& evt)
+void HepMCConverter::AnalyseParticles(ExRootTreeBranch *branch, const HepMC::GenEvent& evt)
 {
   TRootC::GenParticle *element;
@@ -203 +206 @@
       float PT = sqrt(pow(element->Px,2)+pow(element->Py,2));
       element->PT = PT;
+
       momentum.SetPxPyPzE(element->Px, element->Py, element->Pz, element->E);
       signPz = (element->Pz >= 0.0) ? 1.0 : -1.0;
-      element->Eta = element->PT == 0.0 ? signPz*999.9 : momentum.Eta();
+      //element->Eta = element->PT == 0.0 ? signPz*999.9 : momentum.Eta(); to avoid a warning from ROOT, replace the "==0" by "< 1e-6"
+      element->Eta = element->PT < 1e-6 ? signPz*999.9 : momentum.Eta();
       element->Phi = index_to_particle[n]->momentum().phi();