Introducing Riostream.h

diff --git a/STEER/AliConfig.cxx b/STEER/AliConfig.cxx
index 66309de03834845e91fe9f948324d45f66a4ae73..2064e8a9ac6b0d0ee64b380bc7ab1db4ce686bec 100644 (file)
--- a/STEER/AliConfig.cxx
+++ b/STEER/AliConfig.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+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.3.8.1  2002/06/10 14:43:06  hristov
 Merged with v3-08-02
 


@@ -32,17 +35,22 @@ New files for folders and Stack
 
 */
 
 
 */
 

+#include <Riostream.h>
+#include <TDatabasePDG.h>
+#include <TFolder.h>
+#include <TInterpreter.h>
+#include <TROOT.h>
+#include <TSystem.h>
+

 #include "AliConfig.h"
 #include "AliDetector.h"
 #include "AliConfig.h"
 #include "AliDetector.h"

+#include "AliGenerator.h" 

 #include "TObjString.h" 
 #include "TString.h"
 #include "TTask.h" 
 #include "TObjString.h" 
 #include "TString.h"
 #include "TTask.h" 

-#include "AliGenerator.h" 
-#include "AliMC.h" 

 
 ClassImp(AliConfig)
 
 
 ClassImp(AliConfig)
 

-

 AliConfig* AliConfig::fInstance = 0;
 
 //____________________________________________________________________________
 AliConfig* AliConfig::fInstance = 0;
 
 //____________________________________________________________________________


@@ -51,28 +59,70 @@ AliConfig* AliConfig::Instance ()
   //
   // Instance method for singleton class
   //
   //
   // Instance method for singleton class
   //

-        if(fInstance == 0) {
-                   fInstance = new AliConfig ("Folders","Alice data exchange");
-               }
-               return fInstance;
+  if(!fInstance) fInstance = new AliConfig ("Folders","Alice data exchange");
+
+  return fInstance;
+}
+
+//____________________________________________________________________________
+AliConfig::AliConfig(): TNamed("","")
+{
+  //
+  // Default constructor, mainly to keep coding conventions
+  //
+  fTopFolder=0;
+  fTasks=0;
+
+  fPDGFolder=0; 
+  fGeneratorFolder=0; 
+  fMCFolder=0; 
+  fModuleFolder=0; 
+  fDetectorFolder=0;
+  fDetectorTask=0; 
+  fInstance=0;
+    
+  Fatal("ctor",
+   "Constructor should not be called for a singleton\n");

 }
 
 }
 

+//____________________________________________________________________________
+AliConfig::AliConfig(const AliConfig&): TNamed("","")
+{
+  //
+  // Copy constructor, mainly to keep coding conventions
+  //
+  fTopFolder=0;
+  fTasks=0;
+
+  fPDGFolder=0; 
+  fGeneratorFolder=0; 
+  fMCFolder=0; 
+  fModuleFolder=0; 
+  fDetectorFolder=0;
+  fDetectorTask=0; 
+  fInstance=0;
+    
+  Fatal("copy ctor",
+   "Copy constructor should not be called for a singleton\n");
+}

 
 

-AliConfig::AliConfig(const char *name, const char *title)
+//____________________________________________________________________________
+AliConfig::AliConfig(const char *name, const char *title): 
+  TNamed(name,title), 
+  fTopFolder(gROOT->GetRootFolder ()->AddFolder (name,title)),
+  fTasks(0),
+  fPDGFolder("Constants/DatabasePDG"),
+  fGeneratorFolder("RunMC/Configuration/Generators"),
+  fMCFolder("RunMC/Configuration/VirtualMC"),
+  fModuleFolder("Run/Configuration/Modules"),
+  fDetectorFolder(new char*[kFolders]),
+  fDetectorTask(new char*[kTasks])

 {
   //
   // Constructor
   //
 {
   //
   // Constructor
   //

-  //

   fInstance=this;
   fInstance=this;

-  SetName(name) ; 
-  SetTitle(title) ; 
-  
-  fPDGFolder         =  "Constants/DatabasePDG" ;
-  fGeneratorFolder   =  "RunMC/Configuration/Generators" ;
-  fMCFolder          =  "RunMC/Configuration/VirtualMC" ;
-  fModuleFolder      =  "Run/Configuration/Modules" ;
-  fDetectorFolder    =  new char*[8] ; 
+  

   fDetectorFolder[0] = "Run/Conditions/Calibration" ;
   fDetectorFolder[1] = "Run/Event/Data" ;
   fDetectorFolder[2] = "Run/Event/RecData" ;
   fDetectorFolder[0] = "Run/Conditions/Calibration" ;
   fDetectorFolder[1] = "Run/Event/Data" ;
   fDetectorFolder[2] = "Run/Event/RecData" ;


@@ -81,14 +131,12 @@ AliConfig::AliConfig(const char *name, const char *title)
   fDetectorFolder[5] = "Run/Conditions/QA" ;  
   fDetectorFolder[6] = "RunMC/Event/Data/TrackReferences" ;  
   fDetectorFolder[7] = 0 ;  
   fDetectorFolder[5] = "Run/Conditions/QA" ;  
   fDetectorFolder[6] = "RunMC/Event/Data/TrackReferences" ;  
   fDetectorFolder[7] = 0 ;  

-  fDetectorTask    =  new char*[5] ; 

   fDetectorTask[0] = "Tasks/QA" ;  
   fDetectorTask[1] = "Tasks/SDigitizer" ;  
   fDetectorTask[2] = "Tasks/Digitizer" ;  
   fDetectorTask[3] = "Tasks/Reconstructioner" ;  
   fDetectorTask[4] = 0 ;  
 
   fDetectorTask[0] = "Tasks/QA" ;  
   fDetectorTask[1] = "Tasks/SDigitizer" ;  
   fDetectorTask[2] = "Tasks/Digitizer" ;  
   fDetectorTask[3] = "Tasks/Reconstructioner" ;  
   fDetectorTask[4] = 0 ;  
 

-  fTopFolder = gROOT->GetRootFolder ()->AddFolder (name,title);

   fTopFolder->SetOwner() ; 
   gROOT->GetListOfBrowsables ()->Add (fTopFolder, name);
   
   fTopFolder->SetOwner() ; 
   gROOT->GetListOfBrowsables ()->Add (fTopFolder, name);
   


@@ -195,7 +243,7 @@ AliConfig::~AliConfig()
 }
 
 //____________________________________________________________________________
 }
 
 //____________________________________________________________________________

-void    AliConfig::AddInFolder (char *dir, TObject *obj)
+void AliConfig::AddInFolder (char *dir, TObject *obj)

 {
   TFolder *folder =
     dynamic_cast<TFolder *>(fTopFolder->FindObject(dir));
 {
   TFolder *folder =
     dynamic_cast<TFolder *>(fTopFolder->FindObject(dir));

diff --git a/STEER/AliConfig.h b/STEER/AliConfig.h
index 994a15c51ebed6149f78c9302742588e44f1bbfb..4b1572b1de13c1e1048aad1bb9a2f57bbd913212 100644 (file)
--- a/STEER/AliConfig.h
+++ b/STEER/AliConfig.h
@@ -6,6 +6,9 @@
 /* $Id$ */
 /* 
  * $Log$
 /* $Id$ */
 /* 
  * $Log$

+ * Revision 1.5  2002/10/14 14:57:32  hristov
+ * Merging the VirtualMC branch to the main development branch (HEAD)
+ *

  * Revision 1.4.8.1  2002/06/10 14:43:06  hristov
  * Merged with v3-08-02
  *
  * Revision 1.4.8.1  2002/06/10 14:43:06  hristov
  * Merged with v3-08-02
  *


@@ -23,31 +26,23 @@
  * 
  */
 
  * 
  */
 

-#include <iostream.h>
-#include <TFolder.h>
-#include <TList.h>
-#include <TInterpreter.h>
-#include <TROOT.h>
-#include <TSystem.h>
-#include <TDatabasePDG.h>

 #include "AliMC.h"
 #include "AliMC.h"

-class TString ; 
+
+class TDatabasePDG;
+class TFolder;
+class TString;
+
+class AliConfig;
+class AliDetector;

 class AliGenerator;
 class AliModule;
 class AliGenerator;
 class AliModule;

-class AliDetector;
-class AliConfig;

 class AliTasks;
 
 class AliConfig : public TNamed {
   
 public:
 class AliTasks;
 
 class AliConfig : public TNamed {
   
 public:

-  
-  AliConfig(){ 
-    // ctor: this is a singleton, the ctor should never be called but cint needs it as public
-    cerr << "ERROR: AliConfig is a singleton default ctor not callable" << endl ;
-    abort() ; 
-  } 
-  
+
+  AliConfig();

   virtual ~ AliConfig ();
   
   void  Add (AliGenerator *generator);
   virtual ~ AliConfig ();
   
   void  Add (AliGenerator *generator);


@@ -61,11 +56,15 @@ public:
   static AliConfig* Instance();
   
 private:
   static AliConfig* Instance();
   
 private:

-  AliConfig(const char * name, const char * title );
+
+  enum {kFolders=8, kTasks=5};
+  AliConfig(const char * name, const char * title);
+  AliConfig(const AliConfig&);

   void  AddInFolder (char * dir, TObject *obj);
   void  AddSubFolder(char * dir[], TObject *obj);
   void  AddSubTask(char * dir[], TObject *obj);
   void  AddInFolder (char * dir, TObject *obj);
   void  AddSubFolder(char * dir[], TObject *obj);
   void  AddSubTask(char * dir[], TObject *obj);

- TObject* FindInFolder (char *dir, const char *name);
+  TObject* FindInFolder (char *dir, const char *name);
+  AliConfig& operator = (const AliConfig&) {return *this;}

   
   TFolder  *fTopFolder;
   AliTasks *fTasks;
   
   TFolder  *fTopFolder;
   AliTasks *fTasks;


@@ -77,7 +76,6 @@ private:
   char** fDetectorFolder ; 
   char** fDetectorTask ; 
 
   char** fDetectorFolder ; 
   char** fDetectorTask ; 
 

-

   static AliConfig*  fInstance;
     
     ClassDef(AliConfig,1) //Configuration class for AliRun
   static AliConfig*  fInstance;
     
     ClassDef(AliConfig,1) //Configuration class for AliRun

diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx
index 0066c305a2dbdb35cf0c19f3cc2176a844f52848..0ed3ddcf89cd4f1d7427ab60ed3765f6197cc906 100644 (file)
--- a/STEER/AliDetector.cxx
+++ b/STEER/AliDetector.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.20  2002/10/14 14:57:32  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.16.8.3  2002/10/14 09:45:57  hristov
 Updating VirtualMC to v3-09-02
 
 Revision 1.16.8.3  2002/10/14 09:45:57  hristov
 Updating VirtualMC to v3-09-02
 


@@ -84,7 +87,7 @@ Introduction of the Copyright and cvs Log
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <assert.h>
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <assert.h>

-#include <iostream.h>
+#include <Riostream.h>

 
 #include <TTree.h>
 #include <TBrowser.h>
 
 #include <TTree.h>
 #include <TBrowser.h>

diff --git a/STEER/AliDigitizer.cxx b/STEER/AliDigitizer.cxx
index 196a79aed8cd912d5d5d5a086a1427afe80edb95..b5fdd2932df90c35dcd6aacc451edcc210b4b411 100644 (file)
--- a/STEER/AliDigitizer.cxx
+++ b/STEER/AliDigitizer.cxx
@@ -23,6 +23,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.5  2002/10/14 14:57:32  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.3.6.1  2002/07/24 10:08:13  alibrary
 Updating VirtualMC
 
 Revision 1.3.6.1  2002/07/24 10:08:13  alibrary
 Updating VirtualMC
 


@@ -41,7 +44,7 @@ ABC for detector digits merging/digitization
 */
 
 // system includes
 */
 
 // system includes

-#include <iostream.h>
+#include <Riostream.h>

 
 // ROOT includes
 
 
 // ROOT includes
 

diff --git a/STEER/AliESD.cxx b/STEER/AliESD.cxx
index 658cc9f29b09be1195690dee01a4b182b1f8fcf0..9be1bceb66fffd3c6c6a77a520ceb32a8bc6cb13 100644 (file)
--- a/STEER/AliESD.cxx
+++ b/STEER/AliESD.cxx
@@ -22,7 +22,7 @@ $Log:
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 

-#include "iostream.h"
+#include "Riostream.h"

 
 #include "AliESD.h"
 
 
 #include "AliESD.h"
 

diff --git a/STEER/AliGausCorr.cxx b/STEER/AliGausCorr.cxx
index 15f8f2663e7f75d4ba1fb350e16a507bb556b891..7cd2c06e87abd78d47dff2eb3c4f89a102c2352d 100644 (file)
--- a/STEER/AliGausCorr.cxx
+++ b/STEER/AliGausCorr.cxx
@@ -21,7 +21,7 @@
 // Rep. Prog. Phys. 43 (1980) 1145-1189. 
 // M.Masera 15.03.2001 9:30 - modified on 26.02.2002 17:40
 ////////////////////////////////////////////////////////////////////////
 // Rep. Prog. Phys. 43 (1980) 1145-1189. 
 // M.Masera 15.03.2001 9:30 - modified on 26.02.2002 17:40
 ////////////////////////////////////////////////////////////////////////

-#include <iostream.h>
+#include <Riostream.h>

 #include <TArrayD.h>
 #include <TMatrixD.h>
 #include <TRandom.h>
 #include <TArrayD.h>
 #include <TMatrixD.h>
 #include <TRandom.h>

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index bf044a31a3b14e4227ff9f1b5dc3d6209ed61706..6d495aa69fad302931c6a4d92f27d8574c62b490 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.89  2002/10/17 16:26:39  hristov
+Definition of additional particles moved to VMC (I.Hrivnacova)
+

 Revision 1.88  2002/10/14 14:57:32  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
 Revision 1.88  2002/10/14 14:57:32  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 


@@ -259,7 +262,7 @@ Introduction of the Copyright and cvs Log
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

-#include <iostream.h>
+#include <Riostream.h>

  
 #include <TFile.h>
 #include <TRandom.h>
  
 #include <TFile.h>
 #include <TRandom.h>


@@ -2192,7 +2195,7 @@ TFile* AliRun::InitTreeFile(Option_t *option, TString fileName)
     }
     return ptr;
   }
     }
     return ptr;
   }

-
+  return 0;

 }
 
 //___________________________________________________________________________
 }
 
 //___________________________________________________________________________

diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx
index 6d2638167f263bfd8e1760d5d3cba6adcd761d5a..2b28e3406be86d87ffa0ad8d2f551b63cb374188 100644 (file)
--- a/STEER/AliRunDigitizer.cxx
+++ b/STEER/AliRunDigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.20  2002/10/14 14:57:32  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.13.6.2  2002/07/24 10:08:13  alibrary
 Updating VirtualMC
 
 Revision 1.13.6.2  2002/07/24 10:08:13  alibrary
 Updating VirtualMC
 


@@ -146,7 +149,7 @@ Manager class for merging/digitization
 
 // system includes
 
 
 // system includes
 

-#include <iostream.h>
+#include <Riostream.h>

 
 // ROOT includes
 
 
 // ROOT includes
 

diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx
index e9f12d0b3cb63a2b56ee87c896645c576e8d51cf..85b130305489b1027734ff2088ca1af1315c5896 100644 (file)
--- a/STEER/AliStack.cxx
+++ b/STEER/AliStack.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.23  2002/10/14 14:57:32  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.19.4.2  2002/08/28 15:06:52  alibrary
 Updating to v3-09-01
 
 Revision 1.19.4.2  2002/08/28 15:06:52  alibrary
 Updating to v3-09-01
 


@@ -86,7 +89,7 @@ New files for folders and Stack
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 

-#include <iostream.h>
+#include <Riostream.h>

  
 #include <TObjArray.h>
 #include <TParticle.h>
  
 #include <TObjArray.h>
 #include <TParticle.h>

diff --git a/STEER/AliStream.cxx b/STEER/AliStream.cxx
index 57a27a8cd50469c13749a5184cc99ce9d15af323..d7ca520a4c15b4e0f4dc86dd926e2bde351e1f82 100644 (file)
--- a/STEER/AliStream.cxx
+++ b/STEER/AliStream.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.7  2002/10/14 14:57:33  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.4.6.2  2002/07/24 10:08:13  alibrary
 Updating VirtualMC
 
 Revision 1.4.6.2  2002/07/24 10:08:13  alibrary
 Updating VirtualMC
 


@@ -49,7 +52,7 @@ Class to manage input filenames, used by AliRunDigitizer
 //
 ////////////////////////////////////////////////////////////////////////
 
 //
 ////////////////////////////////////////////////////////////////////////
 

-#include <iostream.h>
+#include <Riostream.h>

 
 #include "TTree.h"
 #include "TROOT.h"
 
 #include "TTree.h"
 #include "TROOT.h"

diff --git a/STEER/AliTrackMap.cxx b/STEER/AliTrackMap.cxx
index 44a8d3956cd74f257b3751e8e8e929879b12af8b..147579fba329bf25ddeb12c9adaea2163b322800 100644 (file)
--- a/STEER/AliTrackMap.cxx
+++ b/STEER/AliTrackMap.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.2  2002/10/14 14:57:33  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.1.2.1  2002/10/14 09:45:57  hristov
 Updating VirtualMC to v3-09-02
 
 Revision 1.1.2.1  2002/10/14 09:45:57  hristov
 Updating VirtualMC to v3-09-02
 


@@ -40,7 +43,7 @@ Classes to create and store tracks maps - correcpondence between track label and
 //
 ////////////////////////////////////////////////////////////////////////
 
 //
 ////////////////////////////////////////////////////////////////////////
 

-#include <iostream.h>
+#include <Riostream.h>

 
 #include "TTree.h"
 #include "TROOT.h"
 
 #include "TTree.h"
 #include "TROOT.h"

diff --git a/STEER/AliTrackMapper.cxx b/STEER/AliTrackMapper.cxx
index 025bae2494d1df480b88a60ff96c1810fff0412d..1ab5fa62c13c342eb999c4afa5c3e497e84264d6 100644 (file)
--- a/STEER/AliTrackMapper.cxx
+++ b/STEER/AliTrackMapper.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.3  2002/10/14 14:57:33  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.2.2.1  2002/10/14 09:45:57  hristov
 Updating VirtualMC to v3-09-02
 
 Revision 1.2.2.1  2002/10/14 09:45:57  hristov
 Updating VirtualMC to v3-09-02
 


@@ -36,7 +39,7 @@ Classes to create and store tracks maps - correcpondence between track label and
 //
 ////////////////////////////////////////////////////////////////////////
 
 //
 ////////////////////////////////////////////////////////////////////////
 

-#include <iostream.h>
+#include <Riostream.h>

 
 #include "TTree.h"
 #include "TROOT.h"
 
 #include "TTree.h"
 #include "TROOT.h"

diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index 0230cb1f3bca7f791bf855e5a07911766b8e9d35..078b051690210b3551e5b946ce3bc4c0fe72a29e 100644 (file)
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.23  2002/10/14 14:57:39  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+

 Revision 1.19.4.2  2002/10/11 08:04:28  hristov
 Updating VirtualMC to v3-09-02
 
 Revision 1.19.4.2  2002/10/11 08:04:28  hristov
 Updating VirtualMC to v3-09-02
 


@@ -95,7 +98,7 @@ Introduction of the Copyright and cvs Log
 #include "AliMC.h"
 #include "TSystem.h"
 
 #include "AliMC.h"
 #include "TSystem.h"
 

-#include <iostream.h>
+#include <Riostream.h>

  
 ClassImp(AliPIPEv0)
  
  
 ClassImp(AliPIPEv0)