Updating track cuts and removing functionality that is now in separate cosmics tasks

[u/mrichter/AliRoot.git] / PWG4 / JetTasks / AliPWG4HighPtSpectra.cxx

diff --git a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
index e0add9661df035e211056ddf53b77cfbaa806717..8f6724b102426a8c46e83274dc5b0746c7188cad 100644 (file)
--- a/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
+++ b/PWG4/JetTasks/AliPWG4HighPtSpectra.cxx
@@ -65,7 +65,7 @@ AliPWG4HighPtSpectra::AliPWG4HighPtSpectra() : AliAnalysisTask("AliPWG4HighPtSpe
   fCFManagerNeg(0x0),
   fESD(0),
   fTrackCuts(0),
-  fTrigger(0),
+  fTrackCutsTPConly(0),
   fHistList(0),
   fNEventAll(0),
   fNEventSel(0)
@@ -82,7 +82,7 @@ AliPWG4HighPtSpectra::AliPWG4HighPtSpectra(const Char_t* name) :
   fCFManagerNeg(0x0),
   fESD(0),
   fTrackCuts(),
-  fTrigger(0),
+  fTrackCutsTPConly(0),
   fHistList(0),
   fNEventAll(0),
   fNEventSel(0)
@@ -93,58 +93,26 @@ AliPWG4HighPtSpectra::AliPWG4HighPtSpectra(const Char_t* name) :
   AliDebug(2,Form("AliPWG4HighPtSpectra","Calling Constructor"));
   // Input slot #0 works with a TChain ESD
   DefineInput(0, TChain::Class());
+  // Output slot #0 writes into a TList
   DefineOutput(0,TList::Class());
+  // Output slot #1, #2 writes into a AliCFContainer
   DefineOutput(1,AliCFContainer::Class());
   DefineOutput(2,AliCFContainer::Class());
+  // Output slot #3 writes into a AliESDtrackCuts
+  DefineOutput(3, AliESDtrackCuts::Class());
+  DefineOutput(4, AliESDtrackCuts::Class());
+}
+
+//________________________________________________________________________
+void AliPWG4HighPtSpectra::LocalInit()
+{
+  //
+  // Only called once at beginning
+  //
+  PostData(3,fTrackCuts);
+  PostData(4,fTrackCutsTPConly);
 }
 
-// //___________________________________________________________________________
-// AliPWG4HighPtSpectra& AliPWG4HighPtSpectra::operator=(const AliPWG4HighPtSpectra& c) 
-// {
-//   //
-//   // Assignment operator
-//   //
-//   if (this!=&c) {
-//     AliAnalysisTask::operator=(c) ;
-//     fReadAODData = c.fReadAODData ;
-//     fCFManagerPos  = c.fCFManagerPos;
-//     fCFManagerNeg  = c.fCFManagerNeg;
-//     fHistList = c.fHistList;
-//     fNEventAll = c.fNEventAll;
-//     fNEventSel = c.fNEventSel;
-//   }
-//   return *this;
-// }
-
-// //___________________________________________________________________________
-// AliPWG4HighPtSpectra::AliPWG4HighPtSpectra(const AliPWG4HighPtSpectra& c) :
-//   AliAnalysisTask(c),
-//   fReadAODData(c.fReadAODData),
-//   fCFManagerPos(c.fCFManagerPos),
-//   fCFManagerNeg(c.fCFManagerNeg),
-//   fESD(c.fESD),
-//   fTrackCuts(c.fTrackCuts),
-//   fTrigger(c.fTrigger),
-//   fHistList(c.fHistList),
-//   fNEventAll(c.fNEventAll),
-//   fNEventSel(c.fNEventSel)
-// {
-//   //
-//   // Copy Constructor
-//   //
-// }
-
-// //___________________________________________________________________________
-// AliPWG4HighPtSpectra::~AliPWG4HighPtSpectra() {
-//   //
-//   //destructor
-//   //
-//   Info("~AliPWG4HighPtSpectra","Calling Destructor");
-//   if (fCFManagerPos)           delete fCFManagerPos ;
-//   if (fCFManagerNeg)           delete fCFManagerNeg ;
-//   if (fNEventAll)              delete fNEventAll ;
-//   if (fNEventSel)              delete fNEventSel ;
-// }
 //________________________________________________________________________
 void AliPWG4HighPtSpectra::ConnectInputData(Option_t *) 
 {
@@ -294,24 +262,27 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
       containerInputRec[3] = dca2D;
       containerInputRec[4] = chi2PerClusterTPC;
 
+      //Store TPC Inner Params for TPConly tracks
       containerInputTPConly[0] = trackTPC->Pt();
       containerInputTPConly[1] = trackTPC->Phi();
       containerInputTPConly[2] = trackTPC->Eta();
-      containerInputTPConly[3] = dca2DTPC/10.; //Divide by 10 in order to store in same containter. Should be corrected back when looking at output.
+      containerInputTPConly[3] = dca2DTPC/10.; //Divide by 10 in order to store in same container. Should be corrected back when looking at output.
       containerInputTPConly[4] = chi2PerClusterTPCIter1;//TPC;
 
-      if (fTrackCuts->AcceptTrack(track)) {
-       if(track->GetSign()>0.) {
-         fCFManagerPos->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
-         fCFManagerPos->GetParticleContainer()->Fill(containerInputTPConly,kStepReconstructedTPCOnly);
-       }
-       if(track->GetSign()<0.) {
-         fCFManagerNeg->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
-         fCFManagerNeg->GetParticleContainer()->Fill(containerInputTPConly,kStepReconstructedTPCOnly);
+      AliESDtrack* trackTPCESD = fTrackCutsTPConly->GetTPCOnlyTrack(fESD, iTrack);
+      if(trackTPCESD) {
+       if (fTrackCutsTPConly->AcceptTrack(trackTPCESD)) {
+         if(trackTPC->GetSign()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputTPConly,kStepReconstructedTPCOnly);
+         if(trackTPC->GetSign()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputTPConly,kStepReconstructedTPCOnly);
        }
-       
+      }
+
+      if (fTrackCuts->AcceptTrack(track)) {
+       if(track->GetSign()>0.) fCFManagerPos->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
+       if(track->GetSign()<0.) fCFManagerNeg->GetParticleContainer()->Fill(containerInputRec,kStepReconstructed);
+
        
-       //Only fill the secondary particle container if MC information is available
+       //Only fill the MC containers if MC information is available
        if(eventHandler) {
          Int_t label = TMath::Abs(track->GetLabel());
          TParticle *particle = stack->Particle(label) ;
@@ -323,13 +294,17 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
          containerInputMC[3] = 0.0;      
          containerInputMC[4] = 0.0;  
 
-         if(particle->GetPDG()->Charge()>0.) {
-           fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepReconstructedMC);
-         }
-         if(particle->GetPDG()->Charge()<0.) {
-           fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepReconstructedMC);
+         //Container with primaries
+         if(stack->IsPhysicalPrimary(label)) {
+           if(particle->GetPDG()->Charge()>0.) {
+             fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepReconstructedMC);
+           }
+           if(particle->GetPDG()->Charge()<0.) {
+             fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepReconstructedMC);
+           }
          }
 
+         //Container with secondaries
          if (!stack->IsPhysicalPrimary(label) ) {
            if(particle->GetPDG()->Charge()>0.) {
              fCFManagerPos->GetParticleContainer()->Fill(containerInputRec,kStepSecondaries);
@@ -340,14 +315,15 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
          }
        }
        
-      }
-      
-    }
+      }//trackCuts
+
+      delete trackTPCESD;
+    }//track loop
   
 
   //Fill MC containters if particles are findable
   if(eventHandler) {
-    for(int iPart = 1; iPart<(mcEvent->GetNumberOfTracks()); iPart++)//stack->GetNprimary();
+    for(int iPart = 1; iPart<(mcEvent->GetNumberOfPrimaries()); iPart++)//stack->GetNprimary();
       {
        AliMCParticle *mcPart  = (AliMCParticle*)mcEvent->GetTrack(iPart);
        if(!mcPart) continue;
@@ -359,15 +335,9 @@ void AliPWG4HighPtSpectra::Exec(Option_t *)
        containerInputMC[3] = 0.0;
        containerInputMC[4] = 0.0;
 
-       int counter;
-       Float_t trackLengthTPC = 0.;
-       if(mcPart->Charge()>0. && fCFManagerPos->CheckParticleCuts(3,mcPart)) {
-         trackLengthTPC = mcPart->GetTPCTrackLength(fESD->GetMagneticField(),0.1,counter,3.0);
-         if(trackLengthTPC > (float)fTrackCuts->GetMinNClusterTPC()) fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepMCtrackable) ;
-       }
-       if(mcPart->Charge()<0. && fCFManagerNeg->CheckParticleCuts(3,mcPart)) {
-         trackLengthTPC = mcPart->GetTPCTrackLength(fESD->GetMagneticField(),0.1,counter,3.0);
-         if(trackLengthTPC > (float)fTrackCuts->GetMinNClusterTPC()) fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepMCtrackable) ;
+       if(stack->IsPhysicalPrimary(iPart)) {
+         if(mcPart->Charge()>0. && fCFManagerPos->CheckParticleCuts(kStepMCAcceptance,mcPart)) fCFManagerPos->GetParticleContainer()->Fill(containerInputMC,kStepMCAcceptance);
+         if(mcPart->Charge()<0. && fCFManagerNeg->CheckParticleCuts(kStepMCAcceptance,mcPart)) fCFManagerNeg->GetParticleContainer()->Fill(containerInputMC,kStepMCAcceptance);
        }
       }
   }
@@ -385,6 +355,7 @@ void AliPWG4HighPtSpectra::Terminate(Option_t*)
   // The Terminate() function is the last function to be called during
   // a query. It always runs on the client, it can be used to present
   // the results graphically or save the results to file.
+
 }
 
 //___________________________________________________________________________