Changeset 9292 for trunk/MagicSoft/Mars/mastro

Timestamp:

02/03/09 13:28:09 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstroCatalog.cc (modified) (7 diffs)
• MAstroCatalog.h (modified) (1 diff)

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.31 2008-07-14 19:59:08 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.32 2009-02-03 13:27:58 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -169 +169 @@
 using namespace std;
 
+// Datacenter default path for catalogs
+const TString MAstroCatalog::kDefaultPath="/magic/datacenter/setup";
+
 // --------------------------------------------------------------------------
 //
@@ -281 +284 @@
     gLog << inf << "Reading Xephem catalog: " << catalog << endl;
 
+    gSystem->ExpandPathName(catalog);
+    if (gSystem->AccessPathName(catalog, kReadPermission))
+    {
+        gLog << inf2 << "Searching Xephem catalog " << catalog << " in " << kDefaultPath << endl;
+        catalog.Prepend(kDefaultPath);
+    }
+
     MZlib fin(catalog);
     if (!fin)
@@ -362 +372 @@
     gLog << inf << "Reading NGC2000 catalog: " << catalog << endl;
 
+    gSystem->ExpandPathName(catalog);
+    if (gSystem->AccessPathName(catalog, kReadPermission))
+    {
+        gLog << inf2 << "Searching NGC2000 catalog " << catalog << " in " << kDefaultPath << endl;
+        catalog.Prepend(kDefaultPath);
+    }
+
     MZlib fin(catalog);
     if (!fin)
@@ -425 +442 @@
 {
     gLog << inf << "Reading Bright Star Catalog (BSC5) catalog: " << catalog << endl;
+
+    gSystem->ExpandPathName(catalog);
+    if (gSystem->AccessPathName(catalog, kReadPermission))
+    {
+        gLog << inf2 << "Searching Bright Star catalog " << catalog << " in " << kDefaultPath << endl;
+        catalog.Prepend(kDefaultPath);
+    }
 
     MZlib fin(catalog);
@@ -497 +521 @@
 {
     gLog << inf << "Reading Heasarc PPM catalog: " << catalog << endl;
+
+    gSystem->ExpandPathName(catalog);
+    if (gSystem->AccessPathName(catalog, kReadPermission))
+    {
+        gLog << inf2 << "Searching Heasarc PPM catalog " << catalog << " in " << kDefaultPath << endl;
+        catalog.Prepend(kDefaultPath);
+    }
 
     MZlib fin(catalog);
@@ -601 +632 @@
 
     gLog << inf << "Reading MAstroCatalog compressed catalog: " << catalog << endl;
+
+    gSystem->ExpandPathName(catalog);
+    if (gSystem->AccessPathName(catalog, kReadPermission))
+    {
+        gLog << inf2 << "Searching MAstroCatalog comressed catalog " << catalog << " in " << kDefaultPath << endl;
+        catalog.Prepend(kDefaultPath);
+    }
 
     MZlib fin(catalog);

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -34 +34 @@
 {
 private:
+    static const TString kDefaultPath; //! Datacenter default path for catalogs
+
     Double_t   fLimMag;     // [1]   Limiting Magnitude
     Double_t   fRadiusFOV;  // [deg] Radius of Field of View