Changeset 574 in svn

Timestamp:

Nov 16, 2011, 3:46:45 PM (13 years ago)

Author:

cp3-support

Message:

upgrade HepMC to version 2.06.05

Location:

trunk

Files:

• Utilities/HepMC/VERSION (modified) (1 diff)
• Utilities/HepMC/interface/CommonIO.h (deleted)
• Utilities/HepMC/interface/IO_Ascii.h (deleted)
• Utilities/HepMC/interface/IO_PDG_ParticleDataTable.h (deleted)
• Utilities/HepMC/interface/ParticleData.h (deleted)
• Utilities/HepMC/interface/ParticleDataTable.h (deleted)
• Utilities/HepMC/interface/StreamInfo.h (added)
• Utilities/HepMC/src/CommonIO.cc (deleted)
• Utilities/HepMC/src/IO_Ascii.cc (deleted)
• Utilities/HepMC/src/IO_PDG_ParticleDataTable.cc (deleted)
• Utilities/HepMC/src/ParticleData.cc (deleted)
• Utilities/HepMC/src/Units.cc (deleted)
• interface/HepMCConverter.h (modified) (1 diff)
• src/HepMCConverter.cc (modified) (3 diffs)

trunk/Utilities/HepMC/VERSION

@@ -1 @@
-2.04.01
+2.06.05

trunk/interface/HepMCConverter.h

@@ -41 +41 @@
 #include "GenVertex.h"
 #include "GenEvent.h"
-#include "IO_Ascii.h"
+#include "IO_AsciiParticles.h"
 
 using namespace std;

trunk/src/HepMCConverter.cc

@@ -44 +44 @@
 #include "GenParticle.h"
 #include "GenVertex.h"
-#include "IO_Ascii.h"
+#include "IO_AsciiParticles.h"
 #include "IO_GenEvent.h"
 
@@ -136 +136 @@
        if (index_to_particle[j]->end_vertex())
         {
-          //find # of 1. daughter
+          // make sure first and last daughter are indeed the first and last
           int first_daughter = find_in_map( particle_to_index,*(index_to_particle[j]->end_vertex()->particles_begin(HepMC::children)));
-          //cout <<"first_daughter "<< first_daughter <<  "num_daughters " << num_daughters << endl; 
+          int last_daughter = 0;
+
           HepMC::GenVertex::particle_iterator ic;
-          int last_daughter=0;
-          //find # of last daughter
-          for (ic = index_to_particle[j]->end_vertex()->particles_begin(HepMC::children);ic != index_to_particle[j]->end_vertex()->particles_end(HepMC::children); ++ic) 
-            last_daughter= find_in_map( particle_to_index,*ic);       
-          
+          for (ic = index_to_particle[j]->end_vertex()->particles_begin(HepMC::children);ic != index_to_particle[j]->end_vertex()->particles_end(HepMC::children); ++ic) {
+            int current_daughter = find_in_map( particle_to_index,*ic) ; 
+            if (current_daughter < first_daughter)
+              first_daughter = current_daughter;
+            if (current_daughter > last_daughter)
+              last_daughter = current_daughter;
+          }
           if (first_daughter== 0) last_daughter = 0;
           da1=first_daughter;
           da2=last_daughter;
+
         } 
       else 
@@ -194 +198 @@
       element->PID = pid;
       element->Status = status;
-      element->M1 = mo1;
-      element->M2 = mo2;
-      element->D1 = da1;
-      element->D2 = da2;
+      element->M1 = mo1 - 1; // added -1 as the numbering in the tree starts from 0
+      element->M2 = mo2 - 1;
+      element->D1 = da1 - 1;
+      element->D2 = da2 - 1;
 
       element->E = index_to_particle[n]->momentum().e();