Index: trunk/Mars/mcore/DrsCalib.h =================================================================== --- trunk/Mars/mcore/DrsCalib.h (revision 14934) +++ trunk/Mars/mcore/DrsCalib.h (revision 14935) @@ -5,6 +5,11 @@ #include // errno +#ifndef MARS_fits #include "fits.h" +#endif + +#ifndef MARS_ofits #include "ofits.h" +#endif #ifdef __MARS__ @@ -929,5 +934,9 @@ std::string ReadFitsImp(const std::string &str, std::vector &vec) { +#ifndef __MARS__ std::fits file(str); +#else + fits file(str); +#endif if (!file) { @@ -1054,5 +1063,9 @@ const size_t n = 1440*1024*4 + 1440*fRoi*2 + fNumTm*fRoi*2 + 3; +#ifndef __MARS__ std::ofits file(filename.c_str()); +#else + ofits file(filename.c_str()); +#endif if (!file) { Index: trunk/Mars/mcore/fits.h =================================================================== --- trunk/Mars/mcore/fits.h (revision 14934) +++ trunk/Mars/mcore/fits.h (revision 14935) @@ -57,4 +57,6 @@ namespace std { +#else +using namespace std; #endif Index: trunk/Mars/mcore/ofits.h =================================================================== --- trunk/Mars/mcore/ofits.h (revision 14934) +++ trunk/Mars/mcore/ofits.h (revision 14935) @@ -21,4 +21,6 @@ namespace std { +#else +using namespace std; #endif @@ -803,5 +805,5 @@ }; -#ifdef __MARS__ +#ifndef __MARS__ }; #endif Index: trunk/Mars/mfileio/MFitsArray.h =================================================================== --- trunk/Mars/mfileio/MFitsArray.h (revision 14934) +++ trunk/Mars/mfileio/MFitsArray.h (revision 14935) @@ -4,10 +4,14 @@ //#include "astroroot.h" //#include "fitsio.h" -#include "../mcore/fits.h" -#include "../mcore/ofits.h" +#ifndef MARS_fits +#include "fits.h" +#endif + +#ifndef MARS_ofits +#include "ofits.h" +#endif class TClonesArray; class MLog; - /////////////////////////////////////////////////////////////////////////////// @@ -18,5 +22,5 @@ // the FITS table to which the data are written - std::ofits* fFitsTable; + ofits* fFitsTable; // number of elements in fClonesArray / MArrayX / TArrayX during @@ -26,5 +30,5 @@ public: - std::ofits* GetFitsTable() {return fFitsTable;} + ofits* GetFitsTable() {return fFitsTable;} UInt_t * GetArraySizePtr() {return &fArraySize;} Index: trunk/Mars/mfileio/MTopFitsGroup.cc =================================================================== --- trunk/Mars/mfileio/MTopFitsGroup.cc (revision 14934) +++ trunk/Mars/mfileio/MTopFitsGroup.cc (revision 14935) @@ -8,5 +8,5 @@ // Note: This FITS group as well as the table must be open, before calling // this method! -void MTopFitsGroup::Attach(std::ofits* table) +void MTopFitsGroup::Attach(ofits* table) { // fTopGroup.SetChild(table); @@ -19,5 +19,5 @@ // If table is an already open FITS table, then that table we be closed, // before the new child is assigned to "table" -Bool_t MTopFitsGroup::GetNextChild(std::ofits* table) +Bool_t MTopFitsGroup::GetNextChild(ofits* table) { // fTopGroup.SetChild(table); Index: trunk/Mars/mfileio/MTopFitsGroup.h =================================================================== --- trunk/Mars/mfileio/MTopFitsGroup.h (revision 14934) +++ trunk/Mars/mfileio/MTopFitsGroup.h (revision 14935) @@ -1,15 +1,19 @@ #ifndef MARS_MTopFitsGroup #define MARS_MTopFitsGroup - #include #include -#include "TString.h" +#ifndef ROOT_TString +#include +#endif -//#include "astroroot.h" -//#include "fitsio.h" -#include "../mcore/fits.h" -#include "../mcore/ofits.h" +#ifndef MARS_fits +#include "fits.h" +#endif + +#ifndef MARS_ofits +#include "ofits.h" +#endif /////////////////////////////////////////////////////////////////////////////// @@ -40,5 +44,5 @@ // the top level group as AstroROOT-2 data structure - std::ofits* fTopGroup; + ofits* fTopGroup; // number of usage of this group by different MWriteFitsFile instances @@ -46,5 +50,5 @@ public: - MTopFitsGroup(const char * fileName, std::ofits* file) : fFileName(fileName), + MTopFitsGroup(const char * fileName, ofits* file) : fFileName(fileName), fTopGroup(file), fNumOpen(1) @@ -55,9 +59,9 @@ Int_t GetNumUsage() {return fNumOpen;} - void Attach(std::ofits* table); - Bool_t GetNextChild(std::ofits* table); + void Attach(ofits* table); + Bool_t GetNextChild(ofits* table); - std::ofits* GetGroup() {return fTopGroup;} - TString & GetFileName() {return fFileName;} + ofits* GetGroup() {return fTopGroup;} + const TString &GetFileName() const {return fFileName;} }; Index: trunk/Mars/mfileio/MWriteFitsFile.cc =================================================================== --- trunk/Mars/mfileio/MWriteFitsFile.cc (revision 14934) +++ trunk/Mars/mfileio/MWriteFitsFile.cc (revision 14935) @@ -20,10 +20,6 @@ ClassImp(MWriteFitsFile); -//ClassImp(MArrayHelper); -//ClassImp(MTopFitsGroup); using namespace std; -//ClassImp(std::ofits); - map MWriteFitsFile::fTopFitsGroups; @@ -98,5 +94,5 @@ MWriteFitsFile::~MWriteFitsFile() { - for (std::map::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++) + for (std::map::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++) { if (it->second != NULL) @@ -332,5 +328,5 @@ Int_t MWriteFitsFile::PostProcess() { - for (std::map::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++) + for (std::map::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++) { it->second->close(); @@ -479,5 +475,5 @@ const char* unit, const char* comment, - std::ofits* outFile) + ofits* outFile) { if (outFile == NULL) @@ -1089,5 +1085,5 @@ // close the current files CloseTopLevelGroup(); - for (std::map::iterator it=fFitsTables.begin(); it!=fFitsTables.end(); it++) + for (std::map::iterator it=fFitsTables.begin(); it!=fFitsTables.end(); it++) { (it->second)->close(); Index: trunk/Mars/mfileio/MWriteFitsFile.h =================================================================== --- trunk/Mars/mfileio/MWriteFitsFile.h (revision 14934) +++ trunk/Mars/mfileio/MWriteFitsFile.h (revision 14935) @@ -12,7 +12,11 @@ #endif +#ifndef MARS_MTopFitsGroup #include "MTopFitsGroup.h" +#endif + +#ifndef MARS_MFitsArray #include "MFitsArray.h" - +#endif /////////////////////////////////////////////////////////////////////////////// @@ -73,5 +77,5 @@ // TClonesArray are not in this map. //ETIENNE ofits objects cannot be copied. So store pointers instead - std::map fFitsTables; + std::map fFitsTables; // all information needed to write data of TClonesArray to their @@ -106,5 +110,5 @@ Bool_t InitColumns(const TString & tableName, const TString & parentVarName, - std::ofits* fitsTable, + ofits* fitsTable, void * baseAdr, TClass * classDef); @@ -122,5 +126,5 @@ const char* unit=NULL, const char* comment=NULL, - std::ofits* outFile=NULL); + ofits* outFile=NULL); // MWrite Index: trunk/Mars/mjobs/Makefile =================================================================== --- trunk/Mars/mjobs/Makefile (revision 14934) +++ trunk/Mars/mjobs/Makefile (revision 14935) @@ -25,5 +25,6 @@ -I../mhvstime -I../mtrigger -I../mmuon -I../mmc -I../mmovie \ -I../mextralgo -I../mhflux -I../msql -I../mreport -I../mcorsika \ - -I../msim -I../msimreflector -I../msimcamera -I../melectronics + -I../msim -I../msimreflector -I../msimcamera -I../melectronics \ + -I../mcore SRCFILES = MSequence.cc \ Index: trunk/Mars/mreport/MReport.h =================================================================== --- trunk/Mars/mreport/MReport.h (revision 14934) +++ trunk/Mars/mreport/MReport.h (revision 14935) @@ -9,8 +9,6 @@ #endif -namespace std -{ - class fits; -} +class fits; + class MTime; class MParList; @@ -37,9 +35,9 @@ virtual Bool_t SetupReading(MParList &plist); - virtual Bool_t SetupReadingFits(std::fits &fits) { return kTRUE; } + virtual Bool_t SetupReadingFits(fits &) { return kTRUE; } virtual Int_t InterpreteBody(TString &str, Int_t ver); Int_t Interprete(TString &str, const MTime &start, const MTime &stop, const Int_t ver); - virtual Int_t InterpreteFits(const std::fits &fits) { return kTRUE; } + virtual Int_t InterpreteFits(const fits &) { return kTRUE; } Bool_t CheckIdentifier(TString &str) const { Index: trunk/Mars/mreport/MReportCC.cc =================================================================== --- trunk/Mars/mreport/MReportCC.cc (revision 14934) +++ trunk/Mars/mreport/MReportCC.cc (revision 14935) @@ -255,5 +255,5 @@ } -Bool_t MReportWeather::SetupReadingFits(std::fits &file) +Bool_t MReportWeather::SetupReadingFits(fits &file) { return Index: trunk/Mars/mreport/MReportCC.h =================================================================== --- trunk/Mars/mreport/MReportCC.h (revision 14934) +++ trunk/Mars/mreport/MReportCC.h (revision 14935) @@ -19,5 +19,5 @@ Float_t fSolarRadiation; // [W/m^2] IR-Radiation - Bool_t SetupReadingFits(std::fits &fits); + Bool_t SetupReadingFits(fits &fits); public: Index: trunk/Mars/mreport/MReportDrive.cc =================================================================== --- trunk/Mars/mreport/MReportDrive.cc (revision 14934) +++ trunk/Mars/mreport/MReportDrive.cc (revision 14935) @@ -88,5 +88,5 @@ } -Bool_t MReportDrive::SetupReadingFits(std::fits &file) +Bool_t MReportDrive::SetupReadingFits(fits &file) { return @@ -100,5 +100,5 @@ } -Int_t MReportDrive::InterpreteFits(const std::fits &fits) +Int_t MReportDrive::InterpreteFits(const fits &fits) { fCurrentZd = fNominalZd - fErrorZd; Index: trunk/Mars/mreport/MReportDrive.h =================================================================== --- trunk/Mars/mreport/MReportDrive.h (revision 14934) +++ trunk/Mars/mreport/MReportDrive.h (revision 14935) @@ -23,6 +23,6 @@ Double_t fErrorAz; // [deg] sistem error in the azimuth angle axis - Bool_t SetupReadingFits(std::fits &fits); - Int_t InterpreteFits(const std::fits &fits); + Bool_t SetupReadingFits(fits &fits); + Int_t InterpreteFits(const fits &fits); Int_t InterpreteBody(TString &str, Int_t ver); Index: trunk/Mars/mreport/MReportFitsRead.h =================================================================== --- trunk/Mars/mreport/MReportFitsRead.h (revision 14934) +++ trunk/Mars/mreport/MReportFitsRead.h (revision 14935) @@ -17,8 +17,5 @@ #include -namespace std -{ - class fits; -} +class fits; class THashTable; @@ -52,5 +49,5 @@ protected: - std::fits *fIn; //! buffered input stream (file to read from) + fits *fIn; //! buffered input stream (file to read from) public: Index: trunk/Mars/mreport/MReportHumidity.cc =================================================================== --- trunk/Mars/mreport/MReportHumidity.cc (revision 14934) +++ trunk/Mars/mreport/MReportHumidity.cc (revision 14935) @@ -51,5 +51,5 @@ } -Bool_t MReportHumidity::SetupReadingFits(std::fits &file) +Bool_t MReportHumidity::SetupReadingFits(fits &file) { return @@ -58,5 +58,5 @@ } -Int_t MReportHumidity::InterpreteFits(const std::fits &fits) +Int_t MReportHumidity::InterpreteFits(const fits &fits) { return kTRUE; Index: trunk/Mars/mreport/MReportHumidity.h =================================================================== --- trunk/Mars/mreport/MReportHumidity.h (revision 14934) +++ trunk/Mars/mreport/MReportHumidity.h (revision 14935) @@ -12,6 +12,6 @@ Float_t fHumidity[4]; // H[%] Humidity sensors readout - Bool_t SetupReadingFits(std::fits &fits); - Int_t InterpreteFits(const std::fits &fits); + Bool_t SetupReadingFits(fits &fits); + Int_t InterpreteFits(const fits &fits); public: Index: trunk/Mars/mreport/MReportRates.cc =================================================================== --- trunk/Mars/mreport/MReportRates.cc (revision 14934) +++ trunk/Mars/mreport/MReportRates.cc (revision 14935) @@ -53,5 +53,5 @@ } -Bool_t MReportRates::SetupReadingFits(std::fits &file) +Bool_t MReportRates::SetupReadingFits(fits &file) { return @@ -66,5 +66,5 @@ } -Int_t MReportRates::InterpreteFits(const std::fits &fits) +Int_t MReportRates::InterpreteFits(const fits &fits) { if (fElapsedTime>0 || fElapsedOnTime>0) Index: trunk/Mars/mreport/MReportRates.h =================================================================== --- trunk/Mars/mreport/MReportRates.h (revision 14934) +++ trunk/Mars/mreport/MReportRates.h (revision 14935) @@ -18,6 +18,6 @@ Float_t fElapsedOnTime; // [s] On-time elapsed since previous report - Bool_t SetupReadingFits(std::fits &fits); - Int_t InterpreteFits(const std::fits &fits); + Bool_t SetupReadingFits(fits &fits); + Int_t InterpreteFits(const fits &fits); public: Index: trunk/Mars/mreport/MReportTemperatures.cc =================================================================== --- trunk/Mars/mreport/MReportTemperatures.cc (revision 14934) +++ trunk/Mars/mreport/MReportTemperatures.cc (revision 14935) @@ -56,5 +56,5 @@ } -Bool_t MReportTemperatures::SetupReadingFits(std::fits &file) +Bool_t MReportTemperatures::SetupReadingFits(fits &file) { return @@ -68,5 +68,5 @@ } -Int_t MReportTemperatures::InterpreteFits(const std::fits &fits) +Int_t MReportTemperatures::InterpreteFits(const fits &fits) { return kTRUE; Index: trunk/Mars/mreport/MReportTemperatures.h =================================================================== --- trunk/Mars/mreport/MReportTemperatures.h (revision 14934) +++ trunk/Mars/mreport/MReportTemperatures.h (revision 14935) @@ -17,6 +17,6 @@ Float_t fTempEthernet[4]; // [deg C] Ethernet switches temperatures top (front/back), bottom (front/back) - Bool_t SetupReadingFits(std::fits &fits); - Int_t InterpreteFits(const std::fits &fits); + Bool_t SetupReadingFits(fits &fits); + Int_t InterpreteFits(const fits &fits); public: