Replacing Header with Id

[u/mrichter/AliRoot.git] / STEER / AliConfig.cxx

diff --git a/STEER/AliConfig.cxx b/STEER/AliConfig.cxx
index 6247d40ed583021beb9792cef71a7778ace0cc65..798826a24d8953e2a56631a6d0fe5142b25c4e1f 100644 (file)
--- a/STEER/AliConfig.cxx
+++ b/STEER/AliConfig.cxx
@@ -13,36 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.8  2002/10/29 14:26:49  hristov
-Code clean-up (F.Carminati)
-
-Revision 1.7  2002/10/23 07:43:00  alibrary
-Introducing some effective C++ suggestions
-
-Revision 1.6  2002/10/22 15:02:15  alibrary
-Introducing Riostream.h
-
-Revision 1.5  2002/10/14 14:57:32  hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.3.8.1  2002/06/10 14:43:06  hristov
-Merged with v3-08-02
-
-Revision 1.4  2002/05/27 14:26:59  hristov
-New folder for track references added
-
-Revision 1.3  2001/10/04 15:30:56  hristov
-Changes to accommodate the set of PHOS folders and tasks (Y.Schutz)
-
-Revision 1.2  2001/05/21 17:22:50  buncic
-Fixed problem with missing AliConfig while reading galice.root
-
-Revision 1.1  2001/05/16 14:57:22  alibrary
-New files for folders and Stack
-
-*/
+/* $Id$ */
 
 #include <Riostream.h>
 #include <TDatabasePDG.h>
@@ -50,6 +21,7 @@ New files for folders and Stack
 #include <TInterpreter.h>
 #include <TROOT.h>
 #include <TSystem.h>
+#include <TVirtualMC.h>
 
 #include "AliConfig.h"
 #include "AliDetector.h"
@@ -60,7 +32,7 @@ New files for folders and Stack
 
 ClassImp(AliConfig)
 
-AliConfig* AliConfig::fInstance = 0;
+AliConfig* AliConfig::fgInstance = 0;
 
 //____________________________________________________________________________
 AliConfig* AliConfig::Instance ()
@@ -68,9 +40,9 @@ AliConfig* AliConfig::Instance ()
   //
   // Instance method for singleton class
   //
-  if(!fInstance) fInstance = new AliConfig ("Folders","Alice data exchange");
+  if(!fgInstance) fgInstance = new AliConfig ("Folders","Alice data exchange");
 
-  return fInstance;
+  return fgInstance;
 }
 
 //____________________________________________________________________________
@@ -87,7 +59,7 @@ AliConfig::AliConfig():
   //
   // Default constructor, mainly to keep coding conventions
   //
-  fInstance=0;
+  fgInstance=0;
     
   Fatal("ctor",
    "Constructor should not be called for a singleton\n");
@@ -108,7 +80,7 @@ AliConfig::AliConfig(const AliConfig& conf):
   //
   // Copy constructor, mainly to keep coding conventions
   //
-  fInstance=0;
+  fgInstance=0;
     
   Fatal("copy ctor",
    "Copy constructor should not be called for a singleton\n");
@@ -129,7 +101,7 @@ AliConfig::AliConfig(const char *name, const char *title):
   //
   // Constructor
   //
-  fInstance=this;
+  fgInstance=this;
   
   fDetectorFolder[0] = "Run/Conditions/Calibration" ;
   fDetectorFolder[1] = "Run/Event/Data" ;
@@ -189,38 +161,38 @@ AliConfig::AliConfig(const char *name, const char *title):
   subfolder =
     event->AddFolder ("RecData", "Detectors reconstucted data");
   
-  TFolder *run_mc =
+  TFolder *runMC =
     fTopFolder->AddFolder ("RunMC", "MonteCarlo run dependent folders");
   
-  TFolder *configuration_mc =
-    run_mc->AddFolder ("Configuration","MonteCarlo run configuration");
+  TFolder *configurationMC =
+    runMC->AddFolder ("Configuration","MonteCarlo run configuration");
   
   subfolder =
-    configuration_mc->AddFolder ("Generators","list of generator objects");
+    configurationMC->AddFolder ("Generators","list of generator objects");
   
   subfolder =
-    configuration_mc->AddFolder ("VirtualMC", "the Virtual MC");
+    configurationMC->AddFolder ("VirtualMC", "the Virtual MC");
   
-  TFolder *event_mc =
-    run_mc->AddFolder ("Event", "MonteCarlo event folders");
+  TFolder *eventMC =
+    runMC->AddFolder ("Event", "MonteCarlo event folders");
   
   subfolder =
-    event_mc->AddFolder ("Header", "MonteCarlo event header");
+    eventMC->AddFolder ("Header", "MonteCarlo event header");
   
   //           subfolder =
-  //               event_mc->AddFolder ("Kinematics", "MonteCarlo generated particles");
+  //               eventMC->AddFolder ("Kinematics", "MonteCarlo generated particles");
   
-  TFolder *data_mc =
-    event_mc->AddFolder ("Data", "MonteCarlo data");
+  TFolder *dataMC =
+    eventMC->AddFolder ("Data", "MonteCarlo data");
   
   subfolder = 
-    data_mc->AddFolder ("Hits", "MonteCarlo Hits") ; 
+    dataMC->AddFolder ("Hits", "MonteCarlo Hits") ; 
  
  subfolder = 
-    data_mc->AddFolder ("SDigits", "MonteCarlo SDigits") ; 
+    dataMC->AddFolder ("SDigits", "MonteCarlo SDigits") ; 
 
  subfolder = 
-    data_mc->AddFolder ("TrackReferences", "MonteCarlo track references") ; 
+    dataMC->AddFolder ("TrackReferences", "MonteCarlo track references") ; 
 
 
   
@@ -309,7 +281,7 @@ void    AliConfig::Add (AliGenerator * obj)
 }
 
 //____________________________________________________________________________
-void    AliConfig::Add (AliMC * obj)
+void    AliConfig::Add (TVirtualMC * obj)
 {
   AddInFolder(fMCFolder, obj);
 }
@@ -339,10 +311,10 @@ void    AliConfig::Add (char *list)
 {
   char *path;
   
-  const char   *conf_path = gSystem->Getenv ("ALICE_CONFIG_PATH");
-  if  (conf_path) {
-    path = new char[strlen (conf_path)];
-    strcpy (path, conf_path);
+  const char   *confPath = gSystem->Getenv ("ALICE_CONFIG_PATH");
+  if  (confPath) {
+    path = new char[strlen (confPath)];
+    strcpy (path, confPath);
   } else {
     const char   *alice = gSystem->Getenv ("ALICE_ROOT");
     path = new char[strlen (alice) + 32];