Changeset 5112


Ignore:
Timestamp:
09/17/04 18:41:21 (20 years ago)
Author:
moralejo
Message:
 Commited changes to adapt header files to current c++ syntaxis.
Location:
trunk/MagicSoft/Simulation/Detector/include-CORSIKA
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Simulation/Detector/include-CORSIKA/COREventHeader.hxx

    r5103 r5112  
    3232#include <stdlib.h>
    3333#include <math.h>
    34 #include <string>
    3534// @endcode
    3635
    … …  
    124123  // reads EventHeader from binary input stream
    125124  Int_t read ( ifstream &is ) {
    126     is.read ( (char *)this, sizeof( float ) * 273 );
     125    is.read ( (char *)&(this->EVTH[0]), sizeof( float ) * 273 );
    127126    return is.gcount();
    128127  }
    … …  
    130129  // writes EventHeader to binary output stream
    131130  Int_t write ( ofstream &os ) {
    132     os.write ( (char *)this, sizeof( float ) * 273 );
     131    os.write ( (char *)&(this->EVTH[0]), sizeof( float ) * 273 );
    133132    return 0;
    134133  }

  • trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORParticle.hxx

    r3046 r5112  
    2727#include "TObject.h"
    2828
    29 #include <iostream.h>
    30 #include <iomanip.h>
    31 #include <fstream.h>
     29#include <iostream>
     30#include <iomanip>
     31#include <fstream>
    3232#include <stdlib.h>
    3333#include <math.h>
    3434// @endcode
     35
     36using namespace std;
    3537
    3638// @subsection Class {\em CORParticle}: Definition
    … …  
    6971  // reads photon from binary input stream
    7072  Int_t read ( ifstream &is ) {
    71     int n;
    72     is.read ( (char *)this, 7 * sizeof( Float_t ) );   //
     73    is.read ( (char *)(&this->w), 7 * sizeof( Float_t ) );   //
    7374    return is.gcount();
    7475  }
    … …  
    7677  // writes photon to binary output stream
    7778  Int_t write ( ofstream &os ) {
    78     os.write ( (char *)this, 7 * sizeof( Float_t ) );
     79    os.write ( (char *)(&this->w), 7 * sizeof( Float_t ) );
    7980    return 0;
    8081  }

  • trunk/MagicSoft/Simulation/Detector/include-CORSIKA/CORStatfile.hxx

    r3046 r5112  
    2727#include "TObject.h"
    2828
    29 #include <iostream.h>
    30 #include <fstream.h>
     29#include <iostream>
     30#include <fstream>
    3131#include <stdlib.h>
    3232#include <math.h>
    … …  
    3636#define NPLONG 1041
    3737// @endcode
     38
     39using namespace std;
    3840
    3941// @subsection Class {\em CORStatfile}: Definition
Note: See TracChangeset for help on using the changeset viewer.