Fix coding convention violations

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx
index d3e867ddb5504b97e39951e7172ca6d0823f4443..9e6565c9adc0b9c2c16f8040c50b2be42b9dc801 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx
@@ -152,6 +152,9 @@ void AliAnalysisTaskFemto::CreateOutputObjects() {
   printf("Creating Femto Analysis objects\n");\r
 \r
   gSystem->SetIncludePath("-I$ROOTSYS/include -I./STEERBase/ -I./ESD/ -I./AOD/ -I./ANALYSIS/ -I./ANALYSISalice/ -I./PWG2AOD/AOD -I./PWG2femtoscopy/FEMTOSCOPY/AliFemto -I./PWG2femtoscopyUser/FEMTOSCOPY/AliFemtoUser");\r
+  char fcm[2000];\r
+//   sprintf(fcm, "%s++", fConfigMacro);\r
+//   gROOT->LoadMacro(fcm);\r
   gROOT->LoadMacro(fConfigMacro);\r
   //  fJetFinder = (AliJetFinder*) gInterpreter->ProcessLine("ConfigJetAnalysis()");\r
   SetFemtoManager((AliFemtoManager *) gInterpreter->ProcessLine("ConfigFemtoAnalysis()"));\r

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx
index 644602f2e1da0117906e896dd47f590462f55d6f..cc33ebe20be91bfc94eb474957eab5db68280573 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx
@@ -146,7 +146,7 @@ bool AliFemtoAODTrackCut::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]))
@@ -202,11 +202,11 @@ bool AliFemtoAODTrackCut::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/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx
index 1e89de8b0ef8807affde3f461d76b85f692b6a2c..fa32b63a99c45772db29894cd2eaf96cb16bed36 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx
@@ -23,6 +23,7 @@ ClassImp(AliFemtoBPLCMS3DCorrFctn)
 //____________________________
 AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(char* title, const int& nbins, const float& QLo, const float& QHi)
   :
+  AliFemtoCorrFctn(),
   fIDNumHisto(0),
   fIDDenHisto(0),
   fIDRatHisto(0),
@@ -39,7 +40,6 @@ AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(char* title, const int& nbins
   fRout2(0),
   fRside2(0),
   fRlong2(0),
-  fPairCut(0), 
   fQinvNormLo(0),
   fQinvNormHi(0),
   fNumRealsNorm(0),
@@ -54,8 +54,6 @@ AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(char* title, const int& nbins
   fNumMixedNorm = 0;
   //  fCorrection = 0;  // pointer to Coulomb Correction object
 
-  fPairCut = 0; // added Sept2000 - CorrFctn-specific PairCut
-
   //  fSmearPair = 0; // no resolution correction unless user sets SmearPair
 
   // set up numerator
@@ -138,7 +136,7 @@ AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(char* title, const int& nbins
 }
 
 AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(const AliFemtoBPLCMS3DCorrFctn& aCorrFctn) :
-  AliFemtoCorrFctn(),
+  AliFemtoCorrFctn(aCorrFctn),
   fIDNumHisto(0),
   fIDDenHisto(0),
   fIDRatHisto(0),
@@ -155,7 +153,6 @@ AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(const AliFemtoBPLCMS3DCorrFct
   fRout2(0),
   fRside2(0),
   fRlong2(0),
-  fPairCut(0), 
   fQinvNormLo(0),
   fQinvNormHi(0),
   fNumRealsNorm(0),
@@ -179,7 +176,6 @@ AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(const AliFemtoBPLCMS3DCorrFct
   fRout2 = aCorrFctn.fRout2;
   fRside2 = aCorrFctn.fRside2;
   fRlong2 = aCorrFctn.fRlong2;
-  fPairCut = aCorrFctn.fPairCut; 
   fQinvNormLo = aCorrFctn.fQinvNormLo;
   fQinvNormHi = aCorrFctn.fQinvNormHi;
   fNumRealsNorm = aCorrFctn.fNumRealsNorm;
@@ -238,7 +234,6 @@ AliFemtoBPLCMS3DCorrFctn& AliFemtoBPLCMS3DCorrFctn::operator=(const AliFemtoBPLC
   fRout2 = aCorrFctn.fRout2;
   fRside2 = aCorrFctn.fRside2;
   fRlong2 = aCorrFctn.fRlong2;
-  fPairCut = aCorrFctn.fPairCut; 
   fQinvNormLo = aCorrFctn.fQinvNormLo;
   fQinvNormHi = aCorrFctn.fQinvNormHi;
   fNumRealsNorm = aCorrFctn.fNumRealsNorm;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h
index 4340fc228eec0afa198363e3f2731a18ec731666..c43124b26ab6687746625c1d1882f21c2dfbffce 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h
@@ -47,7 +47,6 @@ public:
 
   //  void SetCoulombCorrection(AliFemtoCoulomb* Correction);
 
-  void SetSpecificPairCut(AliFemtoPairCut* aCut);
   void SetUseRPSelection(unsigned short aRPSel);
 
   //  void SetSmearPair(AliFemtoSmearPair*);
@@ -82,8 +81,6 @@ private:
   double fRside2;           // Rside for smearing correction
   double fRlong2;           // Rlong for smearing correction
 
-  AliFemtoPairCut* fPairCut;    //! this is a PairCut specific to THIS CorrFctn, not the Analysis
-
   // upper and lower bounds of Qinv region where to do normalization
   float fQinvNormLo;        // Lower bound of Qinv normalization range
   float fQinvNormHi;        // Upper bound of Qinv normalization range
@@ -112,7 +109,6 @@ inline  void AliFemtoBPLCMS3DCorrFctn::SetNormRangeHi(float qHi){fQinvNormHi = q
 inline  float AliFemtoBPLCMS3DCorrFctn::GetNormRangeLo() const{return fQinvNormLo;}
 inline  float AliFemtoBPLCMS3DCorrFctn::GetNormRangeHi() const{return fQinvNormHi;}
 //inline  void AliFemtoBPLCMS3DCorrFctn::SetCoulombCorrection(AliFemtoCoulomb* Correction){fCorrection = Correction;}
-inline  void AliFemtoBPLCMS3DCorrFctn::SetSpecificPairCut(AliFemtoPairCut* pc){fPairCut=pc;}
 //inline  void AliFemtoBPLCMS3DCorrFctn::SetSmearPair(AliFemtoSmearPair* sp){fSmearPair = sp;}
 
 inline  void AliFemtoBPLCMS3DCorrFctn::SetRout(double r){fRout2 = r*r;}

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx
index 12a9b687d8f5566c13c65f08c580912cf742dc34..1a34cf773ee5c671b2d2f6c739bde0ed779ff634 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx
@@ -63,7 +63,7 @@ bool AliFemtoBasicTrackCut::Pass(const AliFemtoTrack* track){
     goodPID = (goodPID&&(track->Charge() == fCharge));
   }
   if (goodPID){
-    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()));
 

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx
index 832899728d932f671c873b56085177973a957b00..f752c15c64e63359724aed371b9d25935548b688 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx
@@ -135,11 +135,11 @@ void AliFemtoCutMonitorParticleVertPos::Fill(const AliFemtoTrack* aTrack)
   // Fill in the monitor histograms with the values from the current track
   AliFemtoModelGlobalHiddenInfo *hinfo = dynamic_cast<AliFemtoModelGlobalHiddenInfo *>(aTrack->GetHiddenInfo());
   if (hinfo) {
-    float tEta = -TMath::Log(TMath::Tan(hinfo->GetTrueMomentum()->theta()/2.0));
+    float tEta = -TMath::Log(TMath::Tan(hinfo->GetTrueMomentum()->Theta()/2.0));
 
     fVertPos->Fill(hinfo->GetGlobalEmissionPoint()->x(), hinfo->GetGlobalEmissionPoint()->y());
     fEtaZ->Fill(hinfo->GetGlobalEmissionPoint()->z(), tEta);
-    fRadPos->Fill(hinfo->GetGlobalEmissionPoint()->perp());
+    fRadPos->Fill(hinfo->GetGlobalEmissionPoint()->Perp());
   }
   
   AliFemtoModelHiddenInfo *hminfo = dynamic_cast<AliFemtoModelHiddenInfo *>(aTrack->GetHiddenInfo());

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx
index 6b5ab7c6ee5dc7a5dd62fc44195502e9fa359cd6..c8ad0a0fa522cd119ae98024ab42df3e87927354 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx
@@ -149,11 +149,11 @@ AliFemtoString AliFemtoCutMonitorParticleYPt::Report(){
 void AliFemtoCutMonitorParticleYPt::Fill(const AliFemtoTrack* aTrack)
 {
   // Fill in the monitor histograms with the values from the current track
-  float tEnergy = ::sqrt(aTrack->P().mag2()+fMass*fMass);
+  float tEnergy = ::sqrt(aTrack->P().Mag2()+fMass*fMass);
   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 tEta = -TMath::Log(TMath::Tan(aTrack->P().Theta()/2.0));
+  float tPhi = aTrack->P().Phi();
   float chi2w;
   float dcar = aTrack->ImpactD();
   float dcaz = aTrack->ImpactZ();

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx
index 003f5f0fe596620dd562640300f09c83040174ea..cb9bc6f5f861cc4f46e0dc04f584cac1c3b1e74f 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx
@@ -376,7 +376,7 @@ double AliFemtoEvent::UncorrectedNumberOfPrimaries() const
       if ((*iter)->TPCchi2()/(*iter)->TPCncls() > 60.0) continue;
       if ((*iter)->ImpactD() > 6.0) continue;
       if ((*iter)->ImpactZ() > 6.0) continue;
-      if (fabs((*iter)->P().pseudoRapidity()) > 0.9) continue;
+      if (fabs((*iter)->P().PseudoRapidity()) > 0.9) continue;
       
       tNormTrackCount++;
     }

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx
index 994332f68422a8f952607c48ea8bbe68b378e060..808ae0828def6f77956c4790639adfb3dc9c59dd 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx
@@ -386,7 +386,7 @@ void AliFemtoEventReaderAOD::CopyAODtoFemtoEvent(AliFemtoEvent *tEvent)
        aodtrack->PxPyPz(pxyz);//reading noconstarined momentum
        const AliFmThreeVectorD ktP(pxyz[0],pxyz[1],pxyz[2]);
        // Check the sanity of the tracks - reject zero momentum tracks
-       if (ktP.mag() == 0) {
+       if (ktP.Mag() == 0) {
          delete trackCopy;
          continue;
        }
@@ -507,7 +507,7 @@ void AliFemtoEventReaderAOD::CopyAODtoFemtoEvent(AliFemtoEvent *tEvent)
        aodtrack->PxPyPz(pxyz);//reading noconstarined momentum
        const AliFmThreeVectorD ktP(pxyz[0],pxyz[1],pxyz[2]);
        // Check the sanity of the tracks - reject zero momentum tracks
-       if (ktP.mag() == 0) {
+       if (ktP.Mag() == 0) {
          delete trackCopy;
          continue;
        }

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.cxx
index 3d13a94aa0389778d317abec72a1cc11adfe418a..dc82e4b4c538fccdffe184e5c75a2839578d2367 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.cxx
@@ -321,7 +321,7 @@ AliFemtoEvent* AliFemtoEventReaderESD::ReturnHbtEvent()
       trackCopy->SetP(v);//setting momentum
       trackCopy->SetPt(sqrt(pxyz[0]*pxyz[0]+pxyz[1]*pxyz[1]));
       const AliFmThreeVectorD ktP(pxyz[0],pxyz[1],pxyz[2]);
-      if (ktP.mag() == 0) {
+      if (ktP.Mag() == 0) {
        delete trackCopy;
        continue;
       }

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx
index d10f616d8b25880d145f5f0b05f260892d2bfb23..431453f40c9a1b4500eb2e54648a9022528d2920 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx
@@ -387,7 +387,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChain::ReturnHbtEvent()
        }
        
        AliFemtoThreeVector v(pxyz[0],pxyz[1],pxyz[2]);
-       if (v.mag() < 0.0001) {
+       if (v.Mag() < 0.0001) {
          //    cout << "Found 0 momentum ???? " <<endl;
          delete trackCopy;
          continue;
@@ -437,7 +437,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChain::ReturnHbtEvent()
          tGoodMomentum=esdtrack->GetPxPyPz(pxyz);//reading noconstarined momentum
        
        AliFemtoThreeVector v(pxyz[0],pxyz[1],pxyz[2]);
-       if (v.mag() < 0.0001) {
+       if (v.Mag() < 0.0001) {
          //    cout << "Found 0 momentum ???? " <<endl;
          delete trackCopy;
          continue;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.cxx
index 361cae6fedee9b4bead3f2af13fd852296028562..29314a23c8ed7ed47e6bbc8092995286cc7870ab 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.cxx
@@ -228,18 +228,19 @@ AliFemtoEvent* AliFemtoEventReaderESDChainKine::ReturnHbtEvent()
   int realnofTracks=0;//number of track which we use ina analysis
 
   Int_t *motherids;
-  motherids = new Int_t[fStack->GetNtrack()];
-  for (int ip=0; ip<fStack->GetNtrack(); ip++) motherids[ip] = 0;
-
-  // Read in mother ids
-  TParticle *motherpart;
-  for (int ip=0; ip<fStack->GetNtrack(); ip++) {
-    motherpart = fStack->Particle(ip);
-    if (motherpart->GetDaughter(0) > 0)
-      motherids[motherpart->GetDaughter(0)] = ip;
-    if (motherpart->GetDaughter(1) > 0)
-      motherids[motherpart->GetDaughter(1)] = ip;
-
+  if (fStack) {
+    motherids = new Int_t[fStack->GetNtrack()];
+    for (int ip=0; ip<fStack->GetNtrack(); ip++) motherids[ip] = 0;
+
+    // Read in mother ids
+    TParticle *motherpart;
+    for (int ip=0; ip<fStack->GetNtrack(); ip++) {
+      motherpart = fStack->Particle(ip);
+      if (motherpart->GetDaughter(0) > 0)
+       motherids[motherpart->GetDaughter(0)] = ip;
+      if (motherpart->GetDaughter(1) > 0)
+       motherids[motherpart->GetDaughter(1)] = ip;
+      
 //     if (motherpart->GetPdgCode() == 211) {
 //       cout << "Mother " << ip << " has daughters " 
 //        << motherpart->GetDaughter(0) << " " 
@@ -250,6 +251,11 @@ AliFemtoEvent* AliFemtoEventReaderESDChainKine::ReturnHbtEvent()
 //        << endl;
       
 //     }
+    }
+  }
+  else {
+    printf ("No Stack ???\n");
+    return 0;
   }
 
   for (int i=0;i<nofTracks;i++)
@@ -300,7 +306,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChainKine::ReturnHbtEvent()
        }
 
        AliFemtoThreeVector v(pxyz[0],pxyz[1],pxyz[2]);
-       if (v.mag() < 0.0001) {
+       if (v.Mag() < 0.0001) {
          //      cout << "Found 0 momentum ???? " << pxyz[0] << " " << pxyz[1] << " " << pxyz[2] << endl;
          delete trackCopy;
          continue;
@@ -341,7 +347,7 @@ AliFemtoEvent* AliFemtoEventReaderESDChainKine::ReturnHbtEvent()
        }
 
        AliFemtoThreeVector v(pxyz[0],pxyz[1],pxyz[2]);
-       if (v.mag() < 0.0001) {
+       if (v.Mag() < 0.0001) {
          //      cout << "Found 0 momentum ???? "  << pxyz[0] << " " << pxyz[1] << " " << pxyz[2] << endl;
          delete trackCopy;
          continue;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.cxx
index fb8fa45278c97f16abda2b777de0505f959dc436..c0b7a70bac7d63392a31f19214fa73409c30bc48 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.cxx
@@ -54,7 +54,8 @@ AliFemtoEventReaderStandard::AliFemtoEventReaderStandard():
   fInputType(kUnknown),
   fUsePhysicsSel(kFALSE),
   fSelect(0),
-  fTrackCuts(0x0)
+  fTrackCuts(0x0),
+  fUseTPCOnly(kFALSE)
 {
   //constructor with 0 parameters , look at default settings 
 }
@@ -73,7 +74,8 @@ AliFemtoEventReaderStandard::AliFemtoEventReaderStandard(const AliFemtoEventRead
   fInputType(kUnknown),
   fUsePhysicsSel(kFALSE),
   fSelect(0),
-  fTrackCuts(0x0)
+  fTrackCuts(0x0),
+  fUseTPCOnly(kFALSE)
 {
   // Copy constructor
   fCurEvent = aReader.fCurEvent;
@@ -85,6 +87,7 @@ AliFemtoEventReaderStandard::AliFemtoEventReaderStandard(const AliFemtoEventRead
   fUsePhysicsSel = aReader.fUsePhysicsSel;
   if (fUsePhysicsSel) fSelect = new AliPhysicsSelection();
   fTrackCuts = new AliESDtrackCuts(*(aReader.fTrackCuts));
+  fUseTPCOnly = aReader.fUseTPCOnly;
 }
 //__________________
 AliFemtoEventReaderStandard::~AliFemtoEventReaderStandard()
@@ -115,6 +118,8 @@ AliFemtoEventReaderStandard& AliFemtoEventReaderStandard::operator=(const AliFem
   if (fUsePhysicsSel) fSelect = new AliPhysicsSelection();
   if (fTrackCuts) delete fTrackCuts;
   fTrackCuts = new AliESDtrackCuts(*(aReader.fTrackCuts));
+  fUseTPCOnly = aReader.fUseTPCOnly;
+
   return *this;
 }
 //__________________
@@ -169,6 +174,8 @@ AliFemtoEvent* AliFemtoEventReaderStandard::ReturnHbtEvent()
     hbtEvent->SetTriggerMask(fESDEvent->GetTriggerMask());
     hbtEvent->SetTriggerCluster(fESDEvent->GetTriggerCluster());
 
+    printf("Got event type %i\n", fESDEvent->GetEventType());
+
     //Vertex
     double fVCov[6];
     //   if (fUseTPCOnly) {
@@ -325,9 +332,18 @@ AliFemtoEvent* AliFemtoEventReaderStandard::ReturnHbtEvent()
       AliFemtoTrack* trackCopy = new AliFemtoTrack();  
 
       if ((fInputType == kESD) || (fInputType == kESDKine)) {
+       
+       AliESDtrack *esdtrack = 0x0;
+       if (fUseTPCOnly) {
+         AliESDtrack *mcp = fESDEvent->GetTrack(i);
+         esdtrack = AliESDtrackCuts::GetTPCOnlyTrack(fESDEvent, mcp->GetID());
+         //      printf("Got %p for track %i | ", esdtrack, mcp->GetID());
+       }
+       else {
+         esdtrack = fESDEvent->GetTrack(i);//getting next track
+       }
 
-       AliESDtrack *esdtrack=fESDEvent->GetTrack(i);//getting next track
-       if (fTrackCuts->AcceptTrack(esdtrack)) {
+       if (esdtrack && (fTrackCuts->AcceptTrack(esdtrack))) {
 
          trackCopy->SetCharge((short)esdtrack->GetSign());
 
@@ -393,10 +409,14 @@ AliFemtoEvent* AliFemtoEventReaderStandard::ReturnHbtEvent()
          //        delete param;
          //      }
          //      else {
-         tGoodMomentum=esdtrack->GetConstrainedPxPyPz(pxyz); //reading constrained momentum
+         if (fUseTPCOnly)
+           tGoodMomentum=esdtrack->GetPxPyPz(pxyz);
+         else
+           tGoodMomentum=esdtrack->GetConstrainedPxPyPz(pxyz); //reading constrained momentum
+         //      printf("Got good momentum %i\n", tGoodMomentum);
 
          AliFemtoThreeVector v(pxyz[0],pxyz[1],pxyz[2]);
-         if (v.mag() < 0.0001) {
+         if (v.Mag() < 0.0001) {
            
            delete trackCopy;
            continue;
@@ -545,6 +565,9 @@ AliFemtoEvent* AliFemtoEventReaderStandard::ReturnHbtEvent()
        }
        else 
          tGoodMomentum = false;
+       
+       if (fUseTPCOnly)
+         if (esdtrack) delete esdtrack;
       }
 
       if ((fInputType == kAOD) || (fInputType == kAODKine)) {
@@ -662,12 +685,12 @@ AliFemtoEvent* AliFemtoEventReaderStandard::ReturnHbtEvent()
        aodtrack->PxPyPz(pxyz);//reading noconstarined momentum
        const AliFmThreeVectorD ktP(pxyz[0],pxyz[1],pxyz[2]);
        // Check the sanity of the tracks - reject zero momentum tracks
-       if (ktP.mag() == 0) {
+       if (ktP.Mag() == 0) {
          delete trackCopy;
          continue;
        }
        
-       
+
       }
       
        
@@ -741,6 +764,12 @@ void AliFemtoEventReaderStandard::SetESDTrackCuts(AliESDtrackCuts *esdcuts)
   fTrackCuts = esdcuts;
 }
 
+void AliFemtoEventReaderStandard::SetUseTPCOnly(const bool usetpconly)
+{
+  // Set flag to use TPC only tracks
+  fUseTPCOnly = usetpconly;
+}
+
 void AliFemtoEventReaderStandard::CopyAODtoFemtoTrack(const AliAODTrack *tAodTrack, 
                                                      AliFemtoTrack *tFemtoTrack)
 {

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.h
index d2b33753e7339b6db6bdd19afb74b013971846b6..cd912b475ae0545af713a39c4af985fba1a3dfd0 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.h
@@ -48,7 +48,9 @@ class AliFemtoEventReaderStandard : public AliFemtoEventReader
   void SetInputType(AliFemtoInputType aInput);
   void SetGenEventHeader(AliGenEventHeader *aGenHeader);
   void SetUsePhysicsSelection(const bool usephysics);
+
   void SetESDTrackCuts(AliESDtrackCuts *esdcuts);
+  void SetUseTPCOnly(const bool usetpconly);
 
  protected:
 
@@ -68,8 +70,9 @@ class AliFemtoEventReaderStandard : public AliFemtoEventReader
 
   bool                 fUsePhysicsSel; // if true the physics selection class will be used
   AliPhysicsSelection *fSelect;        // Class to select only physics events
+
   AliESDtrackCuts     *fTrackCuts;     // Link to external ESD track cut
-  
+  bool                 fUseTPCOnly;    // if true the TPC only parameters will be used
 
 #ifdef __ROOT__
   ClassDef(AliFemtoEventReaderStandard, 1)

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.cxx
index b08606c1e30abf28eefcaa52430bb6d5aa494f1f..9bddb065fcddd3501feecde5a25d0db0bdde0329 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.cxx
@@ -55,8 +55,8 @@ void AliFemtoModelGausLCMSFreezeOutGenerator::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/AliFemto/AliFemtoModelWeightGeneratorBasic.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorBasic.cxx
index 26f62ee0547e05e0fbe27639f3466811cf6d2d10..a47b5866b6991c0f3c7580bf09c0d5d9901234a5 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorBasic.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorBasic.cxx
@@ -49,8 +49,8 @@ Double_t AliFemtoModelWeightGeneratorBasic::GenerateWeight(AliFemtoPair *aPair)
   //  double tE  = inf1->GetTrueMomentum()->e +inf2->GetTrueMomentum()->.e;
   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 tE  = tE1 + tE2;
   Double_t tPt = tPx*tPx + tPy*tPy;
   Double_t tMt = tE*tE - tPz*tPz;//mCVK;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.cxx
index c50bb206a9de003fdc27354b7eef325d22e0451b..dbe5e71dd28a555531d718e15892ef246036350f 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.cxx
@@ -295,8 +295,8 @@ double AliFemtoModelWeightGeneratorLednicky::GenerateWeight(AliFemtoPair* aPair)
   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 tE  = tE1 + tE2;
   Double_t tPt = tPx*tPx + tPy*tPy;
   Double_t tMt = tE*tE - tPz*tPz;//mCVK;

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoPair.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoPair.cxx
index 3434ea77e85b5ea7c21a26f4047471d5f76abc41..b3ae32d31ca655b6cf07df294027867017c27922 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoPair.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoPair.cxx
@@ -311,7 +311,7 @@ void AliFemtoPair::QYKPCMS(double& qP, double& qT, double& q0) const
     { l = l2-l1 ; } ;
   // fill momentum differences into return variables
   qP = l.z() ;
-  qT = l.vect().perp() ;
+  qT = l.vect().Perp() ;
   q0 = l.e() ;
 }
 //___________________________________
@@ -346,7 +346,7 @@ void AliFemtoPair::QYKPLCMS(double& qP, double& qT, double& q0) const
     { l = l2boosted-l1boosted ;} ;
   // fill momentum differences into return variables
   qP = l.z() ;
-  qT = l.vect().perp() ;
+  qT = l.vect().Perp() ;
   q0 = l.e() ;
 }
 //___________________________________
@@ -372,7 +372,7 @@ void AliFemtoPair::QYKPPF(double& qP, double& qT, double& q0) const
     { l = l2boosted-l1boosted ;} ;
   // fill momentum differences into return variables
   qP = l.z();
-  qT = l.vect().perp();
+  qT = l.vect().Perp();
   q0 = l.e();
 }
 //_________________
@@ -597,13 +597,13 @@ double AliFemtoPair::Quality2() const {
 double AliFemtoPair::NominalTpcExitSeparation() const {
   // separation at exit from STAR TPC
   AliFemtoThreeVector diff = fTrack1->Track()->NominalTpcExitPoint() - fTrack2->Track()->NominalTpcExitPoint();
-  return (diff.mag());
+  return (diff.Mag());
 }
 
 double AliFemtoPair::NominalTpcEntranceSeparation() const {
   // separation at entrance to STAR TPC
   AliFemtoThreeVector diff = fTrack1->Track()->NominalTpcEntrancePoint() - fTrack2->Track()->NominalTpcEntrancePoint();
-  return (diff.mag());
+  return (diff.Mag());
 }
 
 // double AliFemtoPair::NominalTpcAverageSeparation() const {
@@ -623,7 +623,7 @@ double AliFemtoPair::NominalTpcEntranceSeparation() const {
 //     //  for (int ipt=0; ipt<11; ipt++){
 //     diff = fTrack1->fNominalPosSample[ipt] - fTrack2->fNominalPosSample[ipt];
 //     ipt++;
-//     tAveSep += diff.mag();
+//     tAveSep += diff.Mag();
 //   }
 //   tAveSep = tAveSep/(ipt+1.);
 //   return (tAveSep);}
@@ -632,11 +632,11 @@ double AliFemtoPair::NominalTpcEntranceSeparation() const {
 
 double AliFemtoPair::OpeningAngle() const {
   // opening angle
- return 57.296* fTrack1->FourMomentum().vect().angle( fTrack2->FourMomentum().vect() );
+ return 57.296* fTrack1->FourMomentum().vect().Angle( fTrack2->FourMomentum().vect() );
 //   AliFemtoThreeVector p1 = fTrack1->FourMomentum().vect();
 //   AliFemtoThreeVector p2 = fTrack2->FourMomentum().vect();
 //   return 57.296*(p1.phi()-p2.phi());
-//   //double dAngInv = 57.296*acos((p1.dot(p2))/(p1.mag()*p2.mag()));
+//   //double dAngInv = 57.296*acos((p1.dot(p2))/(p1.Mag()*p2.Mag()));
 //   //return (dAngInv);
 }
 //_________________
@@ -659,7 +659,7 @@ double AliFemtoPair::KStarFlipped() const {
   AliFmLorentzVectorD tK(tGamma*tP1.e() - tP1.vect()*tGammaBeta,
                      tP1.vect() + (tGamma-1.)*tLongMom - tP1.e()*tGammaBeta);
 //VP  tP1.vect() *= -1.; // unflip it
-  return tK.vect().mag();
+  return tK.vect().Mag();
 }
 
 //double AliFemtoPair::CVK() const{
@@ -672,7 +672,7 @@ double AliFemtoPair::KStarFlipped() const {
 //                   (tGammaBeta*tGammaBeta))*tGammaBeta;
 //AliFmLorentzVectorD tK(tGamma*tP1.e() - tP1.vect()*tGammaBeta,
 //           tP1.vect() + (tGamma-1.)*tLongMom - tP1.e()*tGammaBeta);
-//return (tK.vect())*tGammaBeta/tK.vect().magnitude()/tGammaBeta.magnitude();
+//return (tK.vect())*tGammaBeta/tK.vect().Magnitude()/tGammaBeta.Magnitude();
 //}
 
 double AliFemtoPair::CVKFlipped() const{
@@ -949,14 +949,14 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 // //_______1st part is a track 2nd is a V0 considering Pos daughter
   
 //   AliFemtoThreeVector diff = fTrack1->Track()->NominalTpcExitPoint() - fTrack2->TpcV0PosExitPoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcEntranceSeparationTrackV0Pos() const {
 // //________________V0 daughters exit/entrance/average separation calc.
 // //_______1st part is a track 2nd is a V0 considering Pos daughter
 //   AliFemtoThreeVector diff = fTrack1->Track()->NominalTpcEntrancePoint() - fTrack2->TpcV0PosEntrancePoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcAverageSeparationTrackV0Pos() const {
@@ -976,7 +976,7 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 //      ){
 //     diff = fTrack1->fNominalPosSample[ipt] - fTrack2->fNominalPosSample[ipt];
 //     ipt++;
-//     tAveSep += diff.mag();
+//     tAveSep += diff.Mag();
 //   }
 //   tAveSep = tAveSep/(ipt+1.);
 //   return (tAveSep);}
@@ -985,13 +985,13 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 // double AliFemtoPair::TpcExitSeparationTrackV0Neg() const {
 // //_______1st part is a track 2nd is a V0 considering Neg daughter
 //   AliFemtoThreeVector diff = fTrack1->Track()->NominalTpcExitPoint() - fTrack2->TpcV0NegExitPoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcEntranceSeparationTrackV0Neg() const {
 // //_______1st part is a track 2nd is a V0 considering Neg daughter
 //   AliFemtoThreeVector diff = fTrack1->Track()->NominalTpcEntrancePoint() - fTrack2->TpcV0NegEntrancePoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcAverageSeparationTrackV0Neg() const {
@@ -1010,7 +1010,7 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 //      ){
 //     diff = fTrack1->fNominalPosSample[ipt] - fTrack2->fTpcV0NegPosSample[ipt];
 //     ipt++;
-//     tAveSep += diff.mag();
+//     tAveSep += diff.Mag();
 //   }
 //   tAveSep = tAveSep/(ipt+1.);
 //   return (tAveSep);}
@@ -1020,13 +1020,13 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 // double AliFemtoPair::TpcExitSeparationV0PosV0Pos() const {
 // //_______1st part is a V0 considering Pos daughter 2nd is a V0 considering Pos daughter
 //   AliFemtoThreeVector diff = fTrack1->TpcV0PosExitPoint() - fTrack2->TpcV0PosExitPoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcEntranceSeparationV0PosV0Pos() const {
 // //_______1st part is a V0 considering Pos daughter 2nd is a V0 considering Pos daughter
 //   AliFemtoThreeVector diff = fTrack1->TpcV0PosEntrancePoint() - fTrack2->TpcV0PosEntrancePoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 // double AliFemtoPair::TpcAverageSeparationV0PosV0Pos() const {
 // //_______1st part is a V0 considering Pos daughter 2nd is a V0 considering Pos daughter
@@ -1044,7 +1044,7 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 //     ){
 //       diff = fTrack1->fNominalPosSample[ipt] - fTrack2->fNominalPosSample[ipt];
 //       ipt++;
-//       tAveSep += diff.mag();
+//       tAveSep += diff.Mag();
 //     }
 //     tAveSep = tAveSep/(ipt+1);
 //     return (tAveSep);}
@@ -1054,13 +1054,13 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 // double AliFemtoPair::TpcExitSeparationV0PosV0Neg() const {
 // //_______1st part is a V0 considering Pos daughter 2nd is a V0 considering Neg daughter
 //   AliFemtoThreeVector diff = fTrack1->TpcV0PosExitPoint() - fTrack2->TpcV0NegExitPoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcEntranceSeparationV0PosV0Neg() const {
 // //_______1st part is a V0 considering Pos daughter 2nd is a V0 considering Neg daughter
 //   AliFemtoThreeVector diff = fTrack1->TpcV0PosEntrancePoint() - fTrack2->TpcV0NegEntrancePoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 // double AliFemtoPair::TpcAverageSeparationV0PosV0Neg() const {
 // //_______1st part is a V0 considering Pos daughter 2nd is a V0 considering Neg daughter
@@ -1078,7 +1078,7 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 //      ){
 //     diff = fTrack1->fNominalPosSample[ipt] - fTrack2->fTpcV0NegPosSample[ipt];
 //     ipt++;
-//     tAveSep += diff.mag();
+//     tAveSep += diff.Mag();
 //   }
 //   tAveSep = tAveSep/(ipt+1.);
 //   return (tAveSep);}
@@ -1088,14 +1088,14 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 // //_______1st part is a V0 considering Neg daughter 2nd is a V0 considering Pos daughter
 // // this is to check the upper case
 //   AliFemtoThreeVector diff = fTrack1->TpcV0NegExitPoint() - fTrack2->TpcV0PosExitPoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcEntranceSeparationV0NegV0Pos() const {
 // //_______1st part is a V0 considering Neg daughter 2nd is a V0 considering Pos daughter
 // // this is to check the upper case
 //   AliFemtoThreeVector diff = fTrack1->TpcV0NegEntrancePoint() - fTrack2->TpcV0PosEntrancePoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 // double AliFemtoPair::TpcAverageSeparationV0NegV0Pos() const {
 // //_______1st part is a V0 considering Neg daughter 2nd is a V0 considering Pos daughter
@@ -1114,7 +1114,7 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 //         ){
 //        diff = fTrack1->fTpcV0NegPosSample[ipt] - fTrack2->fNominalPosSample[ipt];
 //        ipt++;
-//        tAveSep += diff.mag();
+//        tAveSep += diff.Mag();
 //      }
 //      tAveSep = tAveSep/(ipt+1);
 //      return (tAveSep);}
@@ -1123,13 +1123,13 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 // double AliFemtoPair::TpcExitSeparationV0NegV0Neg() const {
 // //_______1st part is a V0 considering Neg daughter 2nd is a V0 considering Neg daughter
 //   AliFemtoThreeVector diff = fTrack1->TpcV0NegExitPoint() - fTrack2->TpcV0NegExitPoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 
 // double AliFemtoPair::TpcEntranceSeparationV0NegV0Neg() const {
 // //_______1st part is a V0 considering Neg daughter 2nd is a V0 considering Neg daughter
 //   AliFemtoThreeVector diff = fTrack1->TpcV0NegEntrancePoint() - fTrack2->TpcV0NegEntrancePoint();
-//   return (diff.mag());
+//   return (diff.Mag());
 // }
 // double AliFemtoPair::TpcAverageSeparationV0NegV0Neg() const {
 // //_______1st part is a V0 considering Neg daughter 2nd is a V0 considering Neg daughter
@@ -1147,7 +1147,7 @@ void AliFemtoPair::CalcNonIdPar() const{ // fortran like function! faster?
 //         ){
 //        diff = fTrack1->fTpcV0NegPosSample[ipt] - fTrack2->fTpcV0NegPosSample[ipt];
 //        ipt++;
-//        tAveSep += diff.mag();
+//        tAveSep += diff.Mag();
 //      }
 //      tAveSep = tAveSep/(ipt+1);
 //      return (tAveSep);}

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticle.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticle.cxx
index c77cb37345de075f2e46beb10f69ccdb782c8231..24c1a9eedc583088beed0b6c594395c0da506caf 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticle.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticle.cxx
@@ -182,7 +182,7 @@ AliFemtoParticle::AliFemtoParticle(const AliFemtoTrack* const hbtTrack,const dou
   fTrack = new AliFemtoTrack(*hbtTrack);
   AliFemtoThreeVector temp = hbtTrack->P();
   fFourMomentum.SetVect(temp);
-  double ener = ::sqrt(temp.mag2()+mass*mass);
+  double ener = ::sqrt(temp.Mag2()+mass*mass);
   fFourMomentum.SetE(ener);
 //  fMap[0] = hbtTrack->TopologyMap(0);
  // fMap[1] = hbtTrack->TopologyMap(1);
@@ -245,7 +245,7 @@ AliFemtoParticle::AliFemtoParticle(const AliFemtoV0* const hbtV0,const double& m
   // I know there is a better way to do this...
   AliFemtoThreeVector temp = hbtV0->MomV0();
   fFourMomentum.SetVect(temp);
-  double ener = ::sqrt(temp.mag2()+mass*mass);
+  double ener = ::sqrt(temp.Mag2()+mass*mass);
   fFourMomentum.SetE(ener);
   // Calculating TpcEntrancePoint for Positive V0 daugther
   fPrimaryVertex = hbtV0->PrimaryVertex();
@@ -309,7 +309,7 @@ AliFemtoParticle::AliFemtoParticle(const AliFemtoKink* const hbtKink,const doubl
   // I know there is a better way to do this...
   AliFemtoThreeVector temp = hbtKink->Parent().P();
   fFourMomentum.SetVect(temp);
-  double ener = ::sqrt(temp.mag2()+mass*mass);
+  double ener = ::sqrt(temp.Mag2()+mass*mass);
   fFourMomentum.SetE(ener);
 }
 
@@ -340,7 +340,7 @@ AliFemtoParticle::AliFemtoParticle(const AliFemtoXi* const hbtXi, const double&
   //fMap[1]= 0;
   AliFemtoThreeVector temp;// = hbtXi->mMofXi;
   fFourMomentum.SetVect(temp);
-  double ener = ::sqrt(temp.mag2()+mass*mass);
+  double ener = ::sqrt(temp.Mag2()+mass*mass);
   fFourMomentum.SetE(ener);
   fHiddenInfo = 0;
 }

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.cxx
index 989552fcbd65d9d7130e98724ffe6ebcf3a3707c..42ec2750944b6b2985d27bfda7107f17ea7bf45e 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.cxx
@@ -17,7 +17,8 @@ ClassImp(AliFemtoQinvCorrFctn)
 AliFemtoQinvCorrFctn::AliFemtoQinvCorrFctn(char* title, const int& nbins, const float& QinvLo, const float& QinvHi):
   fNumerator(0),
   fDenominator(0),
-  fRatio(0)
+  fRatio(0),
+  fkTMonitor(0)
 {
   // set up numerator
   //  title = "Num Qinv (MeV/c)";
@@ -34,6 +35,9 @@ AliFemtoQinvCorrFctn::AliFemtoQinvCorrFctn(char* title, const int& nbins, const
   char tTitRat[100] = "Rat";
   strcat(tTitRat,title);
   fRatio = new TH1D(tTitRat,title,nbins,QinvLo,QinvHi);
+  char tTitkT[100] = "kTDep";
+  strcat(tTitkT,title);
+  fkTMonitor = new TH1D(tTitkT,title,200,0.0,2.0);
   // this next bit is unfortunately needed so that we can have many histos of same "title"
   // it is neccessary if we typedef TH1D to TH1d (which we do)
   //fNumerator->SetDirectory(0);
@@ -44,7 +48,7 @@ AliFemtoQinvCorrFctn::AliFemtoQinvCorrFctn(char* title, const int& nbins, const
   fNumerator->Sumw2();
   fDenominator->Sumw2();
   fRatio->Sumw2();
-
+  fkTMonitor->Sumw2();
 }
 
 //____________________________
@@ -52,12 +56,14 @@ AliFemtoQinvCorrFctn::AliFemtoQinvCorrFctn(const AliFemtoQinvCorrFctn& aCorrFctn
   AliFemtoCorrFctn(),
   fNumerator(0),
   fDenominator(0),
-  fRatio(0)
+  fRatio(0),
+  fkTMonitor(0)
 {
   // copy constructor
   fNumerator = new TH1D(*aCorrFctn.fNumerator);
   fDenominator = new TH1D(*aCorrFctn.fDenominator);
   fRatio = new TH1D(*aCorrFctn.fRatio);
+  fkTMonitor = new TH1D(*aCorrFctn.fkTMonitor);
 }
 //____________________________
 AliFemtoQinvCorrFctn::~AliFemtoQinvCorrFctn(){
@@ -65,6 +71,7 @@ AliFemtoQinvCorrFctn::~AliFemtoQinvCorrFctn(){
   delete fNumerator;
   delete fDenominator;
   delete fRatio;
+  delete fkTMonitor;
 }
 //_________________________
 AliFemtoQinvCorrFctn& AliFemtoQinvCorrFctn::operator=(const AliFemtoQinvCorrFctn& aCorrFctn)
@@ -79,6 +86,8 @@ AliFemtoQinvCorrFctn& AliFemtoQinvCorrFctn::operator=(const AliFemtoQinvCorrFctn
   fDenominator = new TH1D(*aCorrFctn.fDenominator);
   if (fRatio) delete fRatio;
   fRatio = new TH1D(*aCorrFctn.fRatio);
+  if (fkTMonitor) delete fkTMonitor;
+  fkTMonitor = new TH1D(*aCorrFctn.fkTMonitor);
 
   return *this;
 }
@@ -119,6 +128,7 @@ void AliFemtoQinvCorrFctn::AddRealPair(AliFemtoPair* pair){
   
   double tQinv = fabs(pair->QInv());   // note - qInv() will be negative for identical pairs...
   fNumerator->Fill(tQinv);
+  fkTMonitor->Fill(pair->KT());
   //  cout << "AliFemtoQinvCorrFctn::AddRealPair : " << pair->qInv() << " " << tQinv <<
   //" " << pair->track1().FourMomentum() << " " << pair->track2().FourMomentum() << endl;
 }
@@ -137,6 +147,7 @@ void AliFemtoQinvCorrFctn::Write(){
   // Write out neccessary objects
   fNumerator->Write(); 
   fDenominator->Write();  
+  fkTMonitor->Write();
 }
 //______________________________
 TList* AliFemtoQinvCorrFctn::GetOutputList()
@@ -146,6 +157,7 @@ TList* AliFemtoQinvCorrFctn::GetOutputList()
 
   tOutputList->Add(fNumerator); 
   tOutputList->Add(fDenominator);  
+  tOutputList->Add(fkTMonitor);
 
   return tOutputList;
 }

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.h
index e41f62ff66c610f89b5425055ad7b447b70c506a..f0bc3f2f8cddbcd264957be38066c867a4a34f79 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.h
@@ -74,6 +74,7 @@ private:
   TH1D* fNumerator;          // numerator - real pairs
   TH1D* fDenominator;        // denominator - mixed pairs
   TH1D* fRatio;              // ratio - correlation function
+  TH1D* fkTMonitor;          // Monitor the kT of pairs in the function
 
 #ifdef __ROOT__
   ClassDef(AliFemtoQinvCorrFctn, 1)

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.cxx
index 75b33d78e65e1743120c06a18378c6c200e2a08e..d43e493523a9ffd3a325f4d5428d0f9407c27143 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.cxx
@@ -163,12 +163,12 @@ void AliFemtoV0::UpdateV0(){
   float tMomNegAlongV0, tMomPosAlongV0;
 
    fMomV0  = fMomPos + fMomNeg;
-   fPtV0   = fMomV0.perp();
-   fPtotV0 = fMomV0.mag();
-   fPtPos  = fMomPos.perp();
-   fPtotPos= fMomPos.mag();
-   fPtNeg  = fMomNeg.perp();
-   fPtotNeg= fMomNeg.mag();
+   fPtV0   = fMomV0.Perp();
+   fPtotV0 = fMomV0.Mag();
+   fPtPos  = fMomPos.Perp();
+   fPtotPos= fMomPos.Mag();
+   fPtNeg  = fMomNeg.Perp();
+   fPtotNeg= fMomNeg.Mag();
    fELambda= ::sqrt(fPtotV0*fPtotV0+M_LAMBDA*M_LAMBDA);
    fEK0Short= ::sqrt(fPtotV0*fPtotV0+M_KAON_0_SHORT*M_KAON_0_SHORT);
    fEPosProton = ::sqrt(fPtotPos*fPtotPos+M_PROTON*M_PROTON);
@@ -186,10 +186,10 @@ void AliFemtoV0::UpdateV0(){
    fMassK0Short = ::sqrt(::pow(fENegPion+fEPosPion,2)-::pow(fPtotV0,2));
 
    fRapLambda = 0.5*::log( (fELambda+fMomV0.z()) / (fELambda-fMomV0.z()) );
-   fCTauLambda = M_LAMBDA*(fDecayLengthV0) / ::sqrt( ::pow((double)fMomV0.mag(),2.) );
+   fCTauLambda = M_LAMBDA*(fDecayLengthV0) / ::sqrt( ::pow((double)fMomV0.Mag(),2.) );
    
    fRapK0Short = 0.5*::log( (fEK0Short+fMomV0.z()) / (fEK0Short-fMomV0.z()) );
-   fCTauK0Short = M_KAON_0_SHORT*(fDecayLengthV0) / ::sqrt( ::pow((double)fMomV0.mag(),2.) );
+   fCTauK0Short = M_KAON_0_SHORT*(fDecayLengthV0) / ::sqrt( ::pow((double)fMomV0.Mag(),2.) );
 
 }
 // -----------------------------------------------------------------------

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.h
index fdd9510e31c247d73bc06d8fbe64a0c98c7159d2..3323032ba6edfe5b78effc7c58161c282c0f3e6b 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.h
@@ -303,12 +303,12 @@ inline float AliFemtoV0::DedxNeg() const {return fDedxNeg;}
 inline float AliFemtoV0::NumdedxNeg() const {return fNufDedxNeg;} //Gael 04Fev2002
 inline float AliFemtoV0::ErrdedxNeg() const {return fErrDedxNeg;} //Gael 04Fev2002
 inline float AliFemtoV0::LendedxNeg() const {return fLenDedxNeg;} //Gael 04Fev2002
-inline float AliFemtoV0::PseudoRapNeg() const {return fMomNeg.pseudoRapidity();} //Gael 04Fev2002
+inline float AliFemtoV0::PseudoRapNeg() const {return fMomNeg.PseudoRapidity();} //Gael 04Fev2002
 inline float AliFemtoV0::DedxPos() const {return fDedxPos;}
 inline float AliFemtoV0::NumdedxPos() const {return fNufDedxPos;} //Gael 04Fev2002
 inline float AliFemtoV0::ErrdedxPos() const {return fErrDedxPos;} //Gael 04Fev2002
 inline float AliFemtoV0::LendedxPos() const {return fLenDedxPos;} //Gael 04Fev2002
-inline float AliFemtoV0::PseudoRapPos() const {return fMomPos.pseudoRapidity();} //Gael 04Fev2002
+inline float AliFemtoV0::PseudoRapPos() const {return fMomPos.PseudoRapidity();} //Gael 04Fev2002
 
 
 inline unsigned long   AliFemtoV0::TrackTopologyMapPos(unsigned int word) const { return fTrackTopologyMapPos[word]; }

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoXi.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoXi.cxx
index 610e47a49a4f6bc9d770c4f8015eae1fa34e299c..06e0926c5131eed2fd595b8910de3815cd8475ee 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoXi.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoXi.cxx
@@ -32,10 +32,10 @@ void AliFemtoXi::UpdateXi(){
   float tMomV0AlongXi, tMomBacAlongXi;
 
    fMomXi  = MomV0() + MomBac(); 
-   fPtXi   = fMomXi.perp();
-   fPtotXi = fMomXi.mag();
-   fPtBac  = MomBac().perp();
-   fPtotBac= MomBac().mag();
+   fPtXi   = fMomXi.Perp();
+   fPtotXi = fMomXi.Mag();
+   fPtBac  = MomBac().Perp();
+   fPtotBac= MomBac().Mag();
    fEXi= ::sqrt(fPtotXi*fPtotXi+M_XI_MINUS*M_XI_MINUS);
    fEOmega= ::sqrt(fPtotXi*fPtotXi+M_OMEGA_MINUS*M_OMEGA_MINUS);
    fEBacPion = ::sqrt(PtotBac()*PtotBac()+M_PION_MINUS*M_PION_MINUS);
@@ -50,10 +50,10 @@ void AliFemtoXi::UpdateXi(){
    fMassOmega = ::sqrt(::pow(EBacKaon()+ELambda(),2)-::pow(fPtotXi,2));
 
    fRapXi = 0.5*::log( (EXi()+fMomXi.z()) / (EXi()-fMomXi.z()) );
-   fCTauXi = M_XI_MINUS*(fDecayLengthXi) / ::sqrt( ::pow((double)fMomXi.mag(),2.) );
+   fCTauXi = M_XI_MINUS*(fDecayLengthXi) / ::sqrt( ::pow((double)fMomXi.Mag(),2.) );
    
    fRapOmega = 0.5*::log( (EOmega()+fMomXi.z()) / (EOmega()-fMomXi.z()) );// eO,
-   fCTauOmega = M_OMEGA_MINUS*(fDecayLengthXi) / ::sqrt( ::pow((double)fMomXi.mag(),2.) );
+   fCTauOmega = M_OMEGA_MINUS*(fDecayLengthXi) / ::sqrt( ::pow((double)fMomXi.Mag(),2.) );
 }
 // -----------------------------------------------------------------------
 #ifdef __ROOT__

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFmLorentzVector.h b/PWG2/FEMTOSCOPY/AliFemto/AliFmLorentzVector.h
index 75314334a94c25b0093121bc952a97b3a3a748e6..45b5671088dc04b34234a5fe3cd0d955447a96fe 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFmLorentzVector.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFmLorentzVector.h
@@ -285,22 +285,22 @@ template<class T>
 T AliFmLorentzVector<T>::t() const {return mX4;}
 
 template<class T>
-T AliFmLorentzVector<T>::perp() const {return mThreeVector.perp();}
+T AliFmLorentzVector<T>::perp() const {return mThreeVector.Perp();}
 
 template<class T>
-T AliFmLorentzVector<T>::perp2() const {return mThreeVector.perp2();}
+T AliFmLorentzVector<T>::perp2() const {return mThreeVector.Perp2();}
 
 template<class T>
-T AliFmLorentzVector<T>::pseudoRapidity() const {return mThreeVector.pseudoRapidity();}
+T AliFmLorentzVector<T>::pseudoRapidity() const {return mThreeVector.PseudoRapidity();}
 
 template<class T>
-T AliFmLorentzVector<T>::phi() const {return mThreeVector.phi();}
+T AliFmLorentzVector<T>::phi() const {return mThreeVector.Phi();}
 
 template<class T>
-T AliFmLorentzVector<T>::theta() const {return mThreeVector.theta();}
+T AliFmLorentzVector<T>::theta() const {return mThreeVector.Theta();}
 
 template<class T>
-T AliFmLorentzVector<T>::cosTheta() const {return mThreeVector.cosTheta();}
+T AliFmLorentzVector<T>::cosTheta() const {return mThreeVector.CosTheta();}
 
 template<class T>
 T AliFmLorentzVector<T>::operator() (size_t i) const

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx
index 5c0b65529b2011b345681a7a58b7fd4d9207b198..1bc4f33e0e5e299ba741507dec365186e8716d7f 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx
@@ -27,7 +27,7 @@ AliFmPhysicalHelix::AliFmPhysicalHelix(const AliFmThreeVector<double>& p,
     SetPhase((M_PI/4)*(1-2.*fH));
   else
     SetPhase(atan2(p.y(),p.x())-fH*M_PI/2);
-  SetDipAngle(atan2(p.z(),p.perp()));
+  SetDipAngle(atan2(p.z(),p.Perp()));
   fOrigin = o;
   
 #ifndef ST_NO_NAMESPACES
@@ -35,7 +35,7 @@ AliFmPhysicalHelix::AliFmPhysicalHelix(const AliFmThreeVector<double>& p,
     using namespace units;
 #endif
     SetCurvature(fabs((c_light*nanosecond/meter*q*B/tesla)/
-                     (abs(p.mag())/GeV*fCosDipAngle)/meter));   
+                     (abs(p.Mag())/GeV*fCosDipAngle)/meter));   
 #ifndef ST_NO_NAMESPACES
   }
 #endif
@@ -74,7 +74,7 @@ AliFmThreeVector<double> AliFmPhysicalHelix::MomentumAt(double S, double B) cons
     double yc = this->YCenter();
     double rx = (Y(S)-yc)/(fOrigin.y()-yc);
     double ry = (X(S)-xc)/(fOrigin.x()-xc);
-    return (this->Momentum(B)).pseudoProduct(rx,ry,1.0);
+    return (this->Momentum(B)).PseudoProduct(rx,ry,1.0);
 }
 
 int AliFmPhysicalHelix::Charge(double B) const
@@ -104,7 +104,7 @@ double AliFmPhysicalHelix::GeometricSignedDistance(double x, double y)
     
     double cross = tDCAVec.x()*momVec.y() - tDCAVec.y()*momVec.x();
     double theSign = (cross>=0) ? 1. : -1.;
-    return theSign*tDCAVec.perp();
+    return theSign*tDCAVec.Perp();
 }
 
 double AliFmPhysicalHelix::CurvatureSignedDistance(double x, double y) 

diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVector.h b/PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVector.h
index a6b5b0110cc19eeca85ed6ca1e5b006d259f79df..5d9fc1d19ec9a4f9ea227186ba8073d24fa585e2 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVector.h
+++ b/PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVector.h
@@ -141,15 +141,15 @@ public:
     T   x()                        const;
     T   y()                        const;
     T   z()                        const;
-    T   theta()                    const;
-    T   cosTheta()                 const;
-    T   phi()                      const;
-    T   perp()                     const;
-    T   perp2()                    const;
-    T   magnitude()                const;
-    T   mag()                      const;
-    T   mag2()                     const;
-    T   pseudoRapidity()           const;
+    T   Theta()                    const;
+    T   CosTheta()                 const;
+    T   Phi()                      const;
+    T   Perp()                     const;
+    T   Perp2()                    const;
+    T   Magnitude()                const;
+    T   Mag()                      const;
+    T   Mag2()                     const;
+    T   PseudoRapidity()           const;
     T   operator() (size_t)        const;
     T   operator[] (size_t)        const;
 
@@ -161,21 +161,21 @@ public:
     AliFmThreeVector<T>  unit()       const;
     AliFmThreeVector<T>  orthogonal() const;
 
-    void  rotateX(T);
-    void  rotateY(T);
-    void  rotateZ(T);
+    void  RotateX(T);
+    void  RotateY(T);
+    void  RotateZ(T);
     
     AliFmThreeVector<T>  operator- ();
     AliFmThreeVector<T>  operator+ ();
     AliFmThreeVector<T>& operator*= (double);
     AliFmThreeVector<T>& operator/= (double);
-    AliFmThreeVector<T>  pseudoProduct(double,double,double) const;
+    AliFmThreeVector<T>  PseudoProduct(double,double,double) const;
  
 #ifndef ST_NO_MEMBER_TEMPLATES
-    template<class X> T                angle(const AliFmThreeVector<X>&) const;
-    template<class X> AliFmThreeVector<T> cross(const AliFmThreeVector<X>&) const;
-    template<class X> T                dot  (const AliFmThreeVector<X>&) const;
-    template<class X> AliFmThreeVector<T> pseudoProduct(const AliFmThreeVector<X>&) const;
+    template<class X> T                Angle(const AliFmThreeVector<X>&) const;
+    template<class X> AliFmThreeVector<T> Cross(const AliFmThreeVector<X>&) const;
+    template<class X> T                Dot  (const AliFmThreeVector<X>&) const;
+    template<class X> AliFmThreeVector<T> PseudoProduct(const AliFmThreeVector<X>&) const;
     
     template<class X> bool operator == (const AliFmThreeVector<X>& v) const;
     template<class X> bool operator != (const AliFmThreeVector<X>& v) const;
@@ -183,15 +183,15 @@ public:
     template<class X> AliFmThreeVector<T>& operator+= (const AliFmThreeVector<X>&);
     template<class X> AliFmThreeVector<T>& operator-= (const AliFmThreeVector<X>&);
 #else    
-    T                angle(const AliFmThreeVector<float>&) const;
-    AliFmThreeVector<T> cross(const AliFmThreeVector<float>&) const;
-    T                dot  (const AliFmThreeVector<float>&) const;
-    AliFmThreeVector<T> pseudoProduct(const AliFmThreeVector<float>&) const;
+    T                Angle(const AliFmThreeVector<float>&) const;
+    AliFmThreeVector<T> Cross(const AliFmThreeVector<float>&) const;
+    T                Dot  (const AliFmThreeVector<float>&) const;
+    AliFmThreeVector<T> PseudoProduct(const AliFmThreeVector<float>&) const;
     
-    T                angle(const AliFmThreeVector<double>&) const;
-    T                dot  (const AliFmThreeVector<double>&) const;
-    AliFmThreeVector<T> cross(const AliFmThreeVector<double>&) const;
-    AliFmThreeVector<T> pseudoProduct(const AliFmThreeVector<double>&) const;
+    T                Angle(const AliFmThreeVector<double>&) const;
+    T                Dot  (const AliFmThreeVector<double>&) const;
+    AliFmThreeVector<T> Cross(const AliFmThreeVector<double>&) const;
+    AliFmThreeVector<T> PseudoProduct(const AliFmThreeVector<double>&) const;
 
     bool operator == (const AliFmThreeVector<float>& v) const;
     bool operator != (const AliFmThreeVector<float>& v) const;
@@ -206,7 +206,7 @@ public:
     int             Valid(double world = 1.e+5) const;
     int               Bad(double world = 1.e+5) const;
 protected:
-    T    mX1, mX2, mX3;
+    T    mX1, mX2, mX3;  // Vector components
 #ifdef __ROOT__
   ClassDef(AliFmThreeVector,3)
 #endif /* __ROOT__ */
@@ -232,31 +232,31 @@ template<class T>
 inline void AliFmThreeVector<T>::SetZ(T az) {mX3 = az;}
 
 template<class T>
-void AliFmThreeVector<T>::SetPhi(T aangle)
+void AliFmThreeVector<T>::SetPhi(T aAngle)
 {
-    double  r = magnitude();
-    double th = theta();
+    double  r = Magnitude();
+    double th = Theta();
     
-    mX1 = r*sin(th)*cos(aangle);
-    mX2 = r*sin(th)*sin(aangle);
+    mX1 = r*sin(th)*cos(aAngle);
+    mX2 = r*sin(th)*sin(aAngle);
 }
 
 template <class T>
-void AliFmThreeVector<T>::SetTheta(T aangle)
+void AliFmThreeVector<T>::SetTheta(T aAngle)
 {
-    double r  = magnitude();
-    double ph = phi();
+    double r  = Magnitude();
+    double ph = Phi();
 
-    mX1 = r*sin(aangle)*cos(ph);
-    mX2 = r*sin(aangle)*sin(ph);
-    mX3 = r*cos(aangle);
+    mX1 = r*sin(aAngle)*cos(ph);
+    mX2 = r*sin(aAngle)*sin(ph);
+    mX3 = r*cos(aAngle);
 }
 
 template <class T>
 void AliFmThreeVector<T>::SetMagnitude(T r)
 {
-    double th = theta();
-    double ph = phi();
+    double th = Theta();
+    double ph = Phi();
     
     mX1 = r*sin(th)*cos(ph);
     mX2 = r*sin(th)*sin(ph);
@@ -279,38 +279,38 @@ template<class T>
 inline T AliFmThreeVector<T>::z() const {return mX3;}
 
 template<class T>
-inline T AliFmThreeVector<T>::theta() const
+inline T AliFmThreeVector<T>::Theta() const
 {
-  return acos(cosTheta());
+  return acos(CosTheta());
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::cosTheta() const
+inline T AliFmThreeVector<T>::CosTheta() const
 {
-  return mX3/(mag()+1e-20);
+  return mX3/(Mag()+1e-20);
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::phi() const
+inline T AliFmThreeVector<T>::Phi() const
 {
     return atan2(mX2,mX1);
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::pseudoRapidity() const
+inline T AliFmThreeVector<T>::PseudoRapidity() const
 {
     //
     // change code to more optimal:
-    // double m = mag();
+    // double m = Mag();
     // return 0.5*::log( (m+z())/(m-z()) );
-    double tmp = tan(theta()/2.); if (tmp <=0.) return 1e20;
+    double tmp = tan(Theta()/2.); if (tmp <=0.) return 1e20;
     return -::log(tmp);
 }
 
 template<class T>
 inline AliFmThreeVector<T> AliFmThreeVector<T>::unit() const
 {
-    double tmp = mag(); if (tmp<=0.) tmp = 1e-20;
+    double tmp = Mag(); if (tmp<=0.) tmp = 1e-20;
     return *this/tmp;
 }
 
@@ -336,64 +336,64 @@ AliFmThreeVector<T> AliFmThreeVector<T>::orthogonal() const
 }
 
 template <class T>
-void AliFmThreeVector<T>::rotateX(T aangle)
+void AliFmThreeVector<T>::RotateX(T aAngle)
 {
     // may in the future make use of the AliFmRotation class!
-    double yPrime = cos(aangle)*mX2 - sin(aangle)*mX3;
-    double zPrime = sin(aangle)*mX2 + cos(aangle)*mX3;
+    double yPrime = cos(aAngle)*mX2 - sin(aAngle)*mX3;
+    double zPrime = sin(aAngle)*mX2 + cos(aAngle)*mX3;
 
     mX2 = yPrime;
     mX3 = zPrime;
 }
 
 template <class T>
-void AliFmThreeVector<T>::rotateY(T aangle)
+void AliFmThreeVector<T>::RotateY(T aAngle)
 {
     // may in the future make use of the AliFmRotation class!
-    double zPrime = cos(aangle)*mX3 - sin(aangle)*mX1;
-    double xPrime = sin(aangle)*mX3 + cos(aangle)*mX1;
+    double zPrime = cos(aAngle)*mX3 - sin(aAngle)*mX1;
+    double xPrime = sin(aAngle)*mX3 + cos(aAngle)*mX1;
 
     mX1 = xPrime;
     mX3 = zPrime;
 }
 
 template <class T>
-void AliFmThreeVector<T>::rotateZ(T aangle)
+void AliFmThreeVector<T>::RotateZ(T aAngle)
 {
     // may in the future make use of the AliFmRotation class!
-    double xPrime = cos(aangle)*mX1 - sin(aangle)*mX2;
-    double yPrime = sin(aangle)*mX1 + cos(aangle)*mX2;
+    double xPrime = cos(aAngle)*mX1 - sin(aAngle)*mX2;
+    double yPrime = sin(aAngle)*mX1 + cos(aAngle)*mX2;
 
     mX1 = xPrime;
     mX2 = yPrime;
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::perp() const
+inline T AliFmThreeVector<T>::Perp() const
 {
     return ::sqrt(mX1*mX1+mX2*mX2);
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::perp2() const
+inline T AliFmThreeVector<T>::Perp2() const
 {
     return mX1*mX1+mX2*mX2;
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::magnitude() const
+inline T AliFmThreeVector<T>::Magnitude() const
 {
-    return mag();
+    return Mag();
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::mag() const
+inline T AliFmThreeVector<T>::Mag() const
 {
     return ::sqrt(mX1*mX1+mX2*mX2+mX3*mX3);
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::mag2() const
+inline T AliFmThreeVector<T>::Mag2() const
 {
     return mX1*mX1+mX2*mX2+mX3*mX3;
 }
@@ -462,7 +462,7 @@ inline AliFmThreeVector<T>& AliFmThreeVector<T>::operator/= (double c)
 
 template<class T>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::pseudoProduct(double ax,double ay,double az) const
+AliFmThreeVector<T>::PseudoProduct(double ax,double ay,double az) const
 {
     return AliFmThreeVector<T>(mX1*ax,mX2*ay,mX3*az);
 }
@@ -539,7 +539,7 @@ AliFmThreeVector<T>::operator-= (const AliFmThreeVector<X>& v)
 
 template<class T>
 template<class X>
-inline T AliFmThreeVector<T>::dot(const AliFmThreeVector<X>& v) const
+inline T AliFmThreeVector<T>::Dot(const AliFmThreeVector<X>& v) const
 {
     return mX1*v.x() + mX2*v.y() + mX3*v.z();
 }
@@ -547,7 +547,7 @@ inline T AliFmThreeVector<T>::dot(const AliFmThreeVector<X>& v) const
 template<class T>
 template<class X>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::cross(const AliFmThreeVector<X>& v) const
+AliFmThreeVector<T>::Cross(const AliFmThreeVector<X>& v) const
 {
     return AliFmThreeVector<T>(mX2*v.z() - mX3*v.y(),
                            mX3*v.x() - mX1*v.z(),
@@ -556,19 +556,19 @@ AliFmThreeVector<T>::cross(const AliFmThreeVector<X>& v) const
 
 template<class T>
 template<class X>
-inline T AliFmThreeVector<T>::angle(const AliFmThreeVector<X>& vec) const
+inline T AliFmThreeVector<T>::Angle(const AliFmThreeVector<X>& vec) const
 {
-    double norm = this->mag2()*vec.mag2(); 
+    double norm = this->Mag2()*vec.Mag2(); 
     
-    return norm > 0 ? acos(this->dot(vec)/(::sqrt(norm))) : 0;
+    return norm > 0 ? acos(this->Dot(vec)/(::sqrt(norm))) : 0;
 }
 
 template<class T>
 template<class X>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::pseudoProduct(const AliFmThreeVector<X>& v) const
+AliFmThreeVector<T>::PseudoProduct(const AliFmThreeVector<X>& v) const
 {
-    return this->pseudoProduct(v.x(),v.y(),v.z());
+    return this->PseudoProduct(v.x(),v.y(),v.z());
 }
 
 #endif
@@ -675,20 +675,20 @@ AliFmThreeVector<T>::operator-= (const AliFmThreeVector<double>& v)
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::dot(const AliFmThreeVector<float>& v) const
+inline T AliFmThreeVector<T>::Dot(const AliFmThreeVector<float>& v) const
 {
     return mX1*v.x() + mX2*v.y() + mX3*v.z();
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::dot(const AliFmThreeVector<double>& v) const
+inline T AliFmThreeVector<T>::Dot(const AliFmThreeVector<double>& v) const
 {
     return mX1*v.x() + mX2*v.y() + mX3*v.z();
 }
 
 template<class T>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::cross(const AliFmThreeVector<float>& v) const
+AliFmThreeVector<T>::Cross(const AliFmThreeVector<float>& v) const
 {
     return AliFmThreeVector<T>(mX2*v.z() - mX3*v.y(),
                            mX3*v.x() - mX1*v.z(),
@@ -697,7 +697,7 @@ AliFmThreeVector<T>::cross(const AliFmThreeVector<float>& v) const
 
 template<class T>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::cross(const AliFmThreeVector<double>& v) const
+AliFmThreeVector<T>::Cross(const AliFmThreeVector<double>& v) const
 {
     return AliFmThreeVector<T>(mX2*v.z() - mX3*v.y(),
                            mX3*v.x() - mX1*v.z(),
@@ -705,31 +705,31 @@ AliFmThreeVector<T>::cross(const AliFmThreeVector<double>& v) const
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::angle(const AliFmThreeVector<float>& v) const
+inline T AliFmThreeVector<T>::Angle(const AliFmThreeVector<float>& v) const
 {
-    double tmp = mag()*v.mag(); if (tmp <=0) tmp = 1e-20;
-    return acos(this->dot(v)/tmp);
+    double tmp = Mag()*v.Mag(); if (tmp <=0) tmp = 1e-20;
+    return acos(this->Dot(v)/tmp);
 }
 
 template<class T>
-inline T AliFmThreeVector<T>::angle(const AliFmThreeVector<double>& v) const
+inline T AliFmThreeVector<T>::Angle(const AliFmThreeVector<double>& v) const
 {
-    double tmp = mag()*v.mag(); if (tmp <=0) tmp = 1e-20;
-    return acos(this->dot(v)/tmp);
+    double tmp = Mag()*v.Mag(); if (tmp <=0) tmp = 1e-20;
+    return acos(this->Dot(v)/tmp);
 }
 
 template<class T>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::pseudoProduct(const AliFmThreeVector<float>& v) const
+AliFmThreeVector<T>::PseudoProduct(const AliFmThreeVector<float>& v) const
 {
-    return this->pseudoProduct(v.x(),v.y(),v.z());
+    return this->PseudoProduct(v.x(),v.y(),v.z());
 }
 
 template<class T>
 inline AliFmThreeVector<T>
-AliFmThreeVector<T>::pseudoProduct(const AliFmThreeVector<double>& v) const
+AliFmThreeVector<T>::PseudoProduct(const AliFmThreeVector<double>& v) const
 {
-    return this->pseudoProduct(v.x(),v.y(),v.z());
+    return this->PseudoProduct(v.x(),v.y(),v.z());
 }
 #endif  // ST_NO_MEMBER_TEMPLATES
 template<class T>
@@ -787,13 +787,13 @@ template<> ostream&  operator<<(ostream& os,const AliFmThreeVector<float>& v);
 //        Non-member functions
 //
 template<class T>
-inline T abs(const AliFmThreeVector<T>& v) {return v.mag();}
+inline T abs(const AliFmThreeVector<T>& v) {return v.Mag();}
 
 template<class T, class X>
 inline AliFmThreeVector<T>
 cross_product(const AliFmThreeVector<T>& v1, const AliFmThreeVector<X>& v2)
 {
-    return v1.cross(v2);
+    return v1.Cross(v2);
 }
 
 
@@ -817,7 +817,7 @@ operator- (const AliFmThreeVector<T>& v1, const AliFmThreeVector<X>& v2)
 template<class T, class X>
 inline T operator* (const AliFmThreeVector<T>& v1, const AliFmThreeVector<X>& v2)
 {
-    return AliFmThreeVector<T>(v1).dot(v2);
+    return AliFmThreeVector<T>(v1).Dot(v2);
 }
 
 template<class T>

diff --git a/PWG2/FEMTOSCOPY/AliFemto/TpcLocalTransform.cxx b/PWG2/FEMTOSCOPY/AliFemto/TpcLocalTransform.cxx
index 817636e4705743aa6565532d933d10b1d07a5948..314b98d94bb5ff1653848b353ec009147e6398f4 100644 (file)
--- a/PWG2/FEMTOSCOPY/AliFemto/TpcLocalTransform.cxx
+++ b/PWG2/FEMTOSCOPY/AliFemto/TpcLocalTransform.cxx
@@ -23,7 +23,7 @@ int TpcLocalTransform(AliFmThreeVectorD& aPoint, int& aSector, int& aRow,
 
   static double tPi = TMath::Pi();
   // --- find sector number
-  aPhi = aPoint.phi();
+  aPhi = aPoint.Phi();
   if(aPhi<0.) aPhi+=(2*tPi);
   aPhi += tPi/12.;
   if(aPhi>2*tPi) aPhi-=2*tPi;