Merge remote-tracking branch 'origin/master' into flatdev

[u/mrichter/AliRoot.git] / PWGDQ / dielectron / macrosLMEE / Config_mk_CCbarPbPb.C

diff --git a/PWGDQ/dielectron/macrosLMEE/Config_mk_CCbarPbPb.C b/PWGDQ/dielectron/macrosLMEE/Config_mk_CCbarPbPb.C
index 54c19495bbd40510258a4c3fa0aa947ab95341b9..57dd1f6074b12c1393e8db7f7fe11235b1410e9d 100644 (file)
--- a/PWGDQ/dielectron/macrosLMEE/Config_mk_CCbarPbPb.C
+++ b/PWGDQ/dielectron/macrosLMEE/Config_mk_CCbarPbPb.C
@@ -68,8 +68,7 @@ AliDielectron* Config_mk_CCbarPbPb(Int_t cutDefinition, Bool_t isAOD=kFALSE)
 
 
       AliDielectronMixingHandler *mix=new AliDielectronMixingHandler;
-      mix->AddVariable(AliDielectronVarManager::kZvPrim, "-10,-9.5,-9,-8.5,-8,-7.5,-7,-6,-4,-2,0,2,4,6,7,7.5,8,8.5,9,9.5,10");
-//      mix->AddVariable(AliDielectronVarManager::kCentrality, "0,2.5,5,7.5,10,12.5,15,17.5,20,25,30,35,40,50,60,70,80");
+      mix->AddVariable(AliDielectronVarManager::kZvPrim, 10,-10.,10.);
       mix->AddVariable(AliDielectronVarManager::kCentrality, "0,6,12,17,23,27,33,39,47,57,90");
       if(cutDefinition==1)mix->AddVariable(AliDielectronVarManager::kV0ArpH2,10,-1.571,1.571);
       mix->SetMixType(AliDielectronMixingHandler::kAll);
@@ -113,7 +112,7 @@ void SetupTrackCutsDieleData(AliDielectron *diele, Int_t cutDefinition, Bool_t i
     AliDielectronTrackCuts *trackCuts=new AliDielectronTrackCuts("trackCuts","trackCuts");
     trackCuts->SetRequireTPCRefit(kTRUE);
     trackCuts->SetRequireITSRefit(kTRUE);
-    diele->GetTrackFilter().AddCuts(trackCuts);//old
+    diele->GetTrackFilter().AddCuts(trackCuts);
 
   }
   
@@ -127,13 +126,9 @@ void SetupTrackCutsDieleData(AliDielectron *diele, Int_t cutDefinition, Bool_t i
   pt->AddCut(AliDielectronVarManager::kEta,-0.9,0.9);
   pt->AddCut(AliDielectronVarManager::kImpactParXY, -1.0,   1.0);
   pt->AddCut(AliDielectronVarManager::kImpactParZ,  -3.0,   3.0);
-  pt->AddCut(AliDielectronVarManager::AliDielectronVarManager::kTPCnSigmaEle,-4,4.);
-  
-  
-  if(cutDefinition >=0){
-  pt->AddCut(AliDielectronVarManager::AliDielectronVarManager::kTPCnSigmaEle,-2,3.);
-  pt->AddCut(AliDielectronVarManager::kNclsTPC,90.,160.);
-  }
+  pt->AddCut(AliDielectronVarManager::AliDielectronVarManager::kTPCnSigmaEle,-2,3.);  
+  pt->AddCut(AliDielectronVarManager::kNclsTPC,80.,160.);
+
 
   diele->GetTrackFilter().AddCuts(pt);
 }
@@ -147,7 +142,7 @@ void SetupPairCutsDieleData(AliDielectron *diele, Int_t cutDefinition, Bool_t is
 
 AliDielectronVarCuts *mycut = new AliDielectronVarCuts("ptCutEMCAL","cut for EMCal");
 mycut->AddCut(AliDielectronVarManager::kEMCALE,5.,100.);
-mycut->AddCut(AliDielectronVarManager::kEMCALEoverP,0.7,1.3);
+mycut->AddCut(AliDielectronVarManager::kEMCALEoverP,0.75,1.25);
 AliDielectronPairLegCuts *varpair=new AliDielectronPairLegCuts();
 varpair->GetLeg1Filter().AddCuts(mycut);
 varpair->GetLeg2Filter().AddCuts(mycut);
@@ -233,8 +228,13 @@ void InitHistogramsDieleData(AliDielectron *diele, Int_t cutDefinition, Bool_t i
   
   histos->UserHistogram("Track","TPCnSigmaEle_Eta","TPCnSigmaEle;#eta;TPCnSigmaEle;#tracks",
                         200,-1.,1.,800,-12.,12.,AliDielectronVarManager::kEta,AliDielectronVarManager::kTPCnSigmaEle,kTRUE);
-    
-
+  
+  histos->UserHistogram("Track","kNclsSTPC_kDeltaEta","kNclsSTPC vs kDeltaEta;kNclsSTPC;kDeltaEta;#tracks",
+                        160,0.,159.,160,0.,1.6,AliDielectronVarManager::kNclsSTPC,AliDielectronVarManager::kDeltaEta,kTRUE);
+  histos->UserHistogram("Track","kNclsSTPC_kDeltaPhi","kNclsSTPC vs kDeltaPhi;kNclsSTPC;kDeltaPhi;#tracks",
+                        160,0.,159.,160,0.,6.4,AliDielectronVarManager::kNclsSTPC,AliDielectronVarManager::kDeltaPhi,kTRUE);
+  histos->UserHistogram("Track","kDeltaPhi_kDeltaEta","kDeltaPhi vs kDeltaEta;kDeltaPhi;kDeltaEta;#tracks",
+                        160,0.,6.4,160,0.,1.6,AliDielectronVarManager::kDeltaPhi,AliDielectronVarManager::kDeltaEta,kTRUE);
 
   histos->UserHistogram("Track","dEdx_Phi","dEdx;#phi [rad];TPC signal (arb units);#tracks",
                         200,0.,2*TMath::Pi(),800,20.,200.,AliDielectronVarManager::kPhi,AliDielectronVarManager::kTPCsignal,kTRUE);
@@ -282,32 +282,33 @@ void InitCFDieleData(AliDielectron *diele, Int_t cutDefinition, Bool_t isAOD)
   AliDielectronCF *cf=new AliDielectronCF(diele->GetName(),diele->GetTitle());
   
   //pair variables
-  cf->AddVariable(AliDielectronVarManager::kPt,"4.0, 4.5, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 20.0");
-  cf->AddVariable(AliDielectronVarManager::kM,500,0.,10.);
+  cf->AddVariable(AliDielectronVarManager::kPt,"0., 2., 4.0, 4.5, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 20.0,25.0,30.0,40.0,50.0");
+  cf->AddVariable(AliDielectronVarManager::kM,750,0.,15.);
   cf->AddVariable(AliDielectronVarManager::kPairType,12,0,12);
-  cf->AddVariable(AliDielectronVarManager::kOpeningAngle,"0.,0.1,0.2,0.4,0.6,0.8,1.0,2.0,3.14");
-  cf->AddVariable(AliDielectronVarManager::kY,20,-1.,1.); 
+//  cf->AddVariable(AliDielectronVarManager::kOpeningAngle,"0.,0.1,0.2,0.4,0.6,0.8,1.0,2.0,3.14");
+//  cf->AddVariable(AliDielectronVarManager::kY,20,-1.,1.); 
   //leg variables
-  cf->AddVariable(AliDielectronVarManager::kPt,"1.0, 1.1, 1.2, 1.3, 1.4, 1.5,1.6,1.7,1.8,1.9, 2.0, 3.0, 10.0",kTRUE);
+  cf->AddVariable(AliDielectronVarManager::kPt,"1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2., 3., 5., 10., 15., 20., 30., 40., 50.",kTRUE);
 //   cf->AddVariable(AliDielectronVarManager::kP,"0.0, 1.0, 1.2, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 5.0, 10.0, 100.0",kTRUE);
   cf->AddVariable(AliDielectronVarManager::kNclsTPC,"80, 85, 90, 95, 100, 110, 120, 160",kTRUE);
-//  cf->AddVariable(AliDielectronVarManager::kEta,"-5.0,-1.0,-0.9,-0.7,0.7,0.9,1.0,5.0",kTRUE);
-//   cf->AddVariable(AliDielectronVarManager::kPhi,"0.0,1.0,2.0,3.0,4.0,5.0,6.0",kTRUE);
+  cf->AddVariable(AliDielectronVarManager::kEta,"-5.0,-1.0,-0.9,-0.7,0.7,0.9,1.0,5.0",kTRUE);
+   cf->AddVariable(AliDielectronVarManager::kPhi,"0.0,1.0,2.0,3.0,4.0,5.0,6.0",kTRUE);
 //  cf->AddVariable(AliDielectronVarManager::kEMCALE,"1.0,2.0, 3.0, 4.0, 4.5, 5.0, 5.5, 6.0, 7.0, 8.0, 9.0, 10.0,11.0,12.0,16.0,25.0",kTRUE); 
 //  cf->AddVariable(AliDielectronVarManager::kEMCALnSigmaEle,"-3.5,-3.0,-2.0,-1.0,1.0,2.0,3.0,4.0,5.0",kTRUE);
 //  cf->AddVariable(AliDielectronVarManager::kEMCALNCells,25,0,25,kTRUE);
 //  cf->AddVariable(AliDielectronVarManager::kEMCALEoverP,"0.6, 0.65,0.7,0.8,0.9,1.1,1.2,1.3,1.4,1.8,2.0,2.1",kTRUE);
+    cf->AddVariable(AliDielectronVarManager::kNclsSTPC,20,0.,1.,kTRUE);//shared cluster
+    //ITS
+  cf->AddVariable(AliDielectronVarManager::kNclsITS,6,0.,6.,kTRUE);
   
-  
-  
-  cf->AddVariable(AliDielectronVarManager::kTPCnSigmaEle,"-3.5,-3.0,-2.5,-2.0,-1.5,-1.0,0.0,1.0,2.0,3.0,3.5,4.0",kTRUE);
-  cf->AddVariable(AliDielectronVarManager::kTPCnSigmaPio,"2.,2.5,3.0,3.5,4.0,4.5,100",kTRUE);
+  cf->AddVariable(AliDielectronVarManager::kTPCnSigmaEle,60,-3.,3.,kTRUE);
+  cf->AddVariable(AliDielectronVarManager::kTPCnSigmaPio,60,-3.,3.,kTRUE);
   //event variables
   cf->AddVariable(AliDielectronVarManager::kCentrality,20,0.,100.);
-  cf->AddVariable(AliDielectronVarManager::kMultV0,26,0.,26000.);
-  cf->AddVariable(AliDielectronVarManager::kZvPrim,20,-10.,10.);
+//  cf->AddVariable(AliDielectronVarManager::kMultV0,26,0.,26000.);
+//  cf->AddVariable(AliDielectronVarManager::kZvPrim,20,-10.,10.);
 
-  cf->AddVariable(AliDielectronVarManager::kITSLayerFirstCls,6,0.,6.,kTRUE);
+//  cf->AddVariable(AliDielectronVarManager::kITSLayerFirstCls,6,0.,6.,kTRUE);
 
   if (hasMC){
       cf->AddVariable(AliDielectronVarManager::kPdgCode,10000,-5000.5,4999.5,kTRUE);