Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc (revision 2173) @@ -16,8 +16,8 @@ ! ! -! Author(s): Thomas Bretz 12/2000 -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! -! Copyright: MAGIC Software Development, 2000-2002 +! Author(s): Thomas Bretz, 12/2000 +! Author(s): Harald Kornmayer, 1/2001 +! +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -41,5 +41,5 @@ #include "MCT1ReadAscii.h" -#include +#include #include @@ -56,4 +56,6 @@ ClassImp(MCT1ReadAscii); + +using namespace std; // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (revision 2173) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 11/2002 +! Author(s): Thomas Bretz, 11/2002 ! ! Copyright: MAGIC Software Development, 2000-2003 @@ -47,5 +47,5 @@ #include "MCT1ReadPreProc.h" -#include +#include #include @@ -85,4 +85,6 @@ ClassImp(MCT1ReadPreProc); + +using namespace std; // -------------------------------------------------------------------------- @@ -469,5 +471,5 @@ } - fIn->read((Byte_t*)&outpars, sizeof(struct outputpars)); + fIn->read((char*)&outpars, sizeof(struct outputpars)); ProcessRunHeader(outpars); @@ -509,5 +511,5 @@ struct filterresults filterres; - fIn->read((Byte_t*)&filterres, sizeof(struct filterresults)); + fIn->read((char*)&filterres, sizeof(struct filterresults)); /* int imax_alt_arcs; // maximum altitude reached during the run @@ -996,5 +998,5 @@ 0, /* uiPco */ 0, /* uiPelS */ - fIsMcFile ? event.fmcsize_phel : 0, /* uiPelC, Simulated SIZE */ + (int)(fIsMcFile ? event.fmcsize_phel : 0), /* uiPelC, Simulated SIZE */ 0, /* elec */ 0, /* muon */ @@ -1134,5 +1136,5 @@ // read the eventrecord from the file - fIn->read((Byte_t*)&event, sizeof(struct eventrecord)); + fIn->read((char*)&event, sizeof(struct eventrecord)); switch (ProcessEvent(event)) Index: trunk/MagicSoft/Mars/mfileio/MChain.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MChain.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MChain.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz, 12/2000 ! -! Copyright: MAGIC Software Development, 2000-2002 +! Copyright: MAGIC Software Development, 2000-2003 ! ! Index: trunk/MagicSoft/Mars/mfileio/MChain.h =================================================================== --- trunk/MagicSoft/Mars/mfileio/MChain.h (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MChain.h (revision 2173) @@ -15,5 +15,5 @@ MChain(const char *name, const char *title="") : TChain(name, title), fNotified(kFALSE) {} - void ResetTree() { fTree = 0; } + void ResetTree() { fTree = 0; fTreeNumber = -1; } virtual Bool_t Notify() { fNotified = kTRUE; return kTRUE; } Index: trunk/MagicSoft/Mars/mfileio/MRead.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MRead.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MRead.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz, 12/2000 ! -! Copyright: MAGIC Software Development, 2000-2002 +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -41,4 +41,6 @@ ClassImp(MRead); + +using namespace std; Bool_t MRead::Rewind() Index: trunk/MagicSoft/Mars/mfileio/MReadCurrents.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MReadCurrents.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MReadCurrents.cc (revision 2173) @@ -37,5 +37,5 @@ #include // atoi -#include +#include #include @@ -51,4 +51,6 @@ ClassImp(MReadCurrents); + +using namespace std; // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 12/2000 -! -! Copyright: MAGIC Software Development, 2000-2002 +! Author(s): Thomas Bretz, 12/2000 +! +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -33,5 +33,4 @@ // // ///////////////////////////////////////////////////////////////////////////// - #include "MReadMarsFile.h" @@ -48,4 +47,6 @@ ClassImp(MReadMarsFile); + +using namespace std; // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc (revision 2173) @@ -32,5 +32,5 @@ #include "MReadRflFile.h" -#include +#include #include @@ -47,4 +47,6 @@ ClassImp(MReadRflFile); + +using namespace std; // ------------------------------------------------ @@ -70,6 +72,6 @@ { RflEventHeader_old revth; - fIn->read(&revth, sizeof(RflEventHeader_old)); - fEvtHeader->SetEvtNumber(revth.EvtNumber); + fIn->read((char*)&revth, sizeof(RflEventHeader_old)); + fEvtHeader->SetEvtNumber((int)revth.EvtNumber); // *fLog << "Event Number: " << revth.EvtNumber; // *fLog << " Primary ID: " << revth.PrimaryID; @@ -80,6 +82,6 @@ { RflEventHeader revth; - fIn->read(&revth, sizeof(RflEventHeader)); - fEvtHeader->SetEvtNumber(revth.EvtNumber); + fIn->read((char*)&revth, sizeof(RflEventHeader)); + fEvtHeader->SetEvtNumber((int)revth.EvtNumber); // *fLog << "Event Number: " << revth.EvtNumber; // *fLog << " Primary ID: " << revth.PrimaryID; @@ -178,10 +180,10 @@ { RflRunHeader rrunh; - fIn->read(&rrunh, sizeof(RflRunHeader)); + fIn->read((char*)&rrunh, sizeof(RflRunHeader)); if (*fIn) { *fLog << inf << "FIXME: Call ReInit" << endl; - fRunHeader->SetRunNumber(rrunh.RunNumber); + fRunHeader->SetRunNumber((int)rrunh.RunNumber); *fLog << underline << "RunHeader:" << endl; *fLog << " Run Number: " << rrunh.RunNumber << endl; Index: trunk/MagicSoft/Mars/mfileio/MReadTree.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MReadTree.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MReadTree.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz, 12/2000 ! -! Copyright: MAGIC Software Development, 2000-2002 +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -51,5 +51,5 @@ #include "MReadTree.h" -#include +#include #include // TFile::GetName @@ -68,4 +68,6 @@ ClassImp(MReadTree); + +using namespace std; // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 06/2001 -! -! Copyright: MAGIC Software Development, 2000-2002 +! Author(s): Thomas Bretz, 06/2001 +! +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -48,5 +48,5 @@ #include "MWriteAsciiFile.h" -#include +#include #include // TMethodCall, AsciiWrite @@ -63,4 +63,6 @@ ClassImp(MWriteAsciiFile); + +using namespace std; // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mfileio/MWriteFile.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MWriteFile.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MWriteFile.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 06/2001 +! Author(s): Thomas Bretz, 6/2001 ! -! Copyright: MAGIC Software Development, 2000-2002 +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -37,5 +37,5 @@ #include "MWriteFile.h" -#include +#include #include "MLog.h" @@ -45,4 +45,6 @@ ClassImp(MWriteFile); + +using namespace std; // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc =================================================================== --- trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc (revision 2161) +++ trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc (revision 2173) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz 06/2001 -! -! Copyright: MAGIC Software Development, 2000-2002 +! Author(s): Thomas Bretz, 6/2001 +! +! Copyright: MAGIC Software Development, 2000-2003 ! ! @@ -36,5 +36,5 @@ #include "MWriteRootFile.h" -#include +#include #include @@ -48,4 +48,6 @@ ClassImp(MRootFileBranch); ClassImp(MWriteRootFile); + +using namespace std; static const TString gsDefName = "MWriteRootFile";