Changeset 14935 for trunk/Mars/mfileio

Timestamp:

02/20/13 14:49:37 (12 years ago)

Author:

tbretz

Message:

Add changes necessary to remove fits completely from namespace std in MARS.

Location:

trunk/Mars/mfileio

Files:

• MFitsArray.h (modified) (3 diffs)
• MTopFitsGroup.cc (modified) (2 diffs)
• MTopFitsGroup.h (modified) (4 diffs)
• MWriteFitsFile.cc (modified) (5 diffs)
• MWriteFitsFile.h (modified) (4 diffs)

trunk/Mars/mfileio/MFitsArray.h

@@ -4 +4 @@
 //#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 +22 @@
 
    // the FITS table to which the data are written                      
-   std::ofits*     fFitsTable;
+   ofits*     fFitsTable;
    
    // number of elements in fClonesArray / MArrayX / TArrayX  during 
@@ -26 +30 @@
 
 public:
-   std::ofits* GetFitsTable()     {return fFitsTable;}
+   ofits* GetFitsTable()     {return fFitsTable;}
    UInt_t *      GetArraySizePtr()  {return &fArraySize;}
 

trunk/Mars/mfileio/MTopFitsGroup.cc

@@ -8 +8 @@
 // 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 +19 @@
 // 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);

trunk/Mars/mfileio/MTopFitsGroup.h

@@ -1 +1 @@
 #ifndef MARS_MTopFitsGroup
 #define MARS_MTopFitsGroup
-
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "TString.h"
+#ifndef ROOT_TString
+#include <TString.h>
+#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 +44 @@
 
    // 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 +50 @@
 
 public:
-   MTopFitsGroup(const char * fileName, std::ofits* file) : fFileName(fileName),
+   MTopFitsGroup(const char * fileName, ofits* file) : fFileName(fileName),
                                           fTopGroup(file),
                                           fNumOpen(1)
@@ -55 +59 @@
    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;}
 
 };

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -20 +20 @@
 
 ClassImp(MWriteFitsFile);
-//ClassImp(MArrayHelper);
-//ClassImp(MTopFitsGroup);
 
 using namespace std;
-//ClassImp(std::ofits);
-
 
 map<MUniqueFileId, MTopFitsGroup> MWriteFitsFile::fTopFitsGroups;
@@ -98 +94 @@
 MWriteFitsFile::~MWriteFitsFile()
 {
-    for (std::map<TString, std::ofits*>::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++)
+    for (std::map<TString, ofits*>::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++)
     {
         if (it->second != NULL)
@@ -332 +328 @@
 Int_t MWriteFitsFile::PostProcess()
 {
-    for (std::map<TString, std::ofits*>::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++)
+    for (std::map<TString, ofits*>::iterator it=fFitsTables.begin(); it!= fFitsTables.end();it++)
     {
         it->second->close();
@@ -479 +475 @@
                               const char* unit,
                               const char* comment,
-                              std::ofits* outFile)
+                              ofits* outFile)
 {
     if (outFile == NULL)
@@ -1089 +1085 @@
    // close the current files
    CloseTopLevelGroup();
-   for (std::map<TString,std::ofits*>::iterator it=fFitsTables.begin(); it!=fFitsTables.end(); it++)
+   for (std::map<TString,ofits*>::iterator it=fFitsTables.begin(); it!=fFitsTables.end(); it++)
    {
        (it->second)->close();

trunk/Mars/mfileio/MWriteFitsFile.h

@@ -12 +12 @@
 #endif
 
+#ifndef MARS_MTopFitsGroup
 #include "MTopFitsGroup.h"
+#endif
+
+#ifndef MARS_MFitsArray
 #include "MFitsArray.h"
-
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -73 +77 @@
    // TClonesArray are not in this map.
    //ETIENNE ofits objects cannot be copied. So store pointers instead
-   std::map<TString, std::ofits*>                       fFitsTables;
+   std::map<TString, ofits*>                       fFitsTables;
 
    // all information needed to write data of TClonesArray to their      
@@ -106 +110 @@
    Bool_t InitColumns(const TString & tableName,
                       const TString & parentVarName,
-                      std::ofits* fitsTable,
+                      ofits* fitsTable,
                       void * baseAdr,
                       TClass * classDef);
@@ -122 +126 @@
                  const char* unit=NULL,
                  const char* comment=NULL,
-                 std::ofits* outFile=NULL);
+                 ofits* outFile=NULL);
 
    // MWrite