efficiency file from alien

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDiJetCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDiJetCorrelations.cxx
index 1bf87f8756e50251f0548f42229dda3ef7e08501..6d784152380fe280c0409a82ff0f1753cbb206fd 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDiJetCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDiJetCorrelations.cxx
@@ -75,7 +75,12 @@ AliAnalysisTaskDiJetCorrelations::AliAnalysisTaskDiJetCorrelations():
   fMixedEvent(kTRUE),
   fMEMaxPoolEvent(1000),
   fMEMinTracks(20000),
-  fMEMinEventToMix(6)
+  fMEMinEventToMix(6),
+  fHistTrigDPhi(0x0),
+  fControlConvResT1(0x0),
+  fControlConvResT2(0x0),
+  fControlConvResMT1(0x0),
+  fControlConvResMT2(0x0)
 {
   for ( Int_t i = 0; i < 9; i++)fHistQA[i] = NULL;
 }
@@ -112,7 +117,12 @@ AliAnalysisTaskDiJetCorrelations::AliAnalysisTaskDiJetCorrelations(const char *n
   fMixedEvent(kTRUE),
   fMEMaxPoolEvent(1000),
   fMEMinTracks(2000),
-  fMEMinEventToMix(6)
+  fMEMinEventToMix(6),
+  fHistTrigDPhi(0x0),
+  fControlConvResT1(0x0),
+  fControlConvResT2(0x0),
+  fControlConvResMT1(0x0),
+  fControlConvResMT2(0x0)
 {
   Info("AliAnalysisTaskDiJetCorrelations","Calling Constructor");
   for ( Int_t i = 0; i < 9; i++)fHistQA[i] = NULL;
@@ -153,7 +163,12 @@ AliAnalysisTaskDiJetCorrelations::AliAnalysisTaskDiJetCorrelations(const AliAnal
   fMixedEvent(source.fMixedEvent),
   fMEMaxPoolEvent(source.fMEMaxPoolEvent),
   fMEMinTracks(source.fMEMinTracks),
-  fMEMinEventToMix(source.fMEMinEventToMix)
+  fMEMinEventToMix(source.fMEMinEventToMix),
+  fHistTrigDPhi(source.fHistTrigDPhi),
+  fControlConvResT1(source.fControlConvResT1),
+  fControlConvResT2(source.fControlConvResT2),
+  fControlConvResMT1(source.fControlConvResMT1),
+  fControlConvResMT2(source.fControlConvResMT2)
 {
   
 }
@@ -342,25 +357,7 @@ void  AliAnalysisTaskDiJetCorrelations::UserExec(Option_t *)
   if(vtxTyp.Contains("vertexer:Z") && (zRes > 0.25)) return;
   if(TMath::Abs(vtxSPD->GetZ() - vtxPrm->GetZ()) > 0.5) return;
   fHistNEvents->Fill(4);
-  
-  TFile* f = 0x0;
-  f = TFile::Open("THnEfficiency.root");
-  if(!f->IsOpen()){
-    cout<<"File is not found"<<endl;
-    return;
-  }
-  
-  TH3F *tmp1 = (TH3F*)f->Get("hpTetaCentRec");
-  if(!tmp1){
-    cout<<"Couldn't find hpTetaCentRec"<<endl;
-    return;
-  }
-  
-  f3DEffCor = (TH3F*)tmp1->Clone("f3DEffCor");
-  f3DEffCor->SetDirectory(0);
-  f->Close();
-  delete f;
-  
+   
   TObjArray* fTrackArray = new TObjArray;
   fTrackArray->SetOwner(kTRUE);
   
@@ -489,7 +486,7 @@ void  AliAnalysisTaskDiJetCorrelations::UserExec(Option_t *)
   if(TMath::Abs(zVertex)>=10)AliInfo(Form("Event with Zvertex = %.2f cm out of pool bounds, SKIPPING",zVertex));
   
   if(fMixedEvent){
-    Bool_t execPool = ProcessMixedEventPool();
+    //Bool_t execPool = ProcessMixedEventPool();
     NofEventsinPool = fPool->GetCurrentNEvents();
   }
   
@@ -531,7 +528,7 @@ void  AliAnalysisTaskDiJetCorrelations::UserExec(Option_t *)
        if(ptTrack1 > ptLim_Sparse1) ptTrack1 = ptLim_Sparse1-0.01; //filling all the pT in last bin
         
        Double_t CentzVtxDEtaDPhiTrg1[5] = {fCentrOrMult, zVertex, deltaEta1, deltaPhi1C, ptTrack1};
-       Double_t effvalueT1 = GetTrackbyTrackEffValue(fAodTracksAS, fCentrOrMult);
+       Double_t effvalueT1 = 1.0;//GetTrackbyTrackEffValue(fAodTracksAS, fCentrOrMult);
        
        ((THnSparseD*)fOutputCorr->FindObject(Form("ThnTrg1CentZvtxDEtaDPhi_%s_%s",typeData.Data(), SEorME.Data())))->Fill(CentzVtxDEtaDPhiTrg1, 1/effvalueT1);
        
@@ -560,7 +557,7 @@ void  AliAnalysisTaskDiJetCorrelations::UserExec(Option_t *)
        if(ptTrack2 > ptLim_Sparse2) ptTrack2 = ptLim_Sparse2-0.01; //filling all the pT in last bin
        
        Double_t CentzVtxDEtaDPhiTrg2[5] = {fCentrOrMult, zVertex, deltaEta2, deltaPhi2C,ptTrack2};
-       Double_t effvalueT2 = GetTrackbyTrackEffValue(fAodTracksAS, fCentrOrMult);
+       Double_t effvalueT2 = 1.0;//GetTrackbyTrackEffValue(fAodTracksAS, fCentrOrMult);
        
        ((THnSparseD*)fOutputCorr->FindObject(Form("ThnTrg2CentZvtxDEtaDPhi_%s_%s",typeData.Data(), SEorME.Data())))->Fill(CentzVtxDEtaDPhiTrg2,1/effvalueT2);
        
@@ -578,7 +575,7 @@ void  AliAnalysisTaskDiJetCorrelations::UserExec(Option_t *)
   
   PostData(1, fOutputQA);
   PostData(2, fOutputCorr);  
-  delete f3DEffCor;
+  //delete f3DEffCor;
   
 }
 
@@ -668,14 +665,14 @@ Bool_t AliAnalysisTaskDiJetCorrelations::TwoTrackEfficiencyCut(Double_t refmaxpT
     
     const Float_t kLimit = 0.02*3;
     Float_t dphistarminabs = 1e5;
-    Float_t dphistarmin = 1e5;
+    //Float_t dphistarmin = 1e5;
   
     if (TMath::Abs(dphistar1) < kLimit || TMath::Abs(dphistar2) < kLimit || dphistar1 * dphistar2 < 0){
       for (Double_t rad=0.8; rad<2.51; rad+=0.01){
        Float_t dphistar = GetDPhiStar(phi1, pt1, charge1, phi2, pt2, charge2, rad, bSigntmp);
        Float_t dphistarabs = TMath::Abs(dphistar);
        if (dphistarabs < dphistarminabs){
-         dphistarmin = dphistar;
+         //dphistarmin = dphistar;
          dphistarminabs = dphistarabs;
        }
       }

diff --git a/PWGCF/Correlations/macros/twoplusone/AddTaskDiJetCorrelations.C b/PWGCF/Correlations/macros/twoplusone/AddTaskDiJetCorrelations.C
index 8bc3ed7d3d3862206474aa79b49f9eb00f49f83b..458962d7a530d4951c3872e3ce1724e82d813499 100644 (file)
--- a/PWGCF/Correlations/macros/twoplusone/AddTaskDiJetCorrelations.C
+++ b/PWGCF/Correlations/macros/twoplusone/AddTaskDiJetCorrelations.C
@@ -7,7 +7,8 @@ AliAnalysisTaskDiJetCorrelations *AddTaskDiJetCorrelations(TString suffixName=""
                                                           Double_t pTrg1min = 12.0,
                                                           Double_t pTrg1max = 16.0,
                                                           Double_t pTrg2min = 5.0,
-                                                          Double_t pTrg2max = 8.0)
+                                                          Double_t pTrg2max = 8.0,
+                                                          TString effLoc = "/alice/cern.ch/user/r/rvarma/TEST/Dcorr/Dec9/THnEfficiency.root")
 {
   
   Bool_t UseFbits = kTRUE;
@@ -52,7 +53,7 @@ AliAnalysisTaskDiJetCorrelations *AddTaskDiJetCorrelations(TString suffixName=""
   AliAnalysisDataContainer *cinputDiJetCorrelations = mgr->CreateContainer(inname,TChain::Class(), AliAnalysisManager::kInputContainer);
   //TString outputfile = AliAnalysisManager::GetCommonFileName();
   //outputfile += ":PWGCF_Di_Jet_Corr";
-  TString outputfile = "resultsDiJetCorrelationsT112to16T25to8Dec8.root";
+  TString outputfile = AliAnalysisManager::GetCommonFileName();//"resultsDiJetCorrelationsT112to16T25to8Dec8.root";
 
   
   AliAnalysisDataContainer *coutputDiJetCorrelations1 = mgr->CreateContainer(outBasicname,TList::Class(),AliAnalysisManager::kOutputContainer,outputfile.Data());
@@ -63,6 +64,30 @@ AliAnalysisTaskDiJetCorrelations *AddTaskDiJetCorrelations(TString suffixName=""
   mgr->ConnectOutput(dijetcorrelations,1,coutputDiJetCorrelations1);
   mgr->ConnectOutput(dijetcorrelations,2,coutputDiJetCorrelations2);
   
+  if(effLoc!="")
+    dijetcorrelations->Setf3DEffCor(GetEfficiencyCorr(effLoc));
+
   return dijetcorrelations;
   
 }
+
+
+
+//loads the efficiency correction
+TH3F *GetEfficiencyCorr(TString effLoc){
+
+  TFile* f = 0x0;
+  f = TFile::Open(effLoc.Data());
+  if(!f){
+    Printf("%s%d no input data",(char*)__FILE__,__LINE__);
+    return;
+  }
+  
+  TH3F *tmp1 = (TH3F*)f->Get("hpTetaCentRec");
+  if(!tmp1){
+    Printf("%s%d Couldn't find hpTetaCentRec",(char*)__FILE__,__LINE__);
+    return;
+  }
+  
+  return (TH3F*)tmp1->Clone("f3DEffCor");
+}