Add run number in ntuple (Gian Michele)

[u/mrichter/AliRoot.git] / PHOS / AliPHOSDApi0mip.cxx

diff --git a/PHOS/AliPHOSDApi0mip.cxx b/PHOS/AliPHOSDApi0mip.cxx
index cd1c3d8049eb53af1ffe55f3e7e864bd5c3c9c24..a2e97fba8d72f8f7b0ee292c4578fbdc8c1f30b9 100644 (file)
--- a/PHOS/AliPHOSDApi0mip.cxx
+++ b/PHOS/AliPHOSDApi0mip.cxx
@@ -12,7 +12,7 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-/* $Id:$*/
+/* $Id$ */
 
 // --
 // --
@@ -29,7 +29,7 @@
 #include "AliPHOSDApi0mip.h"
 ClassImp(AliPHOSDApi0mip)
 //----------------------------------------------------------------
-AliPHOSDApi0mip::AliPHOSDApi0mip(int module,int iterid,char* fopt) :
+AliPHOSDApi0mip::AliPHOSDApi0mip(int module,int iterid,const char* fopt) :
   TNamed(), fCreateTree(false), fCreateHist(false), fMod(0), fIterId(0),
   fTFile(0), fTTree(0), fEvent(0), fEventClustered(0), fTime(0),
   fH1Time(0), fH1DigitNum(0), fH1ClusterNum(0),
@@ -37,9 +37,13 @@ AliPHOSDApi0mip::AliPHOSDApi0mip(int module,int iterid,char* fopt) :
   // Constructor
 
   char hname[1024], htitle[1024];
-  sprintf(hname,"AliPHOSDApi0mip_mod%d_iter%d",module,iterid);
+
+  TString shname="AliPHOSDApi0mip_mod%d_iter%d";
+  snprintf(hname,shname.Length(),shname.Data(),module,iterid);
   SetName(hname);
-  sprintf(htitle,"PHOS MIP/pi0 Calibration DA for Module:%d Iteration:%d",module,iterid);
+
+  TString shtitle="PHOS MIP/pi0 Calibration DA for Module:%d Iteration:%d";
+  snprintf(htitle,shtitle.Length(),shtitle.Data(),module,iterid);
   SetTitle(htitle);
 
   fMod = module;
@@ -51,7 +55,9 @@ AliPHOSDApi0mip::AliPHOSDApi0mip(int module,int iterid,char* fopt) :
   fCreateHist = false;
 
   char fname[1024];
-  sprintf(fname,"AliPHOSDApi0mip_mod%d.root",module);
+
+  TString sfname="AliPHOSDApi0mip_mod%d.root";
+  snprintf(fname,sfname.Length(),sfname.Data(),module);
   fTFile = TFile::Open(fname,fopt);
 }
 //----------------------------------------------------------------
@@ -63,7 +69,9 @@ AliPHOSDApi0mip::AliPHOSDApi0mip(const AliPHOSDApi0mip& da):
   // Copy Constructor
 
   char fname[1024], hname[1024], htitle[1024];;
-  sprintf(fname,"%s.root",GetName());
+
+  TString sfname="%s.root";
+  snprintf(fname,sfname.Length(),sfname.Data(),GetName());
   fTFile = TFile::Open(fname,"RECREATE");
   fEvent = 0;
   fEventClustered = false;
@@ -91,8 +99,13 @@ AliPHOSDApi0mip::AliPHOSDApi0mip(const AliPHOSDApi0mip& da):
   if( da.fCreateTree ){
     // Create new ttree instead of copy.
     fCreateTree = true;
-    sprintf(hname,"tevt_mod%d_iter%d",fMod,fIterId);
-    sprintf(htitle,"Calibration for Module:%d Iteration:%d",fMod,fIterId);
+
+    TString shname="tevt_mod%d_iter%d";
+    snprintf(hname,shname.Length(),shname.Data(),fMod,fIterId);
+
+    TString shtitle="Calibration for Module:%d Iteration:%d";
+    snprintf(htitle,shtitle.Length(),shtitle.Data(),fMod,fIterId);
+
     fTTree = new TTree(hname,htitle);
     fTTree->Branch("AliPHOSDATreeEvent","AliPHOSDATreeEvent",&fEvent);
   } else {
@@ -161,9 +174,9 @@ bool AliPHOSDApi0mip::CreateTree(){
     return false;
   }
   fTFile->cd();
-  char hname[1024], htitle[1024];
-  sprintf(hname,"trevt_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"Calibration for Module:%d Iteration:%d",fMod,fIterId);
+  char hname[100], htitle[100];
+  snprintf(hname,100,"trevt_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"Calibration for Module:%d Iteration:%d",fMod,fIterId);
   fTTree = new TTree(hname,htitle);
   fTTree->Branch("AliPHOSDATreeEvent","AliPHOSDATreeEvent",&fEvent);
   fCreateTree = true;
@@ -173,10 +186,10 @@ bool AliPHOSDApi0mip::CreateTree(){
 bool AliPHOSDApi0mip::CreateHist(){
   // Create histogram routine called by the constructor only.
 
-  char hname[1024], htitle[1024];
+  char hname[100], htitle[100];
 
-  sprintf(hname,"h1_time_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"Time : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h1_time_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"Time : Mod:%d Iter:%d",fMod,fIterId);
   fH1Time = (TH1I*) gDirectory->Get(hname);
   if( fH1Time>0 ){
     std::cout<<" AliPHOSDApi0mip:Warning!! Output object already exist : "<<fH1Time->GetName()<<std::endl;
@@ -184,30 +197,30 @@ bool AliPHOSDApi0mip::CreateHist(){
   }
   fH1Time = new TH1I(hname,htitle,2,0,2);
 
-  sprintf(hname,"h1_digitnum_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"Number of Digits : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h1_digitnum_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"Number of Digits : Mod:%d Iter:%d",fMod,fIterId);
   fH1DigitNum = new TH1F(hname,htitle,100,0,100);
 
-  sprintf(hname,"h1_clusternum_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"Number of Clusters : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h1_clusternum_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"Number of Clusters : Mod:%d Iter:%d",fMod,fIterId);
   fH1ClusterNum = new TH1F(hname,htitle,100,0,100);
 
-  sprintf(hname,"h2_pi0digitid_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"PHOS pi0 mass vs Digit Id : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h2_pi0digitid_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"PHOS pi0 mass vs Digit Id : Mod:%d Iter:%d",fMod,fIterId);
   fH2Pi0DigitId = new TH2F(hname,htitle,17920,0,17920,120,0,0.3);
       
-  sprintf(hname,"h2_mipdigitid_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"PHOS MIP vs Digit Id : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h2_mipdigitid_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"PHOS MIP vs Digit Id : Mod:%d Iter:%d",fMod,fIterId);
   fH2MipDigitId = new TH2F(hname,htitle,17920,0,17920,100,0-0.0025,0.5-0.0025);
   //fH2MipDigitId = new TH2F(hname,htitle,17920,0,17920,50,0.5,1.5);
 
-  sprintf(hname,"h2_enedigitid_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"PHOS MIP vs Digit Id : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h2_enedigitid_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"PHOS MIP vs Digit Id : Mod:%d Iter:%d",fMod,fIterId);
   //fH2EneDigitId = new TH2F(hname,htitle,17920,0,17920,100,0-0.0025,0.5-0.0025);
   fH2EneDigitId = new TH2F(hname,htitle,17920,0,17920,50,0,5.0);
 
-  sprintf(hname,"h3_pi0asympt_mod%d_iter%d",fMod,fIterId);
-  sprintf(htitle,"PHOS pi0 mass vs pT vs Asym : Mod:%d Iter:%d",fMod,fIterId);
+  snprintf(hname,100,"h3_pi0asympt_mod%d_iter%d",fMod,fIterId);
+  snprintf(htitle,100,"PHOS pi0 mass vs pT vs Asym : Mod:%d Iter:%d",fMod,fIterId);
   fH3Pi0AsymPt = new TH3F(hname,htitle,20,0,1,20,0,10,200,0,1);
 
   fCreateHist = true;