Canges to comply with CDB (C.Oppedisano)

[u/mrichter/AliRoot.git] / TOF / AliTOFPID.cxx

diff --git a/TOF/AliTOFPID.cxx b/TOF/AliTOFPID.cxx
index d2a1ff3d6d3fcb3755824141128c2b4ec557e26f..81e7a0a7990613d266354000675ccc37bfd71a18 100644 (file)
--- a/TOF/AliTOFPID.cxx
+++ b/TOF/AliTOFPID.cxx
@@ -73,12 +73,12 @@
 #include "TLeaf.h"
 
 #include "AliConst.h"
-#include "AliTOFConstants.h"
+#include "AliTOFGeometry.h"
 #include "AliTOFPID.h"
 
 #include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <Riostream.h>
+#include <Riostream.h>
 
 ClassImp(AliTOFPID)
 
@@ -95,6 +95,7 @@ ClassImp(AliTOFPID)
   fNtuple   = 0;
   fgen      = 0;
   foutfileName  = 0;
+
 }
            
 //____________________________________________________________________________ 
@@ -114,6 +115,7 @@ ClassImp(AliTOFPID)
   // add Task to //root/Tasks folder
   TTask * roottasks = (TTask*)gROOT->GetRootFolder()->FindObject("Tasks") ; 
   roottasks->Add(this) ; 
+
 }
 //____________________________________________________________________________ 
 void AliTOFPID::Init(const Option_t* opt)
@@ -344,18 +346,18 @@ void AliTOFPID::Exec(const Option_t *eventType, const Option_t *outputmode, cons
   Float_t katrack=0, kamag=0, kageom=0;
   Float_t prtrack=0, prmag=0, prgeom=0;
   Float_t pif=0, kaf=0, prf=0, pin=0, kan=0, prn=0;
-  Float_t px, py, pz, x, y, z, pdgcode, mass;
-  Int_t event, matc, imam;
+  Float_t px, py, pz, x, y, z, mass;
+  Int_t event, matc, imam, pdgcode;
   Int_t indexOfFile=0, numfile=0;
   //////// Loop over tracks (particles)///////////////////////
   
   for (Int_t i=0; i < nparticles; i++) {
     fNtuple->GetEvent(i);
-    event=fNtuple->GetLeaf("event")->GetValue();
-    pdgcode=fNtuple->GetLeaf("ipart")->GetValue();
+    event=(Int_t)(fNtuple->GetLeaf("event")->GetValue());
+    pdgcode=(Int_t)(fNtuple->GetLeaf("ipart")->GetValue());
     mass=fNtuple->GetLeaf("mext")->GetValue(0);
-    matc=fNtuple->GetLeaf("matc")->GetValue(0);
-    imam=fNtuple->GetLeaf("imam")->GetValue(0);
+    matc=(Int_t)(fNtuple->GetLeaf("matc")->GetValue(0));
+    imam=(Int_t)(fNtuple->GetLeaf("imam")->GetValue(0));
     px=fNtuple->GetLeaf("pxvtx")->GetValue(0);
     py=fNtuple->GetLeaf("pyvtx")->GetValue(0);
     pz=fNtuple->GetLeaf("pzvtx")->GetValue(0);
@@ -370,19 +372,19 @@ void AliTOFPID::Exec(const Option_t *eventType, const Option_t *outputmode, cons
     switch(abspdgcode){
     case 321:
       if(isSelected && (matc==3 || matc==4)) kamatch->Fill(pvtx);
-      mt=TMath::Sqrt(AliTOFConstants::fgkKaonMass*AliTOFConstants::fgkKaonMass+px*px+py*py);
+      mt=TMath::Sqrt(AliTOFGeometry::KaonMass()*AliTOFGeometry::KaonMass()+px*px+py*py);
       break;
     case 2212:
       if(isSelected && (matc==2 || matc==3 || matc==4)) prmatch->Fill(pvtx);
-      mt=TMath::Sqrt(AliTOFConstants::fgkProtonMass*AliTOFConstants::fgkProtonMass+px*px+py*py);
+      mt=TMath::Sqrt(AliTOFGeometry::ProtonMass()*AliTOFGeometry::ProtonMass()+px*px+py*py);
       break;
     case 11:
       if(strstr(eventType,"pp") && (matc==3 || matc==4)) elmatch->Fill(pvtx); //  as in kaon case
-      mt=TMath::Sqrt(AliTOFConstants::fgkElectronMass*AliTOFConstants::fgkElectronMass+px*px+py*py);
+      mt=TMath::Sqrt(AliTOFGeometry::ElectronMass()*AliTOFGeometry::ElectronMass()+px*px+py*py);
       break;
     default:
       if(isSelected && matc>0) pimatch->Fill(pvtx);
-      mt=TMath::Sqrt(AliTOFConstants::fgkPionMass*AliTOFConstants::fgkPionMass+px*px+py*py);
+      mt=TMath::Sqrt(AliTOFGeometry::PionMass()*AliTOFGeometry::PionMass()+px*px+py*py);
       break;
     }
 
@@ -1351,7 +1353,7 @@ void AliTOFPID::Exec(const Option_t *eventType, const Option_t *outputmode, cons
 
 
 //__________________________________________________________________
-Bool_t AliTOFPID::operator==( AliTOFPID const & tofrec)const
+Bool_t AliTOFPID::operator==( AliTOFPID const & /*tofrec*/)const
 {
   // dummy version of Equal operator.
   // requested by coding conventions