hepmc - Diff between revs 390 and 432

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 390 Rev 432
Line 21... Line 21...
21 namespace HepMC { 21 namespace HepMC {
22 22
23 class GenEvent; 23 class GenEvent;
24 class GenVertex; 24 class GenVertex;
25 class GenParticle; 25 class GenParticle;
26 class ParticleData; -  
27 class HeavyIon; 26 class HeavyIon;
28 class PdfInfo; 27 class PdfInfo;
29 28
30 //! IO_GenEvent also deals with HeavyIon and PdfInfo 29 //! IO_GenEvent also deals with HeavyIon and PdfInfo
31 30
Line 74... Line 73...
74 73
75     /// write this event 74     /// write this event
76     void          write_event( const GenEvent* evt ); 75     void          write_event( const GenEvent* evt );
77     /// get the next event 76     /// get the next event
78     bool          fill_next_event( GenEvent* evt ); 77     bool          fill_next_event( GenEvent* evt );
79     /// write_particle_data_table is required by IO_BaseClass, but not used here -  
80     void          write_particle_data_table(const ParticleDataTable*); -  
81     /// fill_particle_data_table is required by IO_BaseClass, but not used here -  
82     bool          fill_particle_data_table( ParticleDataTable* ); -  
83     /// insert a comment directly into the output file --- normally you 78     /// insert a comment directly into the output file --- normally you
84     ///  only want to do this at the beginning or end of the file. All 79     ///  only want to do this at the beginning or end of the file. All
85     ///  comments are preceded with "HepMC::IO_GenEvent-COMMENT\n" 80     ///  comments are preceded with "HepMC::IO_GenEvent-COMMENT\n"
86     void          write_comment( const std::string comment ); 81     void          write_comment( const std::string comment );
87 82
Line 100... Line 95...
100     /// set output precision 95     /// set output precision
101     /// The default precision is 16. 96     /// The default precision is 16.
102     void precision( int ); 97     void precision( int );
103         98        
104     /// integer (enum) associated with read error 99     /// integer (enum) associated with read error
105     const int           error_type()    const; -  
-   100     int           error_type()    const;
106     /// the read error message string 101     /// the read error message string
107     const std::string & error_message() const; 102     const std::string & error_message() const;
108 -  
109 protected: // for internal use only -  
110 -  
111     /// read particle data table information -  
112     /// ParticleDataTable is deprecated. -  
113     /// We include this method for reading old files which may have ParticleData information. -  
114     ParticleData* read_particle_data( std::istream*, ParticleDataTable* ); -  
115     bool          read_io_particle_data_table( std::istream*, ParticleDataTable* ); -  
116 103
117 private: // use of copy constructor is not allowed 104 private: // use of copy constructor is not allowed
118     IO_GenEvent( const IO_GenEvent& ) : IO_BaseClass() {} 105     IO_GenEvent( const IO_GenEvent& ) : IO_BaseClass() {}
119 106
120 private: // data members 107 private: // data members
Line 149... Line 136...
149     } else { 136     } else {
150         m_ostr->clear(); 137         m_ostr->clear();
151     } 138     }
152 } 139 }
153 140
154 inline const int IO_GenEvent::error_type() const { -  
-   141 inline int IO_GenEvent::error_type() const {
155     return m_error_type; 142     return m_error_type;
156 } 143 }
157 144
158 inline const std::string & IO_GenEvent::error_message() const { 145 inline const std::string & IO_GenEvent::error_message() const {
159     return m_error_message; 146     return m_error_message;
160 } 147 }
161 -  
162 // these are required by IO_BaseClass, but not used here -  
163 inline void IO_GenEvent::write_particle_data_table(const ParticleDataTable*) {;} -  
164 inline bool IO_GenEvent::fill_particle_data_table( ParticleDataTable* ) -  
165 { return false;} -  
166 148
167 } // HepMC 149 } // HepMC
168 150
169 #endif  // HEPMC_IO_GENEVENT_H 151 #endif  // HEPMC_IO_GENEVENT_H
170 //-------------------------------------------------------------------------- 152 //--------------------------------------------------------------------------