- Reordering includes and/or

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpFiles.cxx

diff --git a/MUON/mapping/AliMpFiles.cxx b/MUON/mapping/AliMpFiles.cxx
index a39d86d791b0d40da215768db0952e214b1d529b..3d3881e6c15af258d71b8a09e7c6c83a7860f1ef 100755 (executable)
--- a/MUON/mapping/AliMpFiles.cxx
+++ b/MUON/mapping/AliMpFiles.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpFiles.cxx,v 1.6 2006/01/11 10:05:08 ivana Exp $
+// $MpId: AliMpFiles.cxx,v 1.8 2006/03/02 16:37:20 ivana Exp $
 // Category: basic
 //
 // Class AliMpFiles
@@ -28,21 +28,18 @@
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#include <TSystem.h>
+#include <stdlib.h>
 #include <Riostream.h>
 
 #include "AliMpFiles.h"
 #include "AliLog.h"
 #include "TClass.h"
 
-ClassImp(AliMpFiles)
-
 //
 // static
 
 // static data members
 
-const TString AliMpFiles::fgkDefaultTop = GetDefaultTop();
 const TString AliMpFiles::fgkDataDir = "/data";
 const TString AliMpFiles::fgkStationDir = "/station";
 const TString AliMpFiles::fgkBendingDir = "/bending_plane/";
@@ -59,7 +56,7 @@ const TString AliMpFiles::fgkBergToGCFileName = "/bergToGC";
 const TString AliMpFiles::fgkTriggerLocalBoards = "MUONLocalTriggerBoard";
 const TString AliMpFiles::fgkBusPatchFileName = "DetElemIdToBusPatch";
 
-TString AliMpFiles::fgTop = AliMpFiles::fgkDefaultTop;
+ClassImp(AliMpFiles)
 
 //______________________________________________________________________________
 AliMpFiles::AliMpFiles()
@@ -104,12 +101,12 @@ AliMpFiles& AliMpFiles::operator=(const AliMpFiles& right)
 //
 
 //______________________________________________________________________________
-TString AliMpFiles::GetDefaultTop()
+TString AliMpFiles::GetTop()
 {
-  TString top = gSystem->Getenv("MINSTALL");    
+  TString top = getenv("MINSTALL");    
   if ( ! top.IsNull() ) return top;
 
-  TString ntop = gSystem->Getenv("ALICE_ROOT");
+  TString ntop = getenv("ALICE_ROOT");
   if ( ntop.IsNull() ) {
     AliErrorClassStream() << "Cannot find path to mapping data." << endl;
     return ntop;
@@ -130,16 +127,16 @@ TString AliMpFiles::PlaneDataDir(AliMpStationType station,
   case kStation2:
     switch (plane) {
     case kBendingPlane:
-      return fgTop + fgkDataDir + StationDataDir(station) + fgkBendingDir;
+      return GetTop() + fgkDataDir + StationDataDir(station) + fgkBendingDir;
       ;;
     case kNonBendingPlane:   
-      return fgTop + fgkDataDir + StationDataDir(station) + fgkNonBendingDir;
+      return GetTop() + fgkDataDir + StationDataDir(station) + fgkNonBendingDir;
       ;;
     }   
     break;
   case kStation345:
   case kStationTrigger:  
-    return fgTop + fgkDataDir + StationDataDir(station) + "/";
+    return GetTop() + fgkDataDir + StationDataDir(station) + "/";
     break;
   default:  
     AliFatalClass("Incomplete switch on AliMpPlaneType");
@@ -187,7 +184,7 @@ TString AliMpFiles::BusPatchFilePath()
 {
 /// Return path to data file with bus patch mapping.
 
-  return fgTop + fgkDataDir + "/" + fgkBusPatchFileName + fgkDataExt;
+  return GetTop() + fgkDataDir + "/" + fgkBusPatchFileName + fgkDataExt;
 }  
 
 //______________________________________________________________________________
@@ -195,7 +192,7 @@ TString AliMpFiles::DENamesFilePath(AliMpStationType station)
 {
 /// Return path to data file with DE names for given station.
  
-  return fgTop + fgkDataDir + StationDataDir(station) + fgkDENames + fgkDataExt;
+  return GetTop() + fgkDataDir + StationDataDir(station) + fgkDENames + fgkDataExt;
 }
 
 //______________________________________________________________________________
@@ -296,7 +293,7 @@ TString AliMpFiles::BergToGCFilePath(AliMpStationType station)
 /// Returns the path of the file which describes the correspondance between
 /// the berg number and the gassiplex channel.
 
-  return fgTop + fgkDataDir + StationDataDir(station)
+  return GetTop() + fgkDataDir + StationDataDir(station)
               + fgkBergToGCFileName + fgkDataExt;
 }
 
@@ -304,6 +301,6 @@ TString AliMpFiles::BergToGCFilePath(AliMpStationType station)
 void 
 AliMpFiles::SetTopPath(const TString& topPath)
 { 
-  fgTop = topPath; 
+  GetTop() = topPath; 
 }