Compatibility with ROOT trunk

[u/mrichter/AliRoot.git] / T0 / AliT0Align.cxx

diff --git a/T0/AliT0Align.cxx b/T0/AliT0Align.cxx
index d1f5021307b87ea841a766355e3e6881b9343de4..29022ca235e81455d07db05952b3136ac2e2eb87 100644 (file)
--- a/T0/AliT0Align.cxx
+++ b/T0/AliT0Align.cxx
@@ -28,6 +28,7 @@ Preliminary test version (T.Malkiewicz)
 #include "TFile.h"
 #include "TMath.h"
 #include "TSystem.h"
+#include "TString.h"
 #include "AliSurveyObj.h"
 #include "AliAlignObjParams.h"
 #include "AliCDBStorage.h"
@@ -43,7 +44,8 @@ Preliminary test version (T.Malkiewicz)
 // Survey Depot, based on survey results 
 // position of T0 alignment objects is computed.
 
-
+using std::endl;
+using std::cout;
 ClassImp(AliT0Align)
 
 AliT0Align::AliT0Align() :
@@ -87,15 +89,18 @@ AliT0Align::AliT0Align(Int_t reportloc, Int_t side, Int_t reportglob) :
   fRepLoc = reportloc;
   fRepGlob = reportglob;
   fSide = side;
-  Char_t path[50];
-  fFileGlob = new Char_t[80];
-  fUser = new Char_t[10];
-  sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
+  // Char_t path[50];
+  TString path = Form("%s",gSystem->Getenv("ALICE_ROOT")) ;
+  // fFileGlob = new Char_t[80];
+  //  fUser = new Char_t[10];
+  fFileGlob = Form("%s/T0/Survey_%d_V0.txt",path.Data(),reportglob);
+  fUser = Form("%s/T0/Survey_%d_V0.txt",path.Data(),reportglob);
+  // sprintf(path,gSystem->Getenv("ALICE_ROOT")); 
   //
   // sprintf(fFileLoc,"%s/T0/Survey_%d_T0.txt",path,reportloc);
-  sprintf(fFileGlob,"%s/T0/Survey_%d_V0.txt",path,reportglob);
+  // sprintf(fFileGlob,"%s/T0/Survey_%d_V0.txt",path,reportglob);
   //
-  sprintf(fUser,gSystem->Getenv("alien_API_USER"));
+  // sprintf(fUser,gSystem->Getenv("alien_API_USER"));
 }
 //_________________________________________________________________________
 AliT0Align::AliT0Align(const AliT0Align &align) :
@@ -116,7 +121,8 @@ AliT0Align::AliT0Align(const AliT0Align &align) :
   //
   //  copy constructor - dummy
   //
-  // fDebug = align.fDebug;
+  ((AliT0Align &) align).Copy(*this);
+
 }
 //__________________________________________________________________________
 AliT0Align & AliT0Align::operator =(const AliT0Align & align)
@@ -124,8 +130,9 @@ AliT0Align & AliT0Align::operator =(const AliT0Align & align)
   //
   // assignment operator - dummy
   //
-  // fDebug=align.fDebug;
-  return (*this);
+  if (this != &align) ((AliT0Align &) align).Copy(*this);
+
+   return (*this);
 }
 
 //__________________________________________________________________________
@@ -192,13 +199,13 @@ Bool_t AliT0Align::LoadSurveyData()
      surveyedPoints[i][1]=currPoint->GetY();
    //  surveyedPoints[i]=currPoint->GetZ();
      if(fDebug)
-     Printf(Form("INFO: Point \"%s\" coordinates read.", pointNames[i].Data()));
+     Printf("INFO: Point %s coordinates read.\n", pointNames[i].Data() ) ;
    }
    else 
    {
      if(fDebug)
      {
-       Printf(Form("ERROR: Essential point missing: \"%s\"", pointNames[i].Data()));
+       Printf("ERROR: Essential point missing: %s\n", pointNames[i].Data() ) ;
        return 1;
      }
    }  
@@ -292,9 +299,10 @@ void AliT0Align::StoreAlignObj()
   if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save on file
     const char* filename = "T0SurveyMisalignment.root";
-    Char_t fullname[80];
-    sprintf(fullname,"%s/T0/Align/Data/%s",gSystem->Getenv("ALICE_ROOT"),filename);
-    TFile *f = new TFile(fullname,"RECREATE");
+    //  Char_t fullname[80];
+    //  sprintf(fullname,"%s/T0/Align/Data/%s",gSystem->Getenv("ALICE_ROOT"),filename);
+    TString fullname = Form("%s/T0/Align/Data/%s",gSystem->Getenv("ALICE_ROOT"), filename);
+    TFile *f = new TFile(fullname.Data(),"RECREATE");
     if(!f){
       AliError("cannot open file for output\n");
       return;