Fix coding convention violations 2

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx
index 0cdeb697a5b7662160e50658de21b394cf165d15..9e8aef147ece5b9b0a10e99765d4e5136eaaeefd 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx
@@ -281,10 +281,10 @@ AliFemtoString AliFemtoCorrFctnDEtaDPhi::Report(){
 //____________________________
 void AliFemtoCorrFctnDEtaDPhi::AddRealPair( AliFemtoPair* pair){
   // add real (effect) pair
-  double phi1 = pair->Track1()->Track()->P().phi();
-  double phi2 = pair->Track2()->Track()->P().phi();
-  double eta1 = pair->Track1()->Track()->P().pseudoRapidity();
-  double eta2 = pair->Track2()->Track()->P().pseudoRapidity();
+  double phi1 = pair->Track1()->Track()->P().Phi();
+  double phi2 = pair->Track2()->Track()->P().Phi();
+  double eta1 = pair->Track1()->Track()->P().PseudoRapidity();
+  double eta2 = pair->Track2()->Track()->P().PseudoRapidity();
 
   double dphi = phi1 - phi2;
   while (dphi<-TMath::Pi()/2) dphi+=TMath::Pi()*2;
@@ -326,10 +326,10 @@ void AliFemtoCorrFctnDEtaDPhi::AddRealPair( AliFemtoPair* pair){
 //____________________________
 void AliFemtoCorrFctnDEtaDPhi::AddMixedPair( AliFemtoPair* pair){
   // add mixed (background) pair
-  double phi1 = pair->Track1()->Track()->P().phi();
-  double phi2 = pair->Track2()->Track()->P().phi();
-  double eta1 = pair->Track1()->Track()->P().pseudoRapidity();
-  double eta2 = pair->Track2()->Track()->P().pseudoRapidity();
+  double phi1 = pair->Track1()->Track()->P().Phi();
+  double phi2 = pair->Track2()->Track()->P().Phi();
+  double eta1 = pair->Track1()->Track()->P().PseudoRapidity();
+  double eta2 = pair->Track2()->Track()->P().PseudoRapidity();
 
   double dphi = phi1 - phi2;
   while (dphi<-TMath::Pi()/2) dphi+=TMath::Pi()*2;

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx
index 8c5f30cfaf982dbf960332e3645a5ae18b72f89a..7f90cf0adee911b3bc6df829aa8726478e63a888 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx
@@ -679,6 +679,9 @@ void AliFemtoCorrFctnDirectYlm::Write()
 TList* AliFemtoCorrFctnDirectYlm::GetOutputList()
 {
   // Prepare the list of objects to be written to the output
+  if ((!fcovnum) || (!fcovden))
+    PackCovariances();
+
   TList *tOutputList = new TList();
 
   for (int ilm=0; ilm<fMaxJM; ilm++) {
@@ -846,23 +849,26 @@ void AliFemtoCorrFctnDirectYlm::PackCovariances()
   char bufname[200];
   sprintf(bufname, "CovNum%s", fnumsreal[0]->GetName()+10);
 
-  if (fcovnum) delete fcovnum;
-  fcovnum = new TH3D(bufname,bufname, 
-                   fnumsreal[0]->GetNbinsX(), fnumsreal[0]->GetXaxis()->GetXmin(), fnumsreal[0]->GetXaxis()->GetXmax(),
-                   GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5,
-                   GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5);
+  //  if (fcovnum) delete fcovnum;
+  if (!fcovnum) 
+    fcovnum = new TH3D(bufname,bufname, 
+                      fnumsreal[0]->GetNbinsX(), fnumsreal[0]->GetXaxis()->GetXmin(), fnumsreal[0]->GetXaxis()->GetXmax(),
+                      GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5,
+                      GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5);
   
   for (int ibin=1; ibin<=fcovnum->GetNbinsX(); ibin++)
     for (int ilmz=0; ilmz<GetMaxJM()*2; ilmz++)
       for (int ilmp=0; ilmp<GetMaxJM()*2; ilmp++)
        fcovnum->SetBinContent(ibin, ilmz+1, ilmp+1, fcovmnum[GetBin(ibin-1, ilmz/2, ilmz%2, ilmp/2, ilmp%2)]);
 
-  if (fcovden) delete fcovden;
   sprintf(bufname, "CovDen%s", fnumsreal[0]->GetName()+10);
-  fcovden  = new TH3D(bufname,bufname, 
-                    fdensreal[0]->GetNbinsX(), fdensreal[0]->GetXaxis()->GetXmin(), fdensreal[0]->GetXaxis()->GetXmax(),
-                    GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5,
-                    GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5);
+
+  //  if (fcovden) delete fcovden;
+  if (!fcovden)
+    fcovden  = new TH3D(bufname,bufname, 
+                       fdensreal[0]->GetNbinsX(), fdensreal[0]->GetXaxis()->GetXmin(), fdensreal[0]->GetXaxis()->GetXmax(),
+                       GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5,
+                       GetMaxJM()*2, -0.5, GetMaxJM()*2 - 0.5);
                     
   for (int ibin=1; ibin<=fcovden->GetNbinsX(); ibin++)
     for (int ilmz=0; ilmz<GetMaxJM()*2; ilmz++)

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx
index c1a1fb39f7aa7972a4e9a4155631852f01f3b50a..abba49891f635b89845395f389e8ccd1f2a8a794 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx
@@ -106,7 +106,7 @@ void AliFemtoCutMonitorParticleEtCorr::Fill(const AliFemtoTrack* aTrack)
   //  float tRapidity = 0.5*::log((tEnergy+aTrack->P().z())/(tEnergy-aTrack->P().z()));
   float tPt = ::sqrt((aTrack->P().x())*(aTrack->P().x())+(aTrack->P().y())*(aTrack->P().y()));
   //  float tEta = -TMath::Log(TMath::Tan(aTrack->P().theta()/2.0));
-  float tPhi = aTrack->P().phi();
+  float tPhi = aTrack->P().Phi();
   Double_t tPiTwo = TMath::Pi()*2;
 
   while (tPhi > tPiTwo) tPhi -= tPiTwo;

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx
index 2e65281c73dc5d53139b484e6b5a7c04029507a3..b27b37d2f92c9d35748c44ed233e7fabf3fae2d7 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx
@@ -136,17 +136,17 @@ void AliFemtoCutMonitorParticleMomRes::Fill(const AliFemtoTrack* aTrack)
                    tInf->GetTrueMomentum()->y() - aTrack->P().y(),
                    tInf->GetTrueMomentum()->z() - aTrack->P().z());
     
-    fMomResXvsP->Fill(aTrack->P().mag(),
+    fMomResXvsP->Fill(aTrack->P().Mag(),
                      tInf->GetTrueMomentum()->x() - aTrack->P().x());
-    fMomResYvsP->Fill(aTrack->P().mag(),
+    fMomResYvsP->Fill(aTrack->P().Mag(),
                      tInf->GetTrueMomentum()->y() - aTrack->P().y());
-    fMomResZvsP->Fill(aTrack->P().mag(),
+    fMomResZvsP->Fill(aTrack->P().Mag(),
                      tInf->GetTrueMomentum()->z() - aTrack->P().z());
-    fImpactXY->Fill(aTrack->P().mag(),
+    fImpactXY->Fill(aTrack->P().Mag(),
                    aTrack->ImpactD());
-    fImpactZ->Fill(aTrack->P().mag(),
+    fImpactZ->Fill(aTrack->P().Mag(),
                   aTrack->ImpactZ());
-    fSigma->Fill(aTrack->P().mag(),
+    fSigma->Fill(aTrack->P().Mag(),
                 aTrack->SigmaToVertex());
   }
 }

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx
index 199b6aeea7e72ba2cef77fe03c4b05213cf9e2cc..fed1775ad893978722edebd370bd7b600ae73130 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx
@@ -211,29 +211,29 @@ bool AliFemtoESDTrackCut::Pass(const AliFemtoTrack* track)
   Bool_t tITSPidIn = (track->Flags()&AliFemtoTrack::kITSpid)>0;
   Bool_t tTOFPidIn = (track->Flags()&AliFemtoTrack::kTOFpid)>0;
   
-  if(fMinPforTOFpid > 0 && track->P().mag() > fMinPforTOFpid &&
-     track->P().mag() < fMaxPforTOFpid && !tTOFPidIn)
+  if(fMinPforTOFpid > 0 && track->P().Mag() > fMinPforTOFpid &&
+     track->P().Mag() < fMaxPforTOFpid && !tTOFPidIn)
     {
       fNTracksFailed++;
       return false;
     }
   
-  if(fMinPforTPCpid > 0 && track->P().mag() > fMinPforTPCpid &&
-     track->P().mag() < fMaxPforTPCpid && !tTPCPidIn)
+  if(fMinPforTPCpid > 0 && track->P().Mag() > fMinPforTPCpid &&
+     track->P().Mag() < fMaxPforTPCpid && !tTPCPidIn)
     {
       fNTracksFailed++;
       return false;
     }
   
-  if(fMinPforITSpid > 0 && track->P().mag() > fMinPforITSpid &&
-     track->P().mag() < fMaxPforITSpid && !tITSPidIn)
+  if(fMinPforITSpid > 0 && track->P().Mag() > fMinPforITSpid &&
+     track->P().Mag() < fMaxPforITSpid && !tITSPidIn)
     {
       fNTracksFailed++;
       return false;
     }
   
 
-  float tEnergy = ::sqrt(track->P().mag2()+fMass*fMass);
+  float tEnergy = ::sqrt(track->P().Mag2()+fMass*fMass);
   float tRapidity = 0.5*::log((tEnergy+track->P().z())/(tEnergy-track->P().z()));
   float tPt = ::sqrt((track->P().x())*(track->P().x())+(track->P().y())*(track->P().y()));
   if ((tRapidity<fRapidity[0])||(tRapidity>fRapidity[1]))
@@ -296,11 +296,11 @@ bool AliFemtoESDTrackCut::Pass(const AliFemtoTrack* track)
     }
 
   if (fMostProbable) {
-    tMost[0] = track->PidProbElectron()*PidFractionElectron(track->P().mag());
+    tMost[0] = track->PidProbElectron()*PidFractionElectron(track->P().Mag());
     tMost[1] = 0.0;
-    tMost[2] = track->PidProbPion()*PidFractionPion(track->P().mag());
-    tMost[3] = track->PidProbKaon()*PidFractionKaon(track->P().mag());
-    tMost[4] = track->PidProbProton()*PidFractionProton(track->P().mag());
+    tMost[2] = track->PidProbPion()*PidFractionPion(track->P().Mag());
+    tMost[3] = track->PidProbKaon()*PidFractionKaon(track->P().Mag());
+    tMost[4] = track->PidProbProton()*PidFractionProton(track->P().Mag());
     int imost=0;
     float ipidmax = 0.0;
     for (int ip=0; ip<5; ip++)

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx
index d5aa9a1ae7919b94a1a87c1bc628464156cc975e..bf6028b0d5219031d57a066178d95e24d290bde0 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx
@@ -353,10 +353,10 @@ AliFemtoString AliFemtoModelCorrFctnDEtaDPhi::Report(){
 //____________________________
 void AliFemtoModelCorrFctnDEtaDPhi::AddRealPair( AliFemtoPair* pair){
   // add real (effect) pair
-  double phi1 = pair->Track1()->Track()->P().phi();
-  double phi2 = pair->Track2()->Track()->P().phi();
-  double eta1 = pair->Track1()->Track()->P().pseudoRapidity();
-  double eta2 = pair->Track2()->Track()->P().pseudoRapidity();
+  double phi1 = pair->Track1()->Track()->P().Phi();
+  double phi2 = pair->Track2()->Track()->P().Phi();
+  double eta1 = pair->Track1()->Track()->P().PseudoRapidity();
+  double eta2 = pair->Track2()->Track()->P().PseudoRapidity();
 
   double dphi = phi1 - phi2;
   while (dphi<-TMath::Pi()/2) dphi+=TMath::Pi()*2;
@@ -400,10 +400,10 @@ void AliFemtoModelCorrFctnDEtaDPhi::AddRealPair( AliFemtoPair* pair){
 //____________________________
 void AliFemtoModelCorrFctnDEtaDPhi::AddMixedPair( AliFemtoPair* pair){
   // add mixed (background) pair
-  double phi1 = pair->Track1()->Track()->P().phi();
-  double phi2 = pair->Track2()->Track()->P().phi();
-  double eta1 = pair->Track1()->Track()->P().pseudoRapidity();
-  double eta2 = pair->Track2()->Track()->P().pseudoRapidity();
+  double phi1 = pair->Track1()->Track()->P().Phi();
+  double phi2 = pair->Track2()->Track()->P().Phi();
+  double eta1 = pair->Track1()->Track()->P().PseudoRapidity();
+  double eta2 = pair->Track2()->Track()->P().PseudoRapidity();
 
   double dphi = phi1 - phi2;
   while (dphi<-TMath::Pi()/2) dphi+=TMath::Pi()*2;

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx
index ef196023ed8867405a54e3c49c960b2b67ba0886..67fdd37947cd8c5ecc7f7504990212cb386d04aa 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx
@@ -54,8 +54,8 @@ void AliFemtoModelGausRinvFreezeOutGenerator::GenerateFreezeOut(AliFemtoPair *aP
     if ((infg1) && (infg2)) {
       // assume the emission point is in [cm] and try to judge if
       // both particles are primary
-      Double_t dist1 = infg1->GetGlobalEmissionPoint()->perp();
-      Double_t dist2 = infg2->GetGlobalEmissionPoint()->perp();
+      Double_t dist1 = infg1->GetGlobalEmissionPoint()->Perp();
+      Double_t dist2 = infg2->GetGlobalEmissionPoint()->Perp();
 
       if ((dist1 > 0.05) && (dist2 > 0.05)) {
        // At least one particle is non primary
@@ -87,8 +87,8 @@ void AliFemtoModelGausRinvFreezeOutGenerator::GenerateFreezeOut(AliFemtoPair *aP
   Double_t tPz = inf1->GetTrueMomentum()->z() + inf2->GetTrueMomentum()->z();
   Double_t tM1 = inf1->GetMass();
   Double_t tM2 = inf2->GetMass();
-  Double_t tE1 = sqrt(tM1*tM1 + inf1->GetTrueMomentum()->mag2());
-  Double_t tE2 = sqrt(tM2*tM2 + inf2->GetTrueMomentum()->mag2());
+  Double_t tE1 = sqrt(tM1*tM1 + inf1->GetTrueMomentum()->Mag2());
+  Double_t tE2 = sqrt(tM2*tM2 + inf2->GetTrueMomentum()->Mag2());
   Double_t tEs = tE1 + tE2;
 
   Double_t tPt = sqrt(tPx*tPx + tPy*tPy);

diff --git a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx
index 3052636c98f1ce82e523ebf45e504ce6bcfd11dc..61b92e328ba13941a76c64af0e2bd04335b66fd4 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx
@@ -246,7 +246,7 @@ bool AliFemtoQATrackCut::Pass(const AliFemtoTrack* track)
          return false;
        }
     }
-  float tEnergy = ::sqrt(track->P().mag2()+fMass*fMass);
+  float tEnergy = ::sqrt(track->P().Mag2()+fMass*fMass);
   float tRapidity = 0.5*::log((tEnergy+track->P().z())/(tEnergy-track->P().z()));
   float tPt = ::sqrt((track->P().x())*(track->P().x())+(track->P().y())*(track->P().y()));
   if ((tRapidity<fRapidity[0])||(tRapidity>fRapidity[1]))
@@ -309,11 +309,11 @@ bool AliFemtoQATrackCut::Pass(const AliFemtoTrack* track)
     }
 
   if (fMostProbable) {
-    tMost[0] = track->PidProbElectron()*PidFractionElectron(track->P().mag());
+    tMost[0] = track->PidProbElectron()*PidFractionElectron(track->P().Mag());
     tMost[1] = 0.0;
-    tMost[2] = track->PidProbPion()*PidFractionPion(track->P().mag());
-    tMost[3] = track->PidProbKaon()*PidFractionKaon(track->P().mag());
-    tMost[4] = track->PidProbProton()*PidFractionProton(track->P().mag());
+    tMost[2] = track->PidProbPion()*PidFractionPion(track->P().Mag());
+    tMost[3] = track->PidProbKaon()*PidFractionKaon(track->P().Mag());
+    tMost[4] = track->PidProbProton()*PidFractionProton(track->P().Mag());
     int imost=0;
     float ipidmax = 0.0;
     for (int ip=0; ip<5; ip++)