hepmc - Diff between revs 441 and 442

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 441 Rev 442
Line 686... Line 686...
686     // declare variables to be read in to, and read everything except flow 686     // declare variables to be read in to, and read everything except flow
687     double px = 0., py = 0., pz = 0., e = 0., m = 0., theta = 0., phi = 0.; 687     double px = 0., py = 0., pz = 0., e = 0., m = 0., theta = 0., phi = 0.;
688     int bar_code = 0, id = 0, status = 0, end_vtx_code = 0, flow_size = 0; 688     int bar_code = 0, id = 0, status = 0, end_vtx_code = 0, flow_size = 0;
689     // check that the input stream is still OK after reading item 689     // check that the input stream is still OK after reading item
690     iline >> bar_code ; 690     iline >> bar_code ;
691     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   691     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
692     iline >> id ; 692     iline >> id ;
693     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   693     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
694     iline >> px ; 694     iline >> px ;
695     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   695     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
696     iline >> py ; 696     iline >> py ;
697     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   697     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
698     iline >> pz ; 698     iline >> pz ;
699     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   699     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
700     iline >> e ; 700     iline >> e ;
701     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   701     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
702     if( info.io_type() != ascii ) { 702     if( info.io_type() != ascii ) {
703         iline >> m ; 703         iline >> m ;
704         if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   704         if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
705     } 705     }
706     iline >> status ; 706     iline >> status ;
707     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   707     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
708     iline >> theta ; 708     iline >> theta ;
709     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   709     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
710     iline >> phi ; 710     iline >> phi ;
711     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   711     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
712     iline >> end_vtx_code ; 712     iline >> end_vtx_code ;
713     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   713     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
714     iline >> flow_size; 714     iline >> flow_size;
715     if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   715     if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
716     // 716     //
717     // read flow patterns if any exist 717     // read flow patterns if any exist
718     Flow flow; 718     Flow flow;
719     int code_index, code; 719     int code_index, code;
720     for ( int i = 1; i <= flow_size; ++i ) { 720     for ( int i = 1; i <= flow_size; ++i ) {
721         iline >> code_index >> code; 721         iline >> code_index >> code;
722         if(!iline) {  delete p; detail::find_event_end( is ); } -  
-   722         if(!iline) {  delete p; particle_to_end_vertex.clear_temp_map(); detail::find_event_end( is ); }
723         flow.set_icode( code_index,code); 723         flow.set_icode( code_index,code);
724     } 724     }
725     p->set_momentum( FourVector(px,py,pz,e) ); 725     p->set_momentum( FourVector(px,py,pz,e) );
726     p->set_pdg_id( id ); 726     p->set_pdg_id( id );
727     p->set_status( status ); 727     p->set_status( status );