- dalitz code changes by Pedro Gonzales

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
index 873f1f884b7035cab794e1d077c8af02de4df183..475342e6f7754aa73cd898457e8c7866737c81b8 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
@@ -1478,22 +1478,30 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessElectronCandidates(){
   
 
    for(UInt_t i = 0; i < fSelectorElectronIndex.size(); i++){
+     
     AliESDtrack* electronCandidate = fESDEvent->GetTrack(fSelectorElectronIndex[i]);
-    if(! ((AliDalitzElectronCuts*)fCutElectronArray->At(fiCut))->ElectronIsSelected(electronCandidate) ) continue;
     
-       
-         if( fMCEvent ) {
-           
-         Int_t labelelectron = TMath::Abs( electronCandidate->GetLabel() );
+    if( fMCEvent ) {
+      
+          Int_t labelelectron = TMath::Abs( electronCandidate->GetLabel() );
          Int_t isMCFromMBHeader = -1;
          if(((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 0) {
             isMCFromMBHeader
             = ((AliConversionCuts*)fCutGammaArray->At(fiCut))->IsParticleFromBGEvent(labelelectron,fMCStack,fInputEvent);
-          if(isMCFromMBHeader == 0 && ((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 3) continue;
-          //if(isMCFromMBHeader != 2) mcIsFromMB = kFALSE;
+            if(isMCFromMBHeader == 0 && ((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 3) continue;
           }    
+    }
+        
+    if(! ((AliDalitzElectronCuts*)fCutElectronArray->At(fiCut))->ElectronIsSelected(electronCandidate) ) continue;
     
+    lGoodElectronIndexPrev.push_back(   fSelectorElectronIndex[i] );
+    hESDDalitzElectronPt[fiCut]->Fill(electronCandidate->Pt());
+    hESDDalitzElectronPhi[fiCut]->Fill(electronCandidate->Phi());
     
+       
+    if( fMCEvent ) {
+           
+         Int_t labelelectron = TMath::Abs( electronCandidate->GetLabel() );
            if( labelelectron < fMCStack->GetNtrack() ){
              TParticle* electron = fMCStack->Particle(labelelectron);
                if( electron->GetPdgCode() ==  11 ){
@@ -1515,30 +1523,38 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessElectronCandidates(){
            }
        }
        
-       lGoodElectronIndexPrev.push_back(   fSelectorElectronIndex[i] );
-       hESDDalitzElectronPt[fiCut]->Fill(electronCandidate->Pt());
-        hESDDalitzElectronPhi[fiCut]->Fill(electronCandidate->Phi());
        
    }
 
    for(UInt_t i = 0; i < fSelectorPositronIndex.size(); i++){
 
       AliESDtrack* positronCandidate = fESDEvent->GetTrack( fSelectorPositronIndex[i] );
-      if(! ((AliDalitzElectronCuts*)fCutElectronArray->At(fiCut))->ElectronIsSelected(positronCandidate) ) continue;
-       
       
-        if( fMCEvent ) {
-         
-         Int_t labelpositron = TMath::Abs( positronCandidate->GetLabel() );
-         
-          Int_t isMCFromMBHeader = -1;
+      if( fMCEvent ) {
+       
+        Int_t labelpositron = TMath::Abs( positronCandidate->GetLabel() );
+        Int_t isMCFromMBHeader = -1;
          
          if(((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 0) {
             isMCFromMBHeader
             = ((AliConversionCuts*)fCutGammaArray->At(fiCut))->IsParticleFromBGEvent(labelpositron,fMCStack,fInputEvent);
           if(isMCFromMBHeader == 0 && ((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 3) continue;
-          //if(isMCFromMBHeader != 2) mcIsFromMB = kFALSE;
+          
           }  
+      }
+  
+      
+      
+      if(! ((AliDalitzElectronCuts*)fCutElectronArray->At(fiCut))->ElectronIsSelected(positronCandidate) ) continue;
+      
+      lGoodPositronIndexPrev.push_back( fSelectorPositronIndex[i] );
+      hESDDalitzPositronPt[fiCut]->Fill( positronCandidate->Pt() );
+      hESDDalitzPositronPhi[fiCut]->Fill( positronCandidate->Phi() );
+       
+      
+       if( fMCEvent ) {
+         
+         Int_t labelpositron = TMath::Abs( positronCandidate->GetLabel() );
          
          if( labelpositron < fMCStack->GetNtrack() ) {
            TParticle* positron = fMCStack->Particle(labelpositron);
@@ -1560,10 +1576,7 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessElectronCandidates(){
             }
           }
         }
-        lGoodPositronIndexPrev.push_back( fSelectorPositronIndex[i] );
-        hESDDalitzPositronPt[fiCut]->Fill( positronCandidate->Pt() );
-       hESDDalitzPositronPhi[fiCut]->Fill( positronCandidate->Phi() );
-    }
+       }
 
 
    vector<Bool_t> lElectronPsiIndex(lGoodElectronIndexPrev.size(), kTRUE);

diff --git a/PWGGA/GammaConv/AliDalitzElectronCuts.cxx b/PWGGA/GammaConv/AliDalitzElectronCuts.cxx
index 8a6cf46ee245902b1238345148b2d390a3132d94..d25364e3690724afce91849b34ae93ab08e8e66e 100644 (file)
--- a/PWGGA/GammaConv/AliDalitzElectronCuts.cxx
+++ b/PWGGA/GammaConv/AliDalitzElectronCuts.cxx
@@ -76,7 +76,8 @@ AliDalitzElectronCuts::AliDalitzElectronCuts(const char *name,const char *title)
     fEtaCut(0.9),
     fEtaShift(0.0),
     fDoEtaCut(kFALSE),
-    fPtCut(0.0),
+    fPtMinCut(0.0),
+    fPtMaxCut(9999),
     fRadiusCut(1000.0),
     fPsiPairCut(0.45),
     fDeltaPhiCutMin(0.),
@@ -464,7 +465,7 @@ Bool_t AliDalitzElectronCuts::TrackIsSelected(AliESDtrack* lTrack) {
    }
    
    
-   if( lTrack->Pt() < fPtCut ) {
+   if( lTrack->Pt() < fPtMinCut || lTrack->Pt() > fPtMaxCut ) {
      
        return kFALSE;
        
@@ -1354,16 +1355,24 @@ Bool_t AliDalitzElectronCuts::SetPtCut(Int_t ptCut)
   
        switch(ptCut){
          
-       case 0: fPtCut = 0.075;         
+       case 0: fPtMinCut = 0.075;
+               fPtMaxCut = 9999;
                break;
        case 1:  // 0.1
-               fPtCut  = 0.1;  
+               fPtMinCut  = 0.1;       
+               fPtMaxCut  = 9999;
                break;
        case 2:  // 0.125 GeV
-               fPtCut  = 0.125;                
+               fPtMinCut = 0.125;              
+               fPtMaxCut = 9999;
                break;
        case 3: // 0.15 GeV
-               fPtCut  = 0.15;
+               fPtMinCut = 0.15;
+               fPtMaxCut = 9999;
+               break;
+               // 0.5 - 0.7 
+       case 4: fPtMinCut = 0.5;
+               fPtMaxCut = 0.7;
                break;
        default:
                cout<<"Warning: PtCut not defined "<<ptCut<<endl;

diff --git a/PWGGA/GammaConv/AliDalitzElectronCuts.h b/PWGGA/GammaConv/AliDalitzElectronCuts.h
index a1913b430bf1a0dba34dc54662aa5bf85f6741a5..669994c89a76f6166175279521d53a06735a551d 100644 (file)
--- a/PWGGA/GammaConv/AliDalitzElectronCuts.h
+++ b/PWGGA/GammaConv/AliDalitzElectronCuts.h
@@ -174,7 +174,8 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Double_t fEtaCut; //eta cutç
   Double_t fEtaShift;
   Bool_t   fDoEtaCut;
-  Double_t fPtCut;
+  Double_t fPtMinCut;
+  Double_t fPtMaxCut;
   Double_t fRadiusCut; // radius cut
   Double_t fPsiPairCut;
   Double_t fDeltaPhiCutMin;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C
index 746700ec0cbdfca658c58dffb716d85df39aecbc..7b4ea872e9a669e9fbad106ca1612b2ee0788c26 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C
@@ -202,7 +202,18 @@ if( trainConfig == 1 ) {  // No eta shift |Y| < 0.8
 
        ConvCutarray[0] = "8000011002093603007200000000"; ElecCutarray[0] = "9047540023310262331"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011
 
-
+} else if ( trainConfig == 6 ) {  // No eta shift |Y| < 0.8
+       
+       ConvCutarray[0] = "8000011002093603007200000000"; ElecCutarray[0] = "9047540023310264371"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011
+       
+} else if ( trainConfig == 7 ) {
+  
+       ConvCutarray[0] = "8000012002093603007200000000"; ElecCutarray[0] = "9047540023310262371"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011
+       
+} else if ( trainConfig == 8 ) {  // No eta shift |Y| < 0.8
+       
+       ConvCutarray[0] = "8000012002093603007200000000"; ElecCutarray[0] = "9047540023310264371"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011
+       
 } 
 
 
@@ -235,7 +246,7 @@ if( trainConfig == 1 ) {  // No eta shift |Y| < 0.8
             return 0;
       } else {
 
-         if (  ( trainConfig >= 1 && trainConfig <= 5 )   ){
+         if (  ( trainConfig >= 1 && trainConfig <= 6 )   ){
            
            if (doWeighting){
              if (generatorName.CompareTo("DPMJET")==0){
@@ -244,7 +255,17 @@ if( trainConfig == 1 ) {  // No eta shift |Y| < 0.8
                analysisCuts[i]->SetUseReweightingWithHistogramFromFile(kTRUE, kTRUE, kFALSE, fileNameInputForWeighting, "Pi0_Hijing_LHC13e7_pPb_5023GeV_MBV0A", "Eta_Hijing_LHC13e7_pPb_5023GeV_MBV0A", "","Pi0_Fit_Data_pPb_5023GeV_MBV0A","Eta_Fit_Data_pPb_5023GeV_MBV0A");
              }
            }
+         } else if ( trainConfig >= 7 && trainConfig <= 8  ){
+           
+           if (doWeighting){
+             analysisCuts[i]->SetUseReweightingWithHistogramFromFile(kTRUE, kTRUE, kFALSE, fileNameInputForWeighting, "Pi0_Hijing_LHC13e7_addSig_pPb_5023GeV_MBV0A", "Eta_Hijing_LHC13e7_addSig_pPb_5023GeV_MBV0A", "","Pi0_Fit_Data_pPb_5023GeV_MBV0A","Eta_Fit_Data_pPb_5023GeV_MBV0A");
+           }
          }
+
+         
+         
+         
+         
          if (doEtaShiftIndCuts) {
          
              analysisCuts[i]->DoEtaShift(doEtaShiftIndCuts);