hepmc - Diff between revs 103 and 105

Subversion Repositories:

Rev 103 - Rev 128 - Go to most recent revision - Details - Blame - Last modification - View Log -

                         const WeightContainer& weights,
                         const std::vector<long int>& random_states ) :
         m_signal_process_id(signal_process_id), m_event_number(event_number),
         m_mpi(-1),
         m_event_scale(-1), m_alphaQCD(-1), m_alphaQED(-1),
-        m_signal_process_vertex(signal_vertex), m_weights(weights),
+        m_signal_process_vertex(signal_vertex),
+        m_beam_particle_1(0),m_beam_particle_2(0),
+        m_weights(weights),
         m_random_states(random_states),
         m_heavy_ion(0),
         m_pdf_info(0)
+    {
         /// This constructor only allows null pointers to HeavyIon and PdfInfo
                         const HeavyIon& ion,
                         const PdfInfo& pdf ) :
         m_signal_process_id(signal_process_id), m_event_number(event_number),
         m_mpi(-1),
         m_event_scale(-1), m_alphaQCD(-1), m_alphaQED(-1),
-        m_signal_process_vertex(signal_vertex), m_weights(weights),
+        m_signal_process_vertex(signal_vertex),
+        m_beam_particle_1(0),m_beam_particle_2(0),
+        m_weights(weights),
         m_random_states(random_states),
         m_heavy_ion( new HeavyIon(ion) ),
         m_pdf_info( new PdfInfo(pdf) )
+    {
         /// GenEvent makes its own copy of HeavyIon and PdfInfo
         set_event_scale( inevent.event_scale() );
         set_alphaQCD( inevent.alphaQCD() );
         set_alphaQED( inevent.alphaQED() );
         set_random_states( inevent.random_states() );
         weights() = inevent.weights();
+        set_beam_particles( inevent.beam_particles() );
         //
         // 5. copy these only if they are not null
         if( inevent.heavy_ion() ) set_heavy_ion( *inevent.heavy_ion() );
         if( inevent.pdf_info() ) set_pdf_info( *inevent.pdf_info() );
         return *this;
              << GenEvent::counter() << " events, "
              << GenVertex::counter() << " vertices, "
              << GenParticle::counter() << " particles.\n";
         ostr << " Entries this event: " << vertices_size() << " vertices, "
              << particles_size() << " particles.\n";
+        if( m_beam_particle_1 && m_beam_particle_2 ) {
+          ostr << " Beam Particle barcodes: " << beam_particles().first->barcode() << " "
+               << beam_particles().second->barcode() << " \n";
+        } else {
+          ostr << " Beam Particles are not defined.\n";
+        }
         // Random State
         ostr << " RndmState(" << m_random_states.size() << ")=";
         for ( std::vector<long int>::const_iterator rs
                   = m_random_states.begin();
               rs != m_random_states.end(); rs++ ) { ostr << *rs << " "; }
         ///
         delete_all_vertices();
         delete m_heavy_ion;
         delete m_pdf_info;
         m_signal_process_id = 0;
+        m_beam_particle_1 = 0;
+        m_beam_particle_2 = 0;
         m_event_number = 0;
         m_event_scale = -1;
         m_alphaQCD = -1;
         m_alphaQED = -1;
         m_weights = std::vector<double>();
                       << std::endl;
+        }
         m_vertex_barcodes[suggested_barcode] = v;
         v->set_barcode_( suggested_barcode );
         return insert_success;
+    }
+    /// test to see if we have two valid beam particles
+    bool  GenEvent::valid_beam_particles() const {
+        bool have1 = false;
+        bool have2 = false;
+        // first check that both are defined
+        if(m_beam_particle_1 && m_beam_particle_2) {
+            // now look for a match with the particle "list"
+            for ( particle_const_iterator p = particles_begin();
+                  p != particles_end(); p++ ) {
+                if( m_beam_particle_1 == *p ) have1 = true;
+                if( m_beam_particle_2 == *p ) have2 = true;
+            }
+        }
+        if( have1 && have2 ) return true;
+        return false;
+    }
+    /// construct the beam particle information using pointers to GenParticle
+    /// returns false if either GenParticle* is null
+    bool  GenEvent::set_beam_particles(GenParticle* bp1, GenParticle* bp2) {
+        m_beam_particle_1 = bp1;
+        m_beam_particle_2 = bp2;
+        if( m_beam_particle_1 && m_beam_particle_2 ) return true;
+        return false;
+    }
+    /// construct the beam particle information using a std::pair of pointers to GenParticle
+    /// returns false if either GenParticle* is null
+    bool  GenEvent::set_beam_particles(std::pair<GenParticle*, GenParticle*> const & bp) {
+        return set_beam_particles(bp.first,bp.second);
+    }
     /////////////
     // Static  //
     /////////////