Ignore:
Timestamp:
06/13/03 16:42:37 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mfileio
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc

    r2138 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    19 !   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    20 !
    21 !   Copyright: MAGIC Software Development, 2000-2002
     18!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!   Author(s): Harald Kornmayer, 1/2001
     20!
     21!   Copyright: MAGIC Software Development, 2000-2003
    2222!
    2323!
    … …  
    4141#include "MCT1ReadAscii.h"
    4242
    43 #include <fstream.h>
     43#include <fstream>
    4444
    4545#include <TList.h>
    … …  
    5656
    5757ClassImp(MCT1ReadAscii);
     58
     59using namespace std;
    5860
    5961// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

    r2152 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz 11/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
     18!   Author(s): Thomas Bretz, 11/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2003
    … …  
    4747#include "MCT1ReadPreProc.h"
    4848
    49 #include <fstream.h>
     49#include <fstream>
    5050
    5151#include <TList.h>
    … …  
    8585
    8686ClassImp(MCT1ReadPreProc);
     87
     88using namespace std;
    8789
    8890// --------------------------------------------------------------------------
    … …  
    469471    }
    470472
    471     fIn->read((Byte_t*)&outpars, sizeof(struct outputpars));
     473    fIn->read((char*)&outpars, sizeof(struct outputpars));
    472474
    473475    ProcessRunHeader(outpars);
    … …  
    509511
    510512    struct filterresults filterres;
    511     fIn->read((Byte_t*)&filterres, sizeof(struct filterresults));
     513    fIn->read((char*)&filterres, sizeof(struct filterresults));
    512514    /*
    513515     int   imax_alt_arcs;            // maximum altitude reached during the run
    … …  
    996998                 0, /* uiPco */
    997999                 0, /* uiPelS */
    998                  fIsMcFile ? event.fmcsize_phel : 0, /* uiPelC, Simulated SIZE */
     1000                 (int)(fIsMcFile ? event.fmcsize_phel : 0), /* uiPelC, Simulated SIZE */
    9991001                 0, /* elec */
    10001002                 0, /* muon */
    … …  
    11341136
    11351137    // read the eventrecord from the file
    1136     fIn->read((Byte_t*)&event, sizeof(struct eventrecord));
     1138    fIn->read((char*)&event, sizeof(struct eventrecord));
    11371139
    11381140    switch (ProcessEvent(event))

  • trunk/MagicSoft/Mars/mfileio/MChain.cc

    r1583 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     18!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2002
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!

  • trunk/MagicSoft/Mars/mfileio/MChain.h

    r1664 r2173  
    1515    MChain(const char *name, const char *title="") : TChain(name, title), fNotified(kFALSE) {}
    1616
    17     void ResetTree() { fTree = 0; }
     17    void ResetTree() { fTree = 0; fTreeNumber = -1; }
    1818
    1919    virtual Bool_t Notify() { fNotified = kTRUE; return kTRUE; }

  • trunk/MagicSoft/Mars/mfileio/MRead.cc

    r2117 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     18!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2002
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!
    … …  
    4141
    4242ClassImp(MRead);
     43
     44using namespace std;
    4345
    4446Bool_t MRead::Rewind()

  • trunk/MagicSoft/Mars/mfileio/MReadCurrents.cc

    r2161 r2173  
    3737
    3838#include <stdlib.h>  // atoi
    39 #include <fstream.h>
     39#include <fstream>
    4040
    4141#include <TList.h>
    … …  
    5151
    5252ClassImp(MReadCurrents);
     53
     54using namespace std;
    5355
    5456// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

    r2123 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    19 !
    20 !   Copyright: MAGIC Software Development, 2000-2002
     18!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!
    … …  
    3333//                                                                         //
    3434/////////////////////////////////////////////////////////////////////////////
    35 
    3635#include "MReadMarsFile.h"
    3736
    … …  
    4847
    4948ClassImp(MReadMarsFile);
     49
     50using namespace std;
    5051
    5152// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

    r2136 r2173  
    3232#include "MReadRflFile.h"
    3333
    34 #include <fstream.h>
     34#include <fstream>
    3535
    3636#include <TSystem.h>
    … …  
    4747
    4848ClassImp(MReadRflFile);
     49
     50using namespace std;
    4951
    5052// ------------------------------------------------
    … …  
    7072    {
    7173        RflEventHeader_old revth;
    72         fIn->read(&revth, sizeof(RflEventHeader_old));
    73         fEvtHeader->SetEvtNumber(revth.EvtNumber);
     74        fIn->read((char*)&revth, sizeof(RflEventHeader_old));
     75        fEvtHeader->SetEvtNumber((int)revth.EvtNumber);
    7476//        *fLog << "Event Number: " << revth.EvtNumber;
    7577//        *fLog << "  Primary ID: " << revth.PrimaryID;
    … …  
    8082    {
    8183        RflEventHeader revth;
    82         fIn->read(&revth, sizeof(RflEventHeader));
    83         fEvtHeader->SetEvtNumber(revth.EvtNumber);
     84        fIn->read((char*)&revth, sizeof(RflEventHeader));
     85        fEvtHeader->SetEvtNumber((int)revth.EvtNumber);
    8486//        *fLog << "Event Number: " << revth.EvtNumber;
    8587//        *fLog << "  Primary ID: " << revth.PrimaryID;
    … …  
    178180        {
    179181            RflRunHeader rrunh;
    180             fIn->read(&rrunh, sizeof(RflRunHeader));
     182            fIn->read((char*)&rrunh, sizeof(RflRunHeader));
    181183            if (*fIn)
    182184            {
    183185                *fLog << inf << "FIXME: Call ReInit" << endl;
    184186
    185                 fRunHeader->SetRunNumber(rrunh.RunNumber);
     187                fRunHeader->SetRunNumber((int)rrunh.RunNumber);
    186188                *fLog << underline << "RunHeader:" << endl;
    187189                *fLog << " Run Number:   " << rrunh.RunNumber << endl;

  • trunk/MagicSoft/Mars/mfileio/MReadTree.cc

    r2130 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
     18!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2002
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!
    … …  
    5151#include "MReadTree.h"
    5252
    53 #include <fstream.h>
     53#include <fstream>
    5454
    5555#include <TFile.h>           // TFile::GetName
    … …  
    6868
    6969ClassImp(MReadTree);
     70
     71using namespace std;
    7072
    7173// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc

    r1583 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  06/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    19 !
    20 !   Copyright: MAGIC Software Development, 2000-2002
     18!   Author(s): Thomas Bretz, 06/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!
    … …  
    4848#include "MWriteAsciiFile.h"
    4949
    50 #include <fstream.h>
     50#include <fstream>
    5151
    5252#include <TMethodCall.h> // TMethodCall, AsciiWrite
    … …  
    6363
    6464ClassImp(MWriteAsciiFile);
     65
     66using namespace std;
    6567
    6668// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/MWriteFile.cc

    r1583 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  06/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
     18!   Author(s): Thomas Bretz, 6/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2002
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!
    … …  
    3737#include "MWriteFile.h"
    3838
    39 #include <fstream.h>
     39#include <fstream>
    4040
    4141#include "MLog.h"
    … …  
    4545
    4646ClassImp(MWriteFile);
     47
     48using namespace std;
    4749
    4850// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

    r2130 r2173  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  06/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    19 !
    20 !   Copyright: MAGIC Software Development, 2000-2002
     18!   Author(s): Thomas Bretz, 6/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!
     20!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    2222!
    … …  
    3636#include "MWriteRootFile.h"
    3737
    38 #include <fstream.h>
     38#include <fstream>
    3939
    4040#include <TFile.h>
    … …  
    4848ClassImp(MRootFileBranch);
    4949ClassImp(MWriteRootFile);
     50
     51using namespace std;
    5052
    5153static const TString gsDefName  = "MWriteRootFile";
Note: See TracChangeset for help on using the changeset viewer.