Changeset 12467 for fact/tools/rootmacros

Timestamp:

11/09/11 13:10:05 (13 years ago)

Author:

kraehenb

Message:

Newest version from the mcore directory. Fixed the bug in the PrintColumns()-function. The only other change I found was the renaming of ___err___ and ___all___ (before without _).

File:

• fact/tools/rootmacros/fits.h (modified) (16 diffs)

fact/tools/rootmacros/fits.h

@@ -22 +22 @@
 #include <iostream>
 #define gLog cerr
-#define err ""
-#define all ""
+#define ___err___ ""
+#define ___all___ ""
 #else
 #include "MLog.h"
 #include "MLogManip.h"
+#define ___err___ err
+#define ___all___ all
 #endif
 
@@ -108 +110 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return false;
 #endif
@@ -120 +122 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return false;
 #endif
@@ -132 +134 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return false;
 #endif
@@ -261 +263 @@
                         throw runtime_error(str.str());
 #else
-                        gLog << err << "ERROR - " << str.str() << endl;
+                        gLog << ___err___ << "ERROR - " << str.str() << endl;
                         return;
 #endif
@@ -278 +280 @@
                 throw runtime_error("Column size mismatch");
 #else
-                gLog << err << "ERROR - Column size mismatch" << endl;
+                gLog << ___err___ << "ERROR - Column size mismatch" << endl;
                 return;
 #endif
@@ -291 +293 @@
             {
                 if (!display_all &&
-                    (it->first.substr(0, 6)!="TTYPE" ||
-                     it->first.substr(0, 6)!="TFORM" ||
-                     it->first.substr(0, 6)!="TUNIT" ||
-                     it->first!="TFIELDS"  ||
-                     it->first!="XTENSION" ||
-                     it->first!="NAXIS"    ||
-                     it->first!="BITPIX"   ||
-                     it->first!="PCOUNT"   ||
-                     it->first!="GCOUNT")
+                    (it->first.substr(0, 6)=="TTYPE" ||
+                     it->first.substr(0, 6)=="TFORM" ||
+                     it->first.substr(0, 6)=="TUNIT" ||
+                     it->first=="TFIELDS"  ||
+                     it->first=="XTENSION" ||
+                     it->first=="NAXIS"    ||
+                     it->first=="BITPIX"   ||
+                     it->first=="PCOUNT"   ||
+                     it->first=="GCOUNT")
                    )
                     continue;
 
-                gLog << all << setw(2) << it->second.type << '|' << it->first << '=' << it->second.value << '/' << it->second.comment << '|' << endl;
+                gLog << ___all___ << setw(2) << it->second.type << '|' << it->first << '=' << it->second.value << '/' << it->second.comment << '|' << endl;
             }}
 
@@ -317 +319 @@
             for (Sorted::const_iterator it=sorted.begin(); it!=sorted.end(); it++)
             {
-                gLog << all << setw(6) << it->second.offset << "| ";
+                gLog << ___all___ << setw(6) << it->second.offset << "| ";
                 gLog << it->second.num << 'x';
                 switch (it->second.type)
@@ -352 +354 @@
                 throw runtime_error(str.str());
 #else
-                gLog << err << "ERROR - " << str.str() << endl;
+                gLog << ___err___ << "ERROR - " << str.str() << endl;
                 return 0;
 #endif
@@ -448 +450 @@
             throw runtime_error("File is not a FITS file.");
 #else
-            gLog << err << "ERROR - File is not a FITS file." << endl;
+            gLog << ___err___ << "ERROR - File is not a FITS file." << endl;
             return;
 #endif
@@ -468 +470 @@
                     throw runtime_error("FITS file corrupted.");
 #else
-                    gLog << err << "ERROR - FITS file corrupted." << endl;
+                    gLog << ___err___ << "ERROR - FITS file corrupted." << endl;
                     return;
 #endif
@@ -509 +511 @@
                 seekg((blks+(rest>0?1:0))*(36*80), ios::cur);
                 if (!good())
-                     gLog << err << "File seems to be incomplete (less data than expected from header)." << endl;
+                     gLog << ___err___ << "File seems to be incomplete (less data than expected from header)." << endl;
 
                 fRow   = fTable.num_rows;
@@ -591 +593 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif
@@ -604 +606 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif
@@ -617 +619 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif
@@ -664 +666 @@
             throw runtime_error(str.str());
 #else
-            gLog << err << "ERROR - " << str.str() << endl;
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
             return false;
 #endif