Changeset 7887 for trunk/MagicSoft/Mars/mastro

Timestamp:

08/19/06 20:22:55 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -129 +129 @@
 
 #include <errno.h>      // strerror
-#include <fstream>      // ifstream
 #include <stdlib.h>     // ati, atof
 #include <limits.h>     // INT_MAX (Suse 7.3/gcc 2.95)
@@ -144 +143 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MZlib.h"      // MZlib <ifstream>
 
 #include "MTime.h"
@@ -261 +262 @@
     gLog << inf << "Reading Xephem catalog: " << catalog << endl;
 
-    ifstream fin(catalog);
+    MZlib fin(catalog);
     if (!fin)
     {
@@ -342 +343 @@
     gLog << inf << "Reading NGC2000 catalog: " << catalog << endl;
 
-    ifstream fin(catalog);
+    MZlib fin(catalog);
     if (!fin)
     {
@@ -406 +407 @@
     gLog << inf << "Reading Bright Star Catalog (BSC5) catalog: " << catalog << endl;
 
-    ifstream fin(catalog);
+    MZlib fin(catalog);
     if (!fin)
     {
@@ -478 +479 @@
     gLog << inf << "Reading Heasarc PPM catalog: " << catalog << endl;
 
-    ifstream fin(catalog);
+    MZlib fin(catalog);
     if (!fin)
     {
@@ -582 +583 @@
     gLog << inf << "Reading MAstroCatalog compressed catalog: " << catalog << endl;
 
-    ifstream fin(catalog);
+    MZlib fin(catalog);
     if (!fin)
     {
@@ -735 +736 @@
     if (!str.IsNull())
         str += ":  ";
-    str += MString::Form("Ra=%.2fh  Dec=%.1fd  Mag=%.1f", ra, dec, mag);
+    str += MString::Format("Ra=%.2fh  Dec=%.1fd  Mag=%.1f", ra, dec, mag);
     if (txt)
     {