]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
K0s code update (Matt Steinpreis)
authordgangadh <dgangadh@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Aug 2013 09:49:43 +0000 (09:49 +0000)
committerdgangadh <dgangadh@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 15 Aug 2013 09:49:43 +0000 (09:49 +0000)
PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0Analysis.cxx
PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0Analysis.h
PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0EventCollection.cxx
PWGCF/FEMTOSCOPY/K0Analysis/AliFemtoK0EventCollection.h

index eda386a2dd3898ed0b29b84112b26afaaeee9ed5..f587e34605cb2fa4ae1bbc51ddd08b3c98ef6924 100644 (file)
  * provided "as is" without express or implied warranty.                  *\r
  **************************************************************************/\r
 \r
-////////////////////////////////////////////////////////////////////////////////\r
+////////////////////////////////////////////////////////////////////////////\r
 //\r
-//  This class is used to perform femtoscopic analysis on K0s particles, which\r
-//  are reconstructed using the AliAODv0 class.  \r
+//  This class is used to perform femtoscopic analysis on K0s particles, \r
+//  which are reconstructed using the AliAODv0 class.  \r
 //\r
 //  authors: Matthew Steinpreis (matthew.steinpreis@cern.ch)\r
 //   \r
-//  Major changes:\r
+//  Change log:\r
 //     - TOF mismatch function calls changed (4/18/13)\r
-//     - added minimum decay length cut (3/28/13)\r
-//\r
-//  Minor changes:\r
+//     - added minimum decay length cut (rarely used though) (3/28/13)\r
 //     - K0 multiplicity histogram now filled with "unskippedCount" instead\r
-//       of k0Count (which included skipped k0s with shared daughters) (3/25/13)\r
+//       of k0Count (which included skipped k0s with shared daughters) \r
+//       (3/25/13)\r
 //     - added hists for 3D mom. in LF and PRF (3/28/13) \r
 //     - changed calling of PIDResponse (should be same actions) (3/28/13)\r
 //     - keep "side" K0s for mass plot (4/18)\r
 //             - tweaked loading and skipping appropriately\r
 //             - use merit test to skip sides (against good and side K0s)\r
 //             - a good K0 cant be skipped by a side\r
+//     - moved TPC propagation (via Hans' method) up to v0 level, which now\r
+//       uses an AliAODTrack(AliVTrack) instead of AliESDtrack (5/31/13)\r
+//     - added primary vertex subtraction in TPC propagation   (5/31/13)\r
+//     - removed all instances of AliESDtrack usage    (5/31/13)\r
+//     - removed old separation method/histograms      (5/31/13)\r
+//     - tidied up LCMS boost                                                  (6/10/13)\r
+//     - added new boosting prescription, get q out-side-long for LCMS and PRF (6/24/13)\r
+//             - added histograms and values for LCMS momenta (for simulation)\r
 ////////////////////////////////////////////////////////////////////////////////\r
 \r
 \r
-\r
\r
 #include <iostream>\r
 #include <math.h>\r
 #include "TMath.h"\r
@@ -88,11 +95,7 @@ AliAnalysisTaskSE(),
   fName(0x0),\r
   fAOD(0x0),\r
   fOutputList(0x0),\r
-  fPidAOD(0x0),\r
-  fPosDaughter1(0x0),  \r
-  fPosDaughter2(0x0),\r
-  fNegDaughter1(0x0),\r
-  fNegDaughter2(0x0)\r
+  fPidAOD(0x0)\r
 {\r
 }\r
 //________________________________________________________________________\r
@@ -109,11 +112,7 @@ AliFemtoK0Analysis::AliFemtoK0Analysis(const char *name, bool FieldPositive, boo
   fName(name),\r
   fAOD(0x0),\r
   fOutputList(0x0),\r
-  fPidAOD(0x0),\r
-  fPosDaughter1(0x0),  \r
-  fPosDaughter2(0x0),\r
-  fNegDaughter1(0x0),\r
-  fNegDaughter2(0x0)\r
+  fPidAOD(0x0)\r
 {\r
   //main constructor\r
   fFieldPos    = FieldPositive;\r
@@ -140,11 +139,7 @@ AliFemtoK0Analysis::AliFemtoK0Analysis(const AliFemtoK0Analysis &obj)
   fName(obj.fName),\r
   fAOD(obj.fAOD),\r
   fOutputList(obj.fOutputList),\r
-  fPidAOD(obj.fPidAOD),\r
-  fPosDaughter1(obj.fPosDaughter1),  \r
-  fPosDaughter2(obj.fPosDaughter2),\r
-  fNegDaughter1(obj.fNegDaughter1),\r
-  fNegDaughter2(obj.fNegDaughter2)\r
+  fPidAOD(obj.fPidAOD)\r
 {\r
 }\r
 //________________________________________________________________________\r
@@ -165,10 +160,6 @@ AliFemtoK0Analysis &AliFemtoK0Analysis::operator=(const AliFemtoK0Analysis &obj)
  fAOD          = obj.fAOD;\r
  fOutputList   = obj.fOutputList;\r
  fPidAOD       = obj.fPidAOD;\r
- fPosDaughter1         = obj.fPosDaughter1;  \r
- fPosDaughter2         = obj.fPosDaughter2;\r
- fNegDaughter1         = obj.fNegDaughter1;\r
- fNegDaughter2         = obj.fNegDaughter2;\r
 \r
  return (*this);\r
 }\r
@@ -183,10 +174,6 @@ AliFemtoK0Analysis::~AliFemtoK0Analysis()
   if(fAOD) delete fAOD;\r
   if(fOutputList) delete fOutputList;\r
   if(fPidAOD) delete fPidAOD;\r
-  if(fPosDaughter1) delete fPosDaughter1;\r
-  if(fPosDaughter2) delete fPosDaughter2;\r
-  if(fNegDaughter1) delete fNegDaughter1;\r
-  if(fNegDaughter2) delete fNegDaughter2;\r
 }\r
 //________________________________________________________________________\r
 void AliFemtoK0Analysis::MyInit()\r
@@ -209,11 +196,6 @@ void AliFemtoK0Analysis::MyInit()
   AliAODInputHandler *aodH = dynamic_cast<AliAODInputHandler*>(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());\r
   fPidAOD = aodH->GetPIDResponse();\r
 \r
-  fPosDaughter1 = new AliESDtrack();\r
-  fPosDaughter2 = new AliESDtrack();\r
-  fNegDaughter1 = new AliESDtrack();\r
-  fNegDaughter2 = new AliESDtrack();\r
-\r
   fRandomNumber = new TRandom3();  //for 3D, random sign switching\r
   fRandomNumber->SetSeed(0);\r
 \r
@@ -258,6 +240,31 @@ void AliFemtoK0Analysis::UserCreateOutputObjects()
   TH2F* fHistKtK0 = new TH2F("fHistKtK0", "Kt distribution of K0 pairs", kCentBins, .5, kCentBins+.5, 300, 0., 3.);\r
   fOutputList->Add(fHistKtK0);\r
 \r
+  TH1F* fHistPx = new TH1F("fHistPx","",200,0,2);\r
+  TH1F* fHistPy = new TH1F("fHistPy","",200,0,2);\r
+  TH1F* fHistPz = new TH1F("fHistPz","",200,0,2);\r
+  TH1F* fHistPxCM = new TH1F("fHistPxCM","",200,0,2);\r
+  TH1F* fHistPyCM = new TH1F("fHistPyCM","",200,0,2);\r
+  TH1F* fHistPzCM = new TH1F("fHistPzCM","",200,0,2);\r
+  TH1F* fHistKsCM = new TH1F("fHistKsCM","",200,0,2);\r
+  fOutputList->Add(fHistPx);\r
+  fOutputList->Add(fHistPy);\r
+  fOutputList->Add(fHistPz);\r
+  fOutputList->Add(fHistPxCM);\r
+  fOutputList->Add(fHistPyCM);\r
+  fOutputList->Add(fHistPzCM);\r
+  fOutputList->Add(fHistKsCM);\r
+\r
+  TH1F* fHistPtLCMS    = new TH1F("fHistPtLCMS","",300,0,3);\r
+  fOutputList->Add(fHistPtLCMS);\r
+  TH3F *fHistPLCMS = new TH3F("fHistPLCMS","",200,0,2,200,0,2,200,0,2);\r
+  fOutputList->Add(fHistPLCMS);\r
+\r
+\r
+  //pair gamma (LCMS to PRF, OSL)\r
+  TH3F* fHistKtGammaQinv = new TH3F("fHistKtGammaQinv","",200,0,2,500,1,5,100,0,1);\r
+  fOutputList->Add(fHistKtGammaQinv);\r
+\r
   //invariant mass distributions\r
   TH3F* fHistMass = new TH3F("fHistMass","",kCentBins,.5,kCentBins+.5,50,0.,5.,400,.3,.7);\r
   fOutputList->Add(fHistMass);\r
@@ -281,51 +288,21 @@ void AliFemtoK0Analysis::UserCreateOutputObjects()
   fOutputList->Add(fHistSepNumNeg);\r
   TH1F* fHistSepDenNeg = new TH1F("fHistSepDenNeg","",200,0,20);\r
   fOutputList->Add(fHistSepDenNeg);\r
-  //TH1F* fHistSepNumPosOld = new TH1F("fHistSepNumPosOld","",200,0,20);\r
-  //fOutputList->Add(fHistSepNumPosOld);\r
-  //TH1F* fHistSepDenPosOld = new TH1F("fHistSepDenPosOld","",200,0,20);\r
-  //fOutputList->Add(fHistSepDenPosOld);\r
-  //TH1F* fHistSepNumNegOld = new TH1F("fHistSepNumNegOld","",200,0,20);\r
-  //fOutputList->Add(fHistSepNumNegOld);\r
-  //TH1F* fHistSepDenNegOld = new TH1F("fHistSepDenNegOld","",200,0,20);\r
-  //fOutputList->Add(fHistSepDenNegOld);\r
   \r
   TH2F* fHistSepNumPos2 = new TH2F("fHistSepNumPos2","",100,0,20,100,0,20);\r
   TH2F* fHistSepDenPos2 = new TH2F("fHistSepDenPos2","",100,0,20,100,0,20);\r
   TH2F* fHistSepNumNeg2 = new TH2F("fHistSepNumNeg2","",100,0,20,100,0,20);\r
   TH2F* fHistSepDenNeg2 = new TH2F("fHistSepDenNeg2","",100,0,20,100,0,20);\r
-  //TH2F* fHistSepNumPos2Old = new TH2F("fHistSepNumPos2Old","",100,0,20,100,0,20);\r
-  //TH2F* fHistSepDenPos2Old = new TH2F("fHistSepDenPos2Old","",100,0,20,100,0,20);\r
-  //TH2F* fHistSepNumNeg2Old = new TH2F("fHistSepNumNeg2Old","",100,0,20,100,0,20);\r
-  //TH2F* fHistSepDenNeg2Old = new TH2F("fHistSepDenNeg2Old","",100,0,20,100,0,20);\r
   fOutputList->Add(fHistSepNumPos2);\r
   fOutputList->Add(fHistSepDenPos2);\r
   fOutputList->Add(fHistSepNumNeg2);\r
   fOutputList->Add(fHistSepDenNeg2);\r
-  //fOutputList->Add(fHistSepNumPos2Old);\r
-  //fOutputList->Add(fHistSepDenPos2Old);\r
-  //fOutputList->Add(fHistSepNumNeg2Old);\r
-  //fOutputList->Add(fHistSepDenNeg2Old);\r
+\r
 \r
   TH2F* fHistSepDPC = new TH2F("fHistSepDPC","",200,-1,1,50,0,10);\r
   TH2F* fHistSepDPCBkg = new TH2F("fHistSepDPCBkg","",200,-1,1,50,0,10);\r
   fOutputList->Add(fHistSepDPC);\r
-  fOutputList->Add(fHistSepDPCBkg);\r
-\r
-  TH1F* fHistPx = new TH1F("fHistPx","",200,0,2);\r
-  TH1F* fHistPy = new TH1F("fHistPy","",200,0,2);\r
-  TH1F* fHistPz = new TH1F("fHistPz","",200,0,2);\r
-  TH1F* fHistPxCM = new TH1F("fHistPxCM","",200,0,2);\r
-  TH1F* fHistPyCM = new TH1F("fHistPyCM","",200,0,2);\r
-  TH1F* fHistPzCM = new TH1F("fHistPzCM","",200,0,2);\r
-  TH1F* fHistKsCM = new TH1F("fHistKsCM","",200,0,2);\r
-  fOutputList->Add(fHistPx);\r
-  fOutputList->Add(fHistPy);\r
-  fOutputList->Add(fHistPz);\r
-  fOutputList->Add(fHistPxCM);\r
-  fOutputList->Add(fHistPyCM);\r
-  fOutputList->Add(fHistPzCM);\r
-  fOutputList->Add(fHistKsCM);\r
+  fOutputList->Add(fHistSepDPCBkg);  \r
 \r
 /////////Signal Distributions///////////////////\r
 \r
@@ -419,7 +396,7 @@ void AliFemtoK0Analysis::Exec(Option_t *)
 {\r
   // Main loop\r
   // Called for each event\r
-  //cout<<"===========  Event # "<<fEventCount+1<<"  ==========="<<endl;\r
+  cout<<"===========  Event # "<<fEventCount+1<<"  ==========="<<endl;\r
   fEventCount++;\r
   fAOD = dynamic_cast<AliAODEvent*> (InputEvent());\r
   if (!fAOD) {Printf("ERROR: fAOD not available"); return;}\r
@@ -573,6 +550,7 @@ void AliFemtoK0Analysis::Exec(Option_t *)
     bool orderswitch = kFALSE;\r
     if(tempTrack->Charge() > 0) {pos0or1 = 0; neg0or1 = 1;}\r
     else {pos0or1 = 1; neg0or1 = 0; orderswitch = kTRUE;}\r
+    //tempTrack->~AliAODTrack();\r
 \r
     //load daughter tracks\r
     AliAODTrack* prongTrackPos = (AliAODTrack*)v0->GetDaughter(pos0or1);\r
@@ -633,17 +611,17 @@ void AliFemtoK0Analysis::Exec(Option_t *)
     }\r
     \r
     //K0 cuts\r
-    if(v0->Eta() > kEtaCut)                                continue;    \r
-    if(v0->CosPointingAngle(primaryVertex) < kMinCosAngle) continue;\r
-    if(v0->MassK0Short() < .2 || v0->MassK0Short() > .8)   continue;\r
-    if(v0->DcaNegToPrimVertex() < kMinDCAPrimaryPion)      continue;\r
-    if(v0->DcaPosToPrimVertex() < kMinDCAPrimaryPion)      continue;  \r
-    if(v0->DecayLength(primaryVertex) > kMaxDLK0)          continue;\r
-    if(v0->DecayLength(primaryVertex) < kMinDLK0)         continue;\r
-    if(v0->DcaV0Daughters() > kMaxDCADaughtersK0)          continue;\r
+    if(v0->Eta() > kEtaCut)                                    continue;    \r
+    if(v0->CosPointingAngle(primaryVertex) < kMinCosAngle)     continue;\r
+    if(v0->MassK0Short() < .2 || v0->MassK0Short() > .8)       continue;\r
+    if(v0->DcaNegToPrimVertex() < kMinDCAPrimaryPion)          continue;\r
+    if(v0->DcaPosToPrimVertex() < kMinDCAPrimaryPion)          continue;  \r
+    if(v0->DecayLength(primaryVertex) > kMaxDLK0)              continue;\r
+    if(v0->DecayLength(primaryVertex) < kMinDLK0)                      continue;\r
+    if(v0->DcaV0Daughters() > kMaxDCADaughtersK0)              continue;\r
     double v0Dca = v0->DcaV0ToPrimVertex();\r
-    if(v0Dca > kMaxDCAK0)                                 continue;        \r
-    if(!goodPiMinus || !goodPiPlus)                        continue; \r
+    if(v0Dca > kMaxDCAK0)                                                      continue;        \r
+    if(!goodPiMinus || !goodPiPlus)                            continue; \r
     \r
     //EVERYTHING BELOW HERE PASSES SINGLE PARTICLE CUTS, PION PID, and LOOSE MASS CUT\r
 \r
@@ -691,12 +669,12 @@ void AliFemtoK0Analysis::Exec(Option_t *)
       }\r
      }\r
      if(tempK0[v0Count].fSkipShared) continue;         //if new K0 is skipped, don't load; go to next v0\r
-    }//if MeritCase            \r
-                                                                       \r
+    }//if MeritCase                    \r
+       \r
     //load parameters into temporary class instance\r
     if(v0Count < kMaxNumK0)\r
     {\r
-       if(goodK0){\r
+               if(goodK0){\r
          tempK0[v0Count].fK0 = kTRUE;\r
          k0Count++;\r
         }\r
@@ -706,7 +684,7 @@ void AliFemtoK0Analysis::Exec(Option_t *)
         //else tempK0[v0Count].fSideLeft = kFALSE;\r
         //if(v0->MassK0Short() > .515 && v0->MassK0Short() < .545) tempK0[v0Count].fSideRight = kTRUE;\r
         //else tempK0[v0Count].fSideRight = kFALSE;\r
-       //if(!goodK0) continue; //no sides, speed up analysis (REDUNDANT RIGHT NOW)\r
+               //if(!goodK0) continue; //no sides, speed up analysis (REDUNDANT RIGHT NOW)\r
 \r
         tempK0[v0Count].fDaughterID1    = prongTrackPos->GetID();\r
         tempK0[v0Count].fDaughterID2    = prongTrackNeg->GetID();\r
@@ -719,28 +697,27 @@ void AliFemtoK0Analysis::Exec(Option_t *)
 \r
         //for hists\r
         tempK0[v0Count].fDDDca         = v0->DcaV0Daughters();\r
-       tempK0[v0Count].fDecayLength    = v0->DecayLength(primaryVertex);\r
+               tempK0[v0Count].fDecayLength    = v0->DecayLength(primaryVertex);\r
         tempK0[v0Count].fPosPt         = v0->PtProng(pos0or1);\r
         tempK0[v0Count].fNegPt         = v0->PtProng(neg0or1);\r
         tempK0[v0Count].fPosPhi                = v0->PhiProng(pos0or1);\r
         tempK0[v0Count].fNegPhi                = v0->PhiProng(neg0or1);\r
-       if(!orderswitch){\r
+               if(!orderswitch){\r
          tempK0[v0Count].fPosDca       = v0->DcaPosToPrimVertex();\r
          tempK0[v0Count].fNegDca       = v0->DcaNegToPrimVertex();\r
-       }\r
+               }\r
         else{\r
          tempK0[v0Count].fPosDca       = v0->DcaNegToPrimVertex();\r
          tempK0[v0Count].fNegDca       = v0->DcaPosToPrimVertex();\r
-       } \r
-\r
+               \r
+        \r
         //for separation\r
-        prongTrackPos->GetCovarianceXYZPxPyPz(tempK0[v0Count].fCovPos);\r
-        prongTrackNeg->GetCovarianceXYZPxPyPz(tempK0[v0Count].fCovNeg);\r
-        prongTrackPos->GetXYZ(tempK0[v0Count].fXPos);\r
-        prongTrackNeg->GetXYZ(tempK0[v0Count].fXNeg);\r
+        GetGlobalPositionAtGlobalRadiiThroughTPC(prongTrackPos, bField, tempK0[v0Count].fPosXYZ, vertex);\r
+               GetGlobalPositionAtGlobalRadiiThroughTPC(prongTrackNeg, bField, tempK0[v0Count].fNegXYZ, vertex);\r
+        //for DPC\r
         prongTrackPos->GetPxPyPz(tempK0[v0Count].fPPos);\r
         prongTrackNeg->GetPxPyPz(tempK0[v0Count].fPNeg);\r
-   \r
+\r
         //if(idCount < 50){\r
         // if(goodK0){\r
         //  idArray[idCount*2]   = prongTrackPos->GetID();\r
@@ -786,31 +763,38 @@ void AliFemtoK0Analysis::Exec(Option_t *)
   // Correlations\r
   //////////////////////////////////////////////////////////////////////\r
 \r
-  float px1, py1, pz1, px2, py2, pz2, en1, en2;        //single kaon values\r
-  float pairPx, pairPy, pairPz;                         //kaon pair values\r
-  float pairP0, pairPt, pairKt, pairMt;                //LCMS values for out-side-long\r
-  float qinv, q0, qx, qy, qz, qLong, qSide, qOut;              //pair q values\r
+  float px1, py1, pz1, px2, py2, pz2;                  //single kaon values\r
+  float en1, en2;//, pt1, pt2;                                 //single kaon values\r
+  float pairPx, pairPy, pairPz, pairP0;                        //pair momentum values\r
+  float pairPt, pairMt, pairKt;                        //pair momentum values\r
+  float pairMInv, pairPDotQ;\r
+  float qinv, q0, qx, qy, qz;                          //pair q values\r
   float qLength, thetaSH, thetaSHCos, phiSH;            //Spherical Harmonics values\r
-  //float pt1, pt2;                                    //single kaon pt\r
   float am12, epm, h1, p12, p112, ppx, ppy, ppz, ks;   //PRF\r
+  //float qOutLCMS;\r
+  float qOutPRF, qSide, qLong;                         //relative momentum in LCMS/PRF frame\r
+  float betasq, gamma;\r
+  float p1LCMSOut, p1LCMSSide, p1LCMSLong, p1LCMSPt, en1LCMS;\r
+  float p2LCMSOut, p2LCMSSide, p2LCMSLong, p2LCMSPt, en2LCMS;\r
+\r
 \r
   for(int i=0; i<(fEvt)->fNumV0s; i++) // Current event V0\r
   {\r
     //single particle histograms (done here to avoid "skipped" v0s\r
      ((TH1F*)fOutputList->FindObject("fHistDCADaughters"))     ->Fill((fEvt)->fK0Particle[i].fDDDca);\r
      ((TH1F*)fOutputList->FindObject("fHistDecayLengthK0"))    ->Fill((fEvt)->fK0Particle[i].fDecayLength);\r
-     ((TH1F*)fOutputList->FindObject("fHistDCAK0"))            ->Fill((fEvt)->fK0Particle[i].fV0Dca);\r
+     ((TH1F*)fOutputList->FindObject("fHistDCAK0"))                    ->Fill((fEvt)->fK0Particle[i].fV0Dca);\r
      ((TH1F*)fOutputList->FindObject("fHistDCAPiMinus"))       ->Fill((fEvt)->fK0Particle[i].fNegDca);\r
      ((TH1F*)fOutputList->FindObject("fHistDCAPiPlus"))                ->Fill((fEvt)->fK0Particle[i].fPosDca);\r
-     ((TH2F*)fOutputList->FindObject("fHistPtK0"))             ->Fill(centBin+1, (fEvt)->fK0Particle[i].fPt);\r
+     ((TH2F*)fOutputList->FindObject("fHistPtK0"))                     ->Fill(centBin+1, (fEvt)->fK0Particle[i].fPt);\r
      ((TH2F*)fOutputList->FindObject("fHistK0PiPlusPt"))       ->Fill(centBin+1, (fEvt)->fK0Particle[i].fPosPt);\r
      ((TH2F*)fOutputList->FindObject("fHistK0PiMinusPt"))      ->Fill(centBin+1, (fEvt)->fK0Particle[i].fNegPt);\r
      ((TH1F*)fOutputList->FindObject("fHistDaughterPhi"))      ->Fill((fEvt)->fK0Particle[i].fPosPhi);\r
      ((TH1F*)fOutputList->FindObject("fHistDaughterPhi"))      ->Fill((fEvt)->fK0Particle[i].fNegPhi);\r
      \r
-     ((TH1F*)fOutputList->FindObject("fHistPx"))               ->Fill((fEvt)->fK0Particle[i].fMomentum[0]);\r
-     ((TH1F*)fOutputList->FindObject("fHistPy"))               ->Fill((fEvt)->fK0Particle[i].fMomentum[1]);\r
-     ((TH1F*)fOutputList->FindObject("fHistPz"))               ->Fill((fEvt)->fK0Particle[i].fMomentum[2]);\r
+     ((TH1F*)fOutputList->FindObject("fHistPx"))->Fill((fEvt)->fK0Particle[i].fMomentum[0]);\r
+     ((TH1F*)fOutputList->FindObject("fHistPy"))->Fill((fEvt)->fK0Particle[i].fMomentum[1]);\r
+     ((TH1F*)fOutputList->FindObject("fHistPz"))->Fill((fEvt)->fK0Particle[i].fMomentum[2]);\r
 \r
     for(int evnum=0; evnum<kEventsToMix+1; evnum++)// Event buffer loop: evnum=0 is the current event, all other evnum's are past events\r
     {\r
@@ -822,157 +806,139 @@ void AliFemtoK0Analysis::Exec(Option_t *)
         if(evnum==0)  // Get rid of shared tracks\r
         {\r
           if((fEvt)->fK0Particle[i].fDaughterID1 == (fEvt+evnum)->fK0Particle[j].fDaughterID1) continue;\r
-         if((fEvt)->fK0Particle[i].fDaughterID1 == (fEvt+evnum)->fK0Particle[j].fDaughterID2) continue;\r
-         if((fEvt)->fK0Particle[i].fDaughterID2 == (fEvt+evnum)->fK0Particle[j].fDaughterID1) continue;\r
-         if((fEvt)->fK0Particle[i].fDaughterID2 == (fEvt+evnum)->fK0Particle[j].fDaughterID2) continue;\r
-       }\r
+                 if((fEvt)->fK0Particle[i].fDaughterID1 == (fEvt+evnum)->fK0Particle[j].fDaughterID2) continue;\r
+             if((fEvt)->fK0Particle[i].fDaughterID2 == (fEvt+evnum)->fK0Particle[j].fDaughterID1) continue;\r
+             if((fEvt)->fK0Particle[i].fDaughterID2 == (fEvt+evnum)->fK0Particle[j].fDaughterID2) continue;\r
+           }\r
 \r
         px1 = (fEvt)->fK0Particle[i].fMomentum[0];\r
-       px2 = (fEvt+evnum)->fK0Particle[j].fMomentum[0];\r
-       py1 = (fEvt)->fK0Particle[i].fMomentum[1];\r
-       py2 = (fEvt+evnum)->fK0Particle[j].fMomentum[1];\r
-       pz1 = (fEvt)->fK0Particle[i].fMomentum[2];\r
-       pz2 = (fEvt+evnum)->fK0Particle[j].fMomentum[2];\r
-        //pt1 = (fEvt)->fK0Particle[i].fPt;\r
-        //pt2 = (fEvt+evnum)->fK0Particle[j].fPt;\r
-\r
-        pairPx = px1 + px2;\r
+               px2 = (fEvt+evnum)->fK0Particle[j].fMomentum[0];\r
+               py1 = (fEvt)->fK0Particle[i].fMomentum[1];\r
+               py2 = (fEvt+evnum)->fK0Particle[j].fMomentum[1];\r
+               pz1 = (fEvt)->fK0Particle[i].fMomentum[2];\r
+               pz2 = (fEvt+evnum)->fK0Particle[j].fMomentum[2];\r
+               //pt1 = (fEvt)->fK0Particle[i].fPt;\r
+               //pt2 = (fEvt+evnum)->fK0Particle[j].fPt;\r
+               en1  = sqrt(pow(px1,2)+pow(py1,2)+pow(pz1,2)+pow(kMassK0Short,2));\r
+               en2  = sqrt(pow(px2,2)+pow(py2,2)+pow(pz2,2)+pow(kMassK0Short,2));\r
 \r
-       pairPy = py1 + py2;\r
-       pairPz = pz1 + pz2;\r
-       pairKt = sqrt(pairPx*pairPx + pairPy*pairPy)/2.;\r
+        q0 = en1 - en2;\r
+        qx = px1 - px2;\r
+        qy = py1 - py2;\r
+        qz = pz1 - pz2;\r
+        qinv = sqrt(pow(qx,2) + pow(qy,2) + pow(qz,2) - pow(q0,2));\r
 \r
-       en1  = sqrt(pow(px1,2)+pow(py1,2)+pow(pz1,2)+pow(kMassK0Short,2));\r
-       en2  = sqrt(pow(px2,2)+pow(py2,2)+pow(pz2,2)+pow(kMassK0Short,2));\r
-        \r
-        qinv = sqrt(pow(px1-px2,2) + pow(py1-py2,2) + pow(pz1-pz2,2) - pow(en1-en2,2));\r
-       \r
-       //PRF\r
-        p12 = sqrt(pow(pairPx,2)+pow(pairPy,2)+pow(pairPz,2));         //pair momentum length\r
-        am12 = sqrt(pow(en1+en2,2)-p12*p12);                           //sqrt(s), |p1+p2| (4vec)\r
-        epm = en1+en2+am12;                                            //"energy plus mass"\r
-        p112 = px1*pairPx+py1*pairPy+pz1*pairPz;                       //proj. of p1 on pairP\r
+        pairPx = px1 + px2;\r
+               pairPy = py1 + py2;\r
+               pairPz = pz1 + pz2;\r
+        pairP0 = en1 + en2;\r
+               pairPt = sqrt(pairPx*pairPx + pairPy*pairPy);\r
+        pairKt = pairPt/2.;                                                                    //used for KT binning\r
+        pairMt = sqrt(pairP0*pairP0 - pairPz*pairPz);          //used for LCMS (not plots)\r
+               pairMInv = sqrt(pow(pairP0,2)-pow(pairPx,2)-pow(pairPy,2)-pow(pairPz,2));//used for PRF\r
+        pairPDotQ = pairP0*q0-pairPx*qx-pairPy*qy-pairPz*qz;   //used for PRF\r
+\r
+           //PRF (this section will probably be removed in favor of later boosting section)\r
+        p12 = sqrt(pow(pairPx,2)+pow(pairPy,2)+pow(pairPz,2)); //pair momentum length\r
+        am12 = sqrt(pow(en1+en2,2)-p12*p12);                                   //sqrt(s)=|p1+p2|(4vec)\r
+        epm = en1+en2+am12;                                                                            //"energy plus mass"\r
+        p112 = px1*pairPx+py1*pairPy+pz1*pairPz;                               //proj. of p1 on pairP\r
+        if(am12 == 0) continue;\r
         h1 = (p112/epm - en1)/am12;\r
-        ppx = px1+pairPx*h1;                                           //px in PRF\r
-        ppy = py1+pairPy*h1;                                           //py in PRF     \r
-        ppz = pz1+pairPz*h1;                                           //pz in PRF\r
-        ks = sqrt(ppx*ppx+ppy*ppy+ppz*ppz);                            //k*\r
+        ppx = px1+pairPx*h1;                                                                   //px in PRF\r
+        ppy = py1+pairPy*h1;                                                                   //py in PRF     \r
+        ppz = pz1+pairPz*h1;                                                                   //pz in PRF\r
+        ks = sqrt(ppx*ppx+ppy*ppy+ppz*ppz);                                            //k*\r
         ((TH1F*)fOutputList->FindObject("fHistPxCM"))->Fill(ppx);\r
         ((TH1F*)fOutputList->FindObject("fHistPyCM"))->Fill(ppy);\r
         ((TH1F*)fOutputList->FindObject("fHistPzCM"))->Fill(ppz);\r
         ((TH1F*)fOutputList->FindObject("fHistKsCM"))->Fill(ks);\r
         \r
-\r
-        //out-side-long\r
-        pairP0 = en1 + en2;\r
-        q0 = en1 - en2;\r
-        qx = px1 - px2;\r
-        qy = py1 - py2;\r
-        qz = pz1 - pz2;\r
-        if(fRandomNumber->Rndm() < .5){\r
-        //qx = -1*qx; qy = -1*qy; qz = -1*qz;\r
-       }\r
-        pairPt = pairKt*2.;\r
-        pairMt = sqrt(pairP0*pairP0 - pairPz*pairPz);\r
-        qLong = (pairP0*qz - pairPz*q0)/pairMt;\r
-        qOut = (pairPx*qx + pairPy*qy)/pairPt;\r
-        qSide = (pairPx*qy - pairPy*qx)/pairPt;\r
+        //relative momentum in out-side-long for LCMS and PRF\r
+        //if(fRandomNumber->Rndm() < .5){\r
+                //qx = -1*qx; qy = -1*qy; qz = -1*qz;  //randomizing signs, not sure if needed\r
+               //}\r
+        if(pairMt == 0 || pairPt == 0) continue;\r
+        qLong = (pairP0*qz - pairPz*q0)/pairMt;        //same for both frames\r
+        qSide = (pairPx*qy - pairPy*qx)/pairPt;        //same for both frames\r
+        //qOutLCMS = (pairPx*qx + pairPy*qy)/pairPt;\r
+               qOutPRF  = pairMInv*(pairPx*qx+pairPy*qy)/pairMt/pairPt - pairPt*pairPDotQ/pairMt/pairMInv;\r
+        \r
+               //finding gamma for gamma binning/hists (likely will be removed after tests)\r
+               p1LCMSOut       = (pairPx*px1+pairPy*py1)/pairPt;\r
+               p1LCMSSide      = (pairPx*py1-pairPy*px1)/pairPt;\r
+               p1LCMSLong      = (pairP0*pz1-pairPz*en1)/pairMt;\r
+               p1LCMSPt        = sqrt(pow(p1LCMSOut,2)+pow(p1LCMSSide,2));\r
+               p2LCMSOut       = (pairPx*px2+pairPy*py2)/pairPt;\r
+               p2LCMSSide      = (pairPx*py2-pairPy*px2)/pairPt;\r
+               p2LCMSLong      = (pairP0*pz2-pairPz*en2)/pairMt;\r
+               p2LCMSPt        = sqrt(pow(p2LCMSOut,2)+pow(p2LCMSSide,2));\r
+               en1LCMS = sqrt(pow(p1LCMSOut,2)+pow(p1LCMSSide,2)+pow(p1LCMSLong,2)+pow(kMassK0Short,2));\r
+               en2LCMS = sqrt(pow(p2LCMSOut,2)+pow(p2LCMSSide,2)+pow(p2LCMSLong,2)+pow(kMassK0Short,2));               \r
+               betasq = pow((p1LCMSOut+p2LCMSOut)/(en1LCMS+en2LCMS),2);\r
+               gamma = 1./sqrt(1-betasq);\r
+               ((TH3F*)fOutputList->FindObject("fHistKtGammaQinv"))->Fill(pairKt,gamma,qinv);\r
+               ((TH1F*)fOutputList->FindObject("fHistPtLCMS"))->Fill(p1LCMSPt);\r
+               ((TH1F*)fOutputList->FindObject("fHistPtLCMS"))->Fill(p2LCMSPt);\r
+               ((TH3F*)fOutputList->FindObject("fHistPLCMS"))->Fill(p1LCMSOut,p1LCMSSide,p1LCMSLong);\r
+               ((TH3F*)fOutputList->FindObject("fHistPLCMS"))->Fill(p2LCMSOut,p2LCMSSide,p2LCMSLong);\r
 \r
         //Spherical harmonics\r
-        qLength = sqrt(qLong*qLong + qSide*qSide + qOut*qOut);\r
+        qLength = sqrt(qLong*qLong + qSide*qSide + qOutPRF*qOutPRF);\r
         thetaSHCos = qLong/qLength;\r
         thetaSH = acos(thetaSHCos);\r
-        phiSH = acos(qOut/(qLength*sin(thetaSH)));\r
-\r
-        //SEPARATION STUDIES (two methods are compared here; one will be phased out soon (old way is commented out))\r
-        //Both methods take same-sign daughter separation throughout TPC\r
-        fPosDaughter1->Set((fEvt)->fK0Particle[i].fXPos, (fEvt)->fK0Particle[i].fPPos, (fEvt)->fK0Particle[i].fCovPos, 1);\r
-        fNegDaughter1->Set((fEvt)->fK0Particle[i].fXNeg, (fEvt)->fK0Particle[i].fPNeg, (fEvt)->fK0Particle[i].fCovNeg, -1);\r
-        fPosDaughter2->Set((fEvt+evnum)->fK0Particle[j].fXPos, (fEvt+evnum)->fK0Particle[j].fPPos, (fEvt+evnum)->fK0Particle[j].fCovPos, 1);\r
-        fNegDaughter2->Set((fEvt+evnum)->fK0Particle[j].fXNeg, (fEvt+evnum)->fK0Particle[j].fPNeg, (fEvt+evnum)->fK0Particle[j].fCovNeg, -1);\r
-       \r
-        //variables for old method\r
-        //double rP1[3]; //positive daughter position (K0 #1)\r
-        //double rN1[3]; //negative daughter position (K0 #1)\r
-        //double rP2[3]; //positive daughter position (K0 #2)\r
-        //double rN2[3]; //negative daughter position (K0 #2)\r
-        //float pDiff;  //positive daughter separation\r
-        //float nDiff;  //negative daughter separation\r
-        //float pMean = 0; //average separation, positive\r
-        //float nMean = 0; //average separation, negative\r
-        //float pMin = 9999; //minimum separation, positive\r
-        //float nMin = 9999; //minimum separation, negative\r
-\r
-        //new method from Hans Beck\r
+        phiSH = acos(qOutPRF/(qLength*sin(thetaSH)));\r
+\r
+        //Finding average separation of daughters throughout TPC - two-track cut\r
         float posPositions1[9][3] = {{0}};\r
         float negPositions1[9][3] = {{0}};\r
         float posPositions2[9][3] = {{0}};\r
         float negPositions2[9][3] = {{0}};\r
-        GetGlobalPositionAtGlobalRadiiThroughTPC(fPosDaughter1,bField,posPositions1);\r
-        GetGlobalPositionAtGlobalRadiiThroughTPC(fPosDaughter2,bField,posPositions2);\r
-        GetGlobalPositionAtGlobalRadiiThroughTPC(fNegDaughter1,bField,negPositions1);\r
-        GetGlobalPositionAtGlobalRadiiThroughTPC(fNegDaughter2,bField,negPositions2);\r
-        float pMean2 = 0;\r
-        float nMean2 = 0;\r
-\r
-        float pDiff2;\r
-        float nDiff2;\r
-        float pMin2 = 9999;\r
-        float nMin2 = 9999;\r
-\r
-        double pCount=0;  //counter for number of radial points used (low pT tracks don't go all the way through TPC)\r
-        double nCount=0;\r
+        for(int iPos = 0; iPos < 9; iPos++){\r
+         for(int jPos = 0; jPos < 3; jPos++){\r
+           posPositions1[iPos][jPos] = (fEvt)->fK0Particle[i].fPosXYZ[iPos][jPos];\r
+           negPositions1[iPos][jPos] = (fEvt)->fK0Particle[i].fNegXYZ[iPos][jPos];\r
+           posPositions2[iPos][jPos] = (fEvt+evnum)->fK0Particle[j].fPosXYZ[iPos][jPos];\r
+           negPositions2[iPos][jPos] = (fEvt+evnum)->fK0Particle[j].fNegXYZ[iPos][jPos];\r
+         }\r
+        }    \r
+        float pMean = 0.;      //average separation for positive daughters\r
+        float nMean = 0.;      //average separation for negative daughters\r
+        float pDiff;           \r
+        float nDiff;\r
+        float pMin = 9999.;    //minimum separation (updates) - pos\r
+        float nMin = 9999.;    //minimum separation (updates) - neg\r
+        double pCount=0;       //counter for number of points used - pos\r
+        double nCount=0;       //counter for number of points used - neg\r
         for(int ss=0;ss<9;ss++){\r
-         \r
          if(posPositions1[ss][0] != -9999 && posPositions2[ss][0] != -9999){          \r
           pCount++;\r
-          //fPosDaughter1->GetXYZAt(85+(ss*20), bField, rP1);\r
-          //fPosDaughter2->GetXYZAt(85+(ss*20), bField, rP2);\r
-          //pDiff = sqrt(pow(rP1[0]-rP2[0],2)+pow(rP1[1]-rP2[1],2)+pow(rP1[2]-rP2[2],2));\r
-          pDiff2 = sqrt(pow(posPositions1[ss][0]-posPositions2[ss][0],2)+pow(posPositions1[ss][1]-posPositions2[ss][1],2)+pow(posPositions1[ss][2]-posPositions2[ss][2],2));\r
-          //pMean = pMean + pDiff;\r
-          pMean2 = pMean2 + pDiff2;\r
-          //if(pDiff < pMin) pMin = pDiff;\r
-          if(pDiff2 < pMin2) pMin2 = pDiff2;\r
+          pDiff = sqrt(pow(posPositions1[ss][0]-posPositions2[ss][0],2)+pow(posPositions1[ss][1]-posPositions2[ss][1],2)+pow(posPositions1[ss][2]-posPositions2[ss][2],2));\r
+          pMean = pMean + pDiff;\r
+          if(pDiff < pMin) pMin = pDiff;\r
          }\r
-\r
          if(negPositions1[ss][0] != -9999 && negPositions1[ss][0] != -9999){\r
           nCount++;\r
-          //fNegDaughter1->GetXYZAt(85+(ss*20), bField, rN1);\r
-          //fNegDaughter2->GetXYZAt(85+(ss*20), bField, rN2);\r
-          //nDiff = sqrt(pow(rN1[0]-rN2[0],2)+pow(rN1[1]-rN2[1],2)+pow(rN1[2]-rN2[2],2));\r
-          nDiff2 = sqrt(pow(negPositions1[ss][0]-negPositions2[ss][0],2)+pow(negPositions1[ss][1]-negPositions2[ss][1],2)+pow(negPositions1[ss][2]-negPositions2[ss][2],2));     \r
-          //nMean = nMean + nDiff;\r
-          nMean2 = nMean2 + nDiff2;\r
-          //if(nDiff < nMin) nMin = nDiff;\r
-          if(nDiff2 < nMin2) nMin2 = nDiff2;\r
+          nDiff = sqrt(pow(negPositions1[ss][0]-negPositions2[ss][0],2)+pow(negPositions1[ss][1]-negPositions2[ss][1],2)+pow(negPositions1[ss][2]-negPositions2[ss][2],2));     \r
+          nMean = nMean + nDiff;\r
+          if(nDiff < nMin) nMin = nDiff;\r
          }\r
         }\r
-        //pMean = pMean/pCount;\r
-        //nMean = nMean/nCount;\r
-        pMean2 = pMean2/pCount;\r
-        nMean2 = nMean2/nCount;      \r
+        pMean = pMean/pCount; \r
+        nMean = nMean/nCount;     \r
 \r
         if(evnum==0){ \r
-         ((TH1F*)fOutputList->FindObject("fHistSepNumPos"))->Fill(pMean2); \r
-         ((TH1F*)fOutputList->FindObject("fHistSepNumNeg"))->Fill(nMean2);\r
-         //((TH1F*)fOutputList->FindObject("fHistSepNumPosOld"))->Fill(pMean);\r
-         //((TH1F*)fOutputList->FindObject("fHistSepNumNegOld"))->Fill(nMean);\r
-         ((TH2F*)fOutputList->FindObject("fHistSepNumPos2"))->Fill(pMean2,pMin2);\r
-         ((TH2F*)fOutputList->FindObject("fHistSepNumNeg2"))->Fill(nMean2,nMin2);\r
-         //((TH2F*)fOutputList->FindObject("fHistSepNumPos2Old"))->Fill(pMean,pMin);\r
-         //((TH2F*)fOutputList->FindObject("fHistSepNumNeg2Old"))->Fill(nMean,nMin);\r
+         ((TH1F*)fOutputList->FindObject("fHistSepNumPos"))->Fill(pMean); \r
+         ((TH1F*)fOutputList->FindObject("fHistSepNumNeg"))->Fill(nMean);\r
+         ((TH2F*)fOutputList->FindObject("fHistSepNumPos2"))->Fill(pMean,pMin);\r
+         ((TH2F*)fOutputList->FindObject("fHistSepNumNeg2"))->Fill(nMean,nMin);\r
         }\r
         else{\r
-         ((TH1F*)fOutputList->FindObject("fHistSepDenPos"))->Fill(pMean2); \r
-         ((TH1F*)fOutputList->FindObject("fHistSepDenNeg"))->Fill(nMean2);\r
-         //((TH1F*)fOutputList->FindObject("fHistSepDenPosOld"))->Fill(pMean);\r
-         //((TH1F*)fOutputList->FindObject("fHistSepDenNegOld"))->Fill(nMean);\r
-         ((TH2F*)fOutputList->FindObject("fHistSepDenPos2"))->Fill(pMean2,pMin2);\r
-         ((TH2F*)fOutputList->FindObject("fHistSepDenNeg2"))->Fill(nMean2,nMin2);\r
-         //((TH2F*)fOutputList->FindObject("fHistSepDenPos2Old"))->Fill(pMean,pMin);\r
-         //((TH2F*)fOutputList->FindObject("fHistSepDenNeg2Old"))->Fill(nMean,nMin);\r
-         }\r
+         ((TH1F*)fOutputList->FindObject("fHistSepDenPos"))->Fill(pMean); \r
+         ((TH1F*)fOutputList->FindObject("fHistSepDenNeg"))->Fill(nMean);\r
+         ((TH2F*)fOutputList->FindObject("fHistSepDenPos2"))->Fill(pMean,pMin);\r
+         ((TH2F*)fOutputList->FindObject("fHistSepDenNeg2"))->Fill(nMean,nMin);\r
+        }\r
 \r
         //Decay plane coincidence\r
         //daughter momenta\r
@@ -1001,15 +967,15 @@ void AliFemtoK0Analysis::Exec(Option_t *)
         float crosslength2 = sqrt(pow(cross2[0],2)+pow(cross2[1],2)+pow(cross2[2],2));\r
         float dpc = (cross1[0]*cross2[0]+cross1[1]*cross2[1]+cross1[2]*cross2[2])/(crosslength1*crosslength2);\r
 \r
-        if(evnum==0)((TH2F*)fOutputList->FindObject("fHistSepDPC"))->Fill(dpc,pMean2);\r
-        else ((TH2F*)fOutputList->FindObject("fHistSepDPCBkg"))->Fill(dpc,pMean2);\r
+        if(evnum==0)((TH2F*)fOutputList->FindObject("fHistSepDPC"))->Fill(dpc,pMean);\r
+        else ((TH2F*)fOutputList->FindObject("fHistSepDPCBkg"))->Fill(dpc,pMean);\r
        \r
-        if(pMean2 < kMinSeparation || nMean2 < kMinSeparation) continue; //using the "new" method (ala Hans)\r
+        if(pMean < kMinSeparation || nMean < kMinSeparation) continue; //using the "new" method (ala Hans)\r
         //end separation studies\r
 \r
         //Fill Histograms\r
         bool center1K0   = kFALSE;  //accepted mass K0\r
-       bool center2K0   = kFALSE;\r
+               bool center2K0   = kFALSE;\r
         if((fEvt)->fK0Particle[i].fK0) center1K0=kTRUE;\r
         if((fEvt+evnum)->fK0Particle[j].fK0) center2K0=kTRUE;\r
         //bool CL1 = kFALSE;\r
@@ -1086,17 +1052,17 @@ void AliFemtoK0Analysis::Exec(Option_t *)
            //3D\r
            if(pairKt < 1.0){\r
             if(centBin > 13){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLCentLowKt"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLCentLowKt"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHCentLowKt"))->Fill(qLength,thetaSHCos,phiSH);}\r
             else if(centBin > 9){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentLowKt"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentLowKt"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHSemiCentLowKt"))->Fill(qLength,thetaSHCos,phiSH);}}            \r
            else if(pairKt < 2.0){\r
             if(centBin > 13){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLCentHighKt"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLCentHighKt"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHCentHighKt"))->Fill(qLength,thetaSHCos, phiSH);}\r
             else if(centBin > 9){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentHighKt"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentHighKt"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHSemiCentHighKt"))->Fill(qLength, thetaSHCos, phiSH);}}\r
           }\r
 \r
@@ -1128,17 +1094,17 @@ void AliFemtoK0Analysis::Exec(Option_t *)
            //3D\r
            if(pairKt < 1.0){\r
             if(centBin > 13){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLCentLowKtBkg"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLCentLowKtBkg"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHCentLowKtBkg"))->Fill(qLength,thetaSHCos,phiSH);}\r
             else if(centBin > 9){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentLowKtBkg"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentLowKtBkg"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHSemiCentLowKtBkg"))->Fill(qLength,thetaSHCos,phiSH);}}\r
            else if(pairKt < 2.0){\r
             if(centBin > 13){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLCentHighKtBkg"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLCentHighKtBkg"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHCentHighKtBkg"))->Fill(qLength, thetaSHCos, phiSH);}\r
             else if(centBin > 9){\r
-             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentHighKtBkg"))->Fill(qOut,qSide,qLong);\r
+             ((TH3F*)fOutputList->FindObject("fHistOSLSemiCentHighKtBkg"))->Fill(qOutPRF,qSide,qLong);\r
              ((TH3F*)fOutputList->FindObject("fHistSHSemiCentHighKtBkg"))->Fill(qLength, thetaSHCos, phiSH);}}\r
           }\r
 \r
@@ -1166,7 +1132,7 @@ void AliFemtoK0Analysis::Terminate(Option_t *)
 }\r
 \r
 //_________________________________________________________________________\r
-void AliFemtoK0Analysis::GetGlobalPositionAtGlobalRadiiThroughTPC(const AliESDtrack *track, const Float_t bfield, Float_t globalPositionsAtRadii[9][3]){\r
+void AliFemtoK0Analysis::GetGlobalPositionAtGlobalRadiiThroughTPC(const AliAODTrack *track, const Float_t bfield, Float_t globalPositionsAtRadii[9][3], double PrimaryVertex[3]){\r
   // Gets the global position of the track at nine different radii in the TPC\r
   // track is the track you want to propagate\r
   // bfield is the magnetic field of your event\r
@@ -1223,6 +1189,11 @@ void AliFemtoK0Analysis::GetGlobalPositionAtGlobalRadiiThroughTPC(const AliESDtr
       globalPositionsAtRadii[iR][0]=xyz[0];\r
       globalPositionsAtRadii[iR][1]=xyz[1];\r
       globalPositionsAtRadii[iR][2]=xyz[2];\r
+      //subtract primary vertex, "zero" track for correct mixed-event comparison\r
+      globalPositionsAtRadii[iR][0] -= PrimaryVertex[0];\r
+      globalPositionsAtRadii[iR][1] -= PrimaryVertex[1];\r
+      globalPositionsAtRadii[iR][2] -= PrimaryVertex[2];\r
+\r
       // Indicate we want the next radius    \r
       iR+=1;\r
     }\r
index 0eeed687dc4dc616f4c4feee8e6a0e0ba7cfec88..e4d51634b6d123e587481be23486bff558ca2cf5 100644 (file)
@@ -42,7 +42,8 @@ class AliFemtoK0Analysis : public AliAnalysisTaskSE {
   virtual void   Terminate(Option_t *);  
 
   void MyInit();
-  void GetGlobalPositionAtGlobalRadiiThroughTPC(const AliESDtrack *track, const Float_t bfield, Float_t globalPositionsAtRadii[9][3]);
+  void GetGlobalPositionAtGlobalRadiiThroughTPC(const AliAODTrack *track, const Float_t bfield, Float_t globalPositionsAtRadii[9][3], double PrimaryVertex[3]);
+  void GetGlobalPositionAtGlobalRadiiThroughTPCTEST(const AliAODTrack *track, const Float_t bfield, double PrimaryVertex[3]);
   
   enum 
   {
@@ -70,10 +71,6 @@ class AliFemtoK0Analysis : public AliAnalysisTaskSE {
   AliAODEvent    *fAOD; //!    // AOD object
   TList          *fOutputList; //! Compact Output list
   AliPIDResponse *fPidAOD; //!
-  AliESDtrack    *fPosDaughter1;//!
-  AliESDtrack    *fPosDaughter2;//!
-  AliESDtrack    *fNegDaughter1;//!
-  AliESDtrack    *fNegDaughter2;//!
   
   ClassDef(AliFemtoK0Analysis, 1); 
 };
index 403602f14c457766d1ef4a91b84ef5a427e04508..bd4871845498ccaaa2c77e62c540403f1147dbcf 100644 (file)
@@ -43,12 +43,10 @@ AliFemtoK0Particle::AliFemtoK0Particle() :
  fNegPt(0),
  fPosPhi(0),
  fNegPhi(0),
- fXPos(),
- fXNeg(),
  fPPos(),
  fPNeg(),
- fCovPos(),
- fCovNeg()
+ fPosXYZ(),
+ fNegXYZ()
 {
   //Default constructor
 }
@@ -72,12 +70,11 @@ AliFemtoK0Particle::AliFemtoK0Particle(const AliFemtoK0Particle &obj) :
  fNegPt(obj.fNegPt),
  fPosPhi(obj.fPosPhi),
  fNegPhi(obj.fNegPhi),
- fXPos(),
- fXNeg(),
  fPPos(),
  fPNeg(),
- fCovPos(),
- fCovNeg()
+ fPosXYZ(),
+ fNegXYZ()
+
 {
   // copy constructor
 }
@@ -107,33 +104,14 @@ AliFemtoK0Particle &AliFemtoK0Particle::operator=(const AliFemtoK0Particle &obj)
  fNegPt = obj.fNegPt;
  fPosPhi = obj.fPosPhi;
  fNegPhi = obj.fNegPhi;
- fXPos[0] = obj.fXPos[0];
- fXPos[1] = obj.fXPos[1];
- fXPos[2] = obj.fXPos[2];
- fXNeg[0] = obj.fXNeg[0];
- fXNeg[1] = obj.fXNeg[1];
- fXNeg[2] = obj.fXNeg[2];
- fPPos[0] = obj.fPPos[0];
- fPPos[1] = obj.fPPos[1];
- fPPos[2] = obj.fPPos[2];
- fPNeg[0] = obj.fPNeg[0];
- fPNeg[1] = obj.fPNeg[1];
- fPNeg[2] = obj.fPNeg[2];
- fCovPos[0] = obj.fCovPos[0];  fCovPos[1] = obj.fCovPos[1];  fCovPos[2] = obj.fCovPos[2];
- fCovPos[3] = obj.fCovPos[3];  fCovPos[4] = obj.fCovPos[4];  fCovPos[5] = obj.fCovPos[5];
- fCovPos[6] = obj.fCovPos[6];  fCovPos[7] = obj.fCovPos[7];  fCovPos[8] = obj.fCovPos[8];
- fCovPos[9] = obj.fCovPos[9];  fCovPos[10] = obj.fCovPos[10];  fCovPos[11] = obj.fCovPos[11];
- fCovPos[12] = obj.fCovPos[12];  fCovPos[13] = obj.fCovPos[13];  fCovPos[14] = obj.fCovPos[14];
- fCovPos[17] = obj.fCovPos[17];  fCovPos[17] = obj.fCovPos[17];  fCovPos[17] = obj.fCovPos[17];
- fCovPos[18] = obj.fCovPos[18];  fCovPos[19] = obj.fCovPos[19];  fCovPos[20] = obj.fCovPos[20];
- fCovNeg[0] = obj.fCovNeg[0];  fCovNeg[1] = obj.fCovNeg[1];  fCovNeg[2] = obj.fCovNeg[2];
- fCovNeg[3] = obj.fCovNeg[3];  fCovNeg[4] = obj.fCovNeg[4];  fCovNeg[5] = obj.fCovNeg[5];
- fCovNeg[6] = obj.fCovNeg[6];  fCovNeg[7] = obj.fCovNeg[7];  fCovNeg[8] = obj.fCovNeg[8];
- fCovNeg[9] = obj.fCovNeg[9];  fCovNeg[10] = obj.fCovNeg[10];  fCovNeg[11] = obj.fCovNeg[11];
- fCovNeg[12] = obj.fCovNeg[12];  fCovNeg[13] = obj.fCovNeg[13];  fCovNeg[14] = obj.fCovNeg[14];
- fCovNeg[17] = obj.fCovNeg[17];  fCovNeg[17] = obj.fCovNeg[17];  fCovNeg[17] = obj.fCovNeg[17];
- fCovNeg[18] = obj.fCovNeg[18];  fCovNeg[19] = obj.fCovNeg[19];  fCovNeg[20] = obj.fCovNeg[20];
-
+ for(int i=0;i<3;i++){
+  fPPos[i] = obj.fPPos[i];
+  fPNeg[i] = obj.fPNeg[i];
+  for(int j=0;j<9;j++){
+   fPosXYZ[j][i] = obj.fPosXYZ[j][i];
+   fNegXYZ[j][i] = obj.fNegXYZ[j][i];
+  }
+ }
  return (*this);
 }
 //_____________________________________________________________________________
index df6ed003f4a79ae777c564ed82ee5a9e62f8fc56..121517b8bc2d77ee01a329be1394eb703a688c0b 100644 (file)
@@ -53,12 +53,10 @@ class AliFemtoK0Particle  // Reconstructed K0s parameters needed for correlation
   double fNegPhi;      //negative daughter phi
 
   //for separation
-  double fXPos[3];      //Positive daughter position
-  double fXNeg[3];      //Negative daughter position
   double fPPos[3];      //Positive daughter momentum
   double fPNeg[3];      //negative daughter momentum
-  double fCovPos[21];   //positive daughter coverity matrix
-  double fCovNeg[21];   //negative daughter coverity matrix
+  float fPosXYZ[9][3]; //corrected daughter TPC positions
+  float fNegXYZ[9][3]; //corrected daughter TPC positions
 
   ClassDef(AliFemtoK0Particle, 1);
 };