filtering updates

diff --git a/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C b/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C
index cd9ffdec2a7b575d73f4d019b2c5347f058b4a85..f14f9600ad845694b09e12253b4487fb10dee002 100644 (file)
--- a/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C
+++ b/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C
@@ -1,4 +1,4 @@
-AliAnalysisTask *AddTaskJPSIFilter(Bool_t storeLS = kFALSE, Bool_t hasMC_aod = kFALSE){
+AliAnalysisTask *AddTaskJPSIFilter(TString period="", Bool_t storeLS = kFALSE, Bool_t hasMC_aod = kFALSE){
   //get the current analysis manager
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -29,14 +29,14 @@ AliAnalysisTask *AddTaskJPSIFilter(Bool_t storeLS = kFALSE, Bool_t hasMC_aod = k
   //gROOT->LoadMacro("$ALICE_ROOT/PWGDQ/dielectron/macros/ConfigBJpsi_ff_PbPbFilter.C");
   //  gROOT->LoadMacro("$ALICE_ROOT/PWGDQ/dielectron/macrosJPSI/ConfigBJpsi_ff_PbPbFilter.C");
   gROOT->LoadMacro("$ALICE_ROOT/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_nano_PbPb.C");
-  AliDielectron *jpsi=ConfigJpsi_nano_PbPb(0,hasMC);
+  AliDielectron *jpsi=ConfigJpsi_nano_PbPb(0,hasMC,period);
   
   if(isAOD) {
     //add options to AliAODHandler to duplicate input event
     AliAODHandler *aodHandler = (AliAODHandler*)mgr->GetOutputEventHandler();
     aodHandler->SetCreateNonStandardAOD();
     aodHandler->SetNeedsHeaderReplication();
-    aodHandler->SetNeedsTOFHeaderReplication();
+    if(!period.Contains("LHC10h")) aodHandler->SetNeedsTOFHeaderReplication();
     aodHandler->SetNeedsVZEROReplication();
     /*aodHandler->SetNeedsTracksBranchReplication();
     aodHandler->SetNeedsCaloClustersBranchReplication();

diff --git a/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_nano_PbPb.C b/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_nano_PbPb.C
index 91e65e523ad3fb22964b363d4cb0b42cf2f38cb3..79eb647f422a89fce7e1fb6ef694715ae7f3b06c 100644 (file)
--- a/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_nano_PbPb.C
+++ b/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_nano_PbPb.C
@@ -14,15 +14,20 @@ enum { kNANO=0 };
 TObjArray *arrNames=names.Tokenize(";");
 const Int_t nDie=arrNames->GetEntries();
 
-Bool_t  isESD = kTRUE;
+Bool_t  isESD     = kTRUE;
+TString periodLHC = "";
 TString list  = gSystem->Getenv("LIST");
 
-AliDielectron* ConfigJpsi_nano_PbPb(Int_t cutDefinition, Bool_t hasMC=kFALSE)
+
+AliDielectron* ConfigJpsi_nano_PbPb(Int_t cutDefinition, Bool_t hasMC=kFALSE, TString period="")
 {
   //
   // Setup the instance of AliDielectron
   //
 
+  periodLHC = period;
+  printf("this is -%s- filtering \n",periodLHC.Data());
+
   //ESD handler?
   isESD=(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()->IsA()==AliESDInputHandler::Class());
 
@@ -112,7 +117,7 @@ void SetupTrackCuts(AliDielectron *die, Int_t cutDefinition)
   varCuts->AddCut(AliDielectronVarManager::kImpactParXY, -1.0,   1.0);
   varCuts->AddCut(AliDielectronVarManager::kImpactParZ,  -3.0,   3.0);
   varCuts->AddCut(AliDielectronVarManager::kTPCchi2Cl,    0.0,   4.0);
-  varCuts->AddCut(AliDielectronVarManager::kKinkIndex0,   0.000001,1e30, kTRUE);
+  varCuts->AddCut(AliDielectronVarManager::kKinkIndex0,   0.);
   trkCuts->SetRequireITSRefit(kTRUE);
   trkCuts->SetRequireTPCRefit(kTRUE);
 
@@ -123,8 +128,10 @@ void SetupTrackCuts(AliDielectron *die, Int_t cutDefinition)
   //  pidVarCuts->AddCut(AliDielectronVarManager::kTOFbeta,      0.2,   0.9, kTRUE);
   //  pidCuts->AddCut(AliDielectronPID::kTOF,AliPID::kElectron,-3,3.,0.,0.,kFALSE, AliDielectronPID::kIfAvailable);
   // TPC inclusion
-  //  pidCuts->AddCut(AliDielectronPID::kTPC,AliPID::kElectron,-3.0,4.3); // when eta correction OFF (LHC11h) [-1.5,+3.]
-  pidCuts->AddCut(AliDielectronPID::kTPC,AliPID::kElectron,-2.6,4.7); // when eta correction OFF (LHC10h) [-2.0,+3.]
+  if(periodLHC.Contains("LHC10h"))
+    pidCuts->AddCut(AliDielectronPID::kTPC,AliPID::kElectron,-2.6,4.7); // when eta correction OFF (LHC10h) [-2.0,+3.]
+  else
+    pidCuts->AddCut(AliDielectronPID::kTPC,AliPID::kElectron,-3.0,4.3); // when eta correction OFF (LHC11h) [-1.5,+3.]
   //  pidCuts->AddCut(AliDielectronPID::kTPC,AliPID::kPion,-100.,4.0,0.,0.,kTRUE);
   //  pidCuts->AddCut(AliDielectronPID::kTPC,AliPID::kProton,-100.,3.5,0.,0.,kTRUE);