updated of EMCal tasks

diff --git a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx
index 49afa7b74e0b11c0b9aadfb5bc5e0c08f11a0e47..8d2d26566ad7dce5c8b1d3741d4e4d791f502f82 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx
+++ b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx
@@ -826,7 +826,7 @@ void AliAnalysisTaskHFECal::UserExec(Option_t*)
 
     Int_t clsId_ESD = track->GetEMCALcluster();
     Int_t clsId = -9999;
 
     Int_t clsId_ESD = track->GetEMCALcluster();
     Int_t clsId = -9999;

-    if(phi>1.0 && phi<3.5)clsId = TrMatch(track);
+    if(phi>1.0 && phi<3.5 && fabs(eta)<0.75)clsId = TrMatch(track);

 
     //cout << "match ID" << clsId << " ; " << clsId_Tender << endl;
 
 
     //cout << "match ID" << clsId << " ; " << clsId_Tender << endl;
 


@@ -2322,6 +2322,8 @@ int AliAnalysisTaskHFECal::TrMatch(AliESDtrack *tr)
   Double_t trkPos[3];
   int matchID = -1;
   Double_t MaxR = 0.05;
   Double_t trkPos[3];
   int matchID = -1;
   Double_t MaxR = 0.05;

+  Double_t MaxEta = 0.025;
+  Double_t MaxPhi = 0.05;

 
   Double_t  magF = fESD->GetMagneticField();
   Double_t magSign = 1.0;
 
   Double_t  magF = fESD->GetMagneticField();
   Double_t magSign = 1.0;


@@ -2356,12 +2358,18 @@ int AliAnalysisTaskHFECal::TrMatch(AliESDtrack *tr)
    Double_t delEmcphi = clsPosVec.Phi()-trkPosVec.Phi();  // track cluster matching
    Double_t delEmceta = clsPosVec.Eta()-trkPosVec.Eta();  // track cluster matching
 
    Double_t delEmcphi = clsPosVec.Phi()-trkPosVec.Phi();  // track cluster matching
    Double_t delEmceta = clsPosVec.Eta()-trkPosVec.Eta();  // track cluster matching
 

+   if(fabs(delEmcphi)>0.05)continue;
+   if(fabs(delEmceta)>0.025)continue;
+

    double rmatch = sqrt(pow(delEmcphi,2)+pow(delEmceta,2));
    
    double rmatch = sqrt(pow(delEmcphi,2)+pow(delEmceta,2));
    

-   if(rmatch<MaxR)
+   //if(rmatch<MaxR)
+   if(fabs(delEmcphi)<MaxPhi && fabs(delEmceta)<MaxEta )

      {
       matchID = icl;
      {
       matchID = icl;

-      MaxR = rmatch;
+      //MaxR = rmatch;
+      MaxPhi = fabs(delEmcphi);
+      MaxEta = fabs(delEmceta);

      }
   }
  
      }
   }
  

diff --git a/PWGHF/hfe/macros/configs/pPb/ConfigEMCalHFEpA.C b/PWGHF/hfe/macros/configs/pPb/ConfigEMCalHFEpA.C
index aa0e6c806457e7f3194321d310c7ca6781415333..4c9a89f931bc25a59156ccbe087037bfacb4bae7 100644 (file)
--- a/PWGHF/hfe/macros/configs/pPb/ConfigEMCalHFEpA.C
+++ b/PWGHF/hfe/macros/configs/pPb/ConfigEMCalHFEpA.C
@@ -30,7 +30,9 @@ Int_t EMCalThreshould = 0 //0 == EG1, 1 == EG2
        else if(configIndex==3)         hfecuts->SetMinNClustersTPC(80);
        else if(configIndex==4)         hfecuts->SetMinNClustersTPC(85);
        else if(configIndex==5)         hfecuts->SetMinNClustersTPC(115);
        else if(configIndex==3)         hfecuts->SetMinNClustersTPC(80);
        else if(configIndex==4)         hfecuts->SetMinNClustersTPC(85);
        else if(configIndex==5)         hfecuts->SetMinNClustersTPC(115);

-       else if(configIndex==6)         hfecuts->SetMinNClustersTPC(120);                                       //Minimum number of clusters on TPC
+       else if(configIndex==6)         hfecuts->SetMinNClustersTPC(120);
+       else if(configIndex==80)        hfecuts->SetMinNClustersTPC(130);
+       else if(configIndex==81)        hfecuts->SetMinNClustersTPC(140);//Minimum number of clusters on TPC

        else hfecuts->SetMinNClustersTPC(100);                                                                  //Minimum number of clusters on TPC
        
        if(configIndex==7) hfecuts->SetMinNClustersTPCPID(70); 
        else hfecuts->SetMinNClustersTPC(100);                                                                  //Minimum number of clusters on TPC
        
        if(configIndex==7) hfecuts->SetMinNClustersTPCPID(70); 


@@ -45,6 +47,7 @@ Int_t EMCalThreshould = 0 //0 == EG1, 1 == EG2
        
        //ITS
        if(configIndex==13) hfecuts->SetCutITSpixel(AliHFEextraCuts::kBoth);                    //Require at least one cluster on SPD
        
        //ITS
        if(configIndex==13) hfecuts->SetCutITSpixel(AliHFEextraCuts::kBoth);                    //Require at least one cluster on SPD

+       else if(configIndex==82) hfecuts->SetCutITSpixel(AliHFEextraCuts::kFirst);

        else hfecuts->SetCutITSpixel(AliHFEextraCuts::kAny);                                                    //Require at least one cluster on SPD
        //hfecuts->SetCutITSdrift(AliHFEextraCuts::kAny);                                           //Require at least one cluster on SDD
        hfecuts->SetCheckITSLayerStatus(kFALSE); 
        else hfecuts->SetCutITSpixel(AliHFEextraCuts::kAny);                                                    //Require at least one cluster on SPD
        //hfecuts->SetCutITSdrift(AliHFEextraCuts::kAny);                                           //Require at least one cluster on SDD
        hfecuts->SetCheckITSLayerStatus(kFALSE); 


@@ -60,8 +63,9 @@ Int_t EMCalThreshould = 0 //0 == EG1, 1 == EG2
        
                
        //DCA cut included in the analysis 12 March 2014
        
                
        //DCA cut included in the analysis 12 March 2014

-       if(configIndex==18) hfecuts->SetMaxImpactParam(2,4); 
-       else if (configIndex==19) hfecuts->SetMaxImpactParam(0.5,1);
+       if(configIndex==18) hfecuts->SetMaxImpactParam(2,5); 
+       else if(configIndex==19) hfecuts->SetMaxImpactParam(0.5,1);
+       else if(configIndex==83) hfecuts->SetMaxImpactParam(0.1,0.2);

        else hfecuts->SetMaxImpactParam(1,2);                                                                   //DCA to vertex
        
        //Event Selection
        else hfecuts->SetMaxImpactParam(1,2);                                                                   //DCA to vertex
        
        //Event Selection


@@ -116,16 +120,16 @@ Int_t EMCalThreshould = 0 //0 == EG1, 1 == EG2
        //partner cuts
        
        if(configIndex==29) task->SetAdditionalCuts(0.3,80);
        //partner cuts
        
        if(configIndex==29) task->SetAdditionalCuts(0.3,80);

-       if(configIndex==30) task->SetAdditionalCuts(0.5,80);
-       if(configIndex==31) task->SetAdditionalCuts(0.7,80);
-       if(configIndex==32) task->SetAdditionalCuts(0.9,80);
+       else if(configIndex==30) task->SetAdditionalCuts(0.5,80);
+       else if(configIndex==31) task->SetAdditionalCuts(0.7,80);
+       else if(configIndex==32) task->SetAdditionalCuts(0.9,80);

        
        

-       if(configIndex==33) task->SetAdditionalCuts(0,60);
-       if(configIndex==34) task->SetAdditionalCuts(0,70);
-       if(configIndex==35) task->SetAdditionalCuts(0,90);
-       if(configIndex==36) task->SetAdditionalCuts(0,100);
+       else if(configIndex==33) task->SetAdditionalCuts(0,60);
+       else if(configIndex==34) task->SetAdditionalCuts(0,70);
+       else if(configIndex==35) task->SetAdditionalCuts(0,90);
+       else if(configIndex==36) task->SetAdditionalCuts(0,100);

         
         

-        task->SetAdditionalCuts(0,80);
+       else task->SetAdditionalCuts(0,80);

         
        
        //eta cuts
         
        
        //eta cuts


@@ -214,7 +218,7 @@ Int_t EMCalThreshould = 0 //0 == EG1, 1 == EG2
        
 ///_______________________________________________________________________________________________________________
 /// New configurations for random cuts -- March, 05, 2014 -- Values in the macro "Random_configurations.C"
        
 ///_______________________________________________________________________________________________________________
 /// New configurations for random cuts -- March, 05, 2014 -- Values in the macro "Random_configurations.C"

-       
+       /*

        if (configIndex==80){
                hfecuts->SetMinNClustersTPC(86);
                hfecuts->SetMinNClustersTPCPID(76);
        if (configIndex==80){
                hfecuts->SetMinNClustersTPC(86);
                hfecuts->SetMinNClustersTPCPID(76);


@@ -395,6 +399,7 @@ Int_t EMCalThreshould = 0 //0 == EG1, 1 == EG2
                Double_t params[0]=-1.15;
                pid->ConfigureTPCdefaultCut(cutmodel,params,3.0);
        }
                Double_t params[0]=-1.15;
                pid->ConfigureTPCdefaultCut(cutmodel,params,3.0);
        }

+        */

        
        
 ///_______________________________________________________________________________________________________________
        
        
 ///_______________________________________________________________________________________________________________