hepmc - Diff between revs 193 and 194

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 193 Rev 194
Line 35... Line 35...
35   std::string IO_Ascii_Key()             const { return m_io_ascii_start; } 35   std::string IO_Ascii_Key()             const { return m_io_ascii_start; }
36   std::string IO_Ascii_End()             const { return m_io_ascii_end; } 36   std::string IO_Ascii_End()             const { return m_io_ascii_end; }
37   // IO_ExtendedAscii is deprecated, but we want to be able to read these files 37   // IO_ExtendedAscii is deprecated, but we want to be able to read these files
38   std::string IO_ExtendedAscii_Key()     const { return m_io_extendedascii_start; } 38   std::string IO_ExtendedAscii_Key()     const { return m_io_extendedascii_start; }
39   std::string IO_ExtendedAscii_End()     const { return m_io_extendedascii_end; } 39   std::string IO_ExtendedAscii_End()     const { return m_io_extendedascii_end; }
40   -  
-   40   /// get IO type
-   41   int io_type() const { return m_io_type; }
-   42
41   // write keys 43   // write keys
42   void write_IO_GenEvent_Key( std::ostream& ); 44   void write_IO_GenEvent_Key( std::ostream& );
43   void write_IO_GenEvent_End( std::ostream& ); 45   void write_IO_GenEvent_End( std::ostream& );
44   // write keys for deprecated IO methods 46   // write keys for deprecated IO methods
45   void write_IO_Ascii_Key( std::ostream& ); 47   void write_IO_Ascii_Key( std::ostream& );
Line 62... Line 64...
62 64
63   bool read_io_ascii( std::istream* is, GenEvent* evt ); 65   bool read_io_ascii( std::istream* is, GenEvent* evt );
64 66
65   bool read_io_extendedascii( std::istream* is, GenEvent* evt ); 67   bool read_io_extendedascii( std::istream* is, GenEvent* evt );
66 68
67   bool read_io_genevent_event( std::istream* is, GenEvent* evt ); -  
-   69   bool read_io_genevent( std::istream* is, GenEvent* evt );
68 70
69   /// ParticleDataTable is deprecated. 71   /// ParticleDataTable is deprecated.
70   /// We include this method for reading old files which may have ParticleData information. 72   /// We include this method for reading old files which may have ParticleData information.
71   ParticleData* read_particle_data( std::istream*, ParticleDataTable* ); -  
-   73   bool read_io_particle_data_table( std::istream*, ParticleDataTable* );
72   74  
73 protected: 75 protected:
74   // methods used by the read_io* methods 76   // methods used by the read_io* methods
75   HeavyIon*    read_heavy_ion( std::istream* ); 77   HeavyIon*    read_heavy_ion( std::istream* );
76   PdfInfo*     read_pdf_info( std::istream* ); 78   PdfInfo*     read_pdf_info( std::istream* );
77   GenParticle* read_particle( std::istream*, TempParticleMap&  ); 79   GenParticle* read_particle( std::istream*, TempParticleMap&  );
78   GenVertex*   read_vertex( std::istream*, TempParticleMap&  ); 80   GenVertex*   read_vertex( std::istream*, TempParticleMap&  );
-   81   /// ParticleDataTable is deprecated.
-   82   /// We include this method for reading old files which may have ParticleData information.
-   83   ParticleData* read_particle_data( std::istream*, ParticleDataTable* );
79 84
80 private: 85 private:
81   std::string m_io_genevent_start; 86   std::string m_io_genevent_start;
82   std::string m_io_ascii_start; 87   std::string m_io_ascii_start;
83   std::string m_io_extendedascii_start; 88   std::string m_io_extendedascii_start;