changes by Pedro Gonzales in DalitzTask
authorfbock <Friederike.Bock@cern.ch>
Thu, 23 Jan 2014 15:36:50 +0000 (16:36 +0100)
committerfbock <Friederike.Bock@cern.ch>
Thu, 23 Jan 2014 15:36:50 +0000 (16:36 +0100)
PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h
PWGGA/GammaConv/macros/AddTask_GammaConvDalitzV1_pPb.C

index 5437131..013aac7 100644 (file)
@@ -85,12 +85,16 @@ fV0Reader(NULL),
    fGammasPool(NULL),
    fConversionCuts(NULL),
    hESDConvGammaPt(NULL),
+   hESDConvGammaEta(NULL),
+   hESDConvGammaZR(NULL),
    hESDDalitzElectronPt(NULL),
    hESDDalitzPositronPt(NULL),
    hESDDalitzElectronPhi(NULL),
    hESDDalitzPositronPhi(NULL),
    hESDDalitzElectronAfterPt(NULL),
    hESDDalitzPositronAfterPt(NULL),
+   hESDDalitzElectronAfterEta(NULL),
+   hESDDalitzPositronAfterEta(NULL),
    hESDDalitzElectronAfterPhi(NULL),
    hESDDalitzPositronAfterPhi(NULL),
    hESDDalitzElectronAfterNFindClsTPC(NULL),
@@ -212,12 +216,16 @@ AliAnalysisTaskGammaConvDalitzV1::AliAnalysisTaskGammaConvDalitzV1( const char*
    fGammasPool(NULL),
    fConversionCuts(NULL),
    hESDConvGammaPt(NULL),
+   hESDConvGammaEta(NULL),
+   hESDConvGammaZR(NULL),
    hESDDalitzElectronPt(NULL),
    hESDDalitzPositronPt(NULL),
    hESDDalitzElectronPhi(NULL),
    hESDDalitzPositronPhi(NULL),
    hESDDalitzElectronAfterPt(NULL),
    hESDDalitzPositronAfterPt(NULL),
+   hESDDalitzElectronAfterEta(NULL),
+   hESDDalitzPositronAfterEta(NULL),
    hESDDalitzElectronAfterPhi(NULL),
    hESDDalitzPositronAfterPhi(NULL),
    hESDDalitzElectronAfterNFindClsTPC(NULL),
@@ -451,14 +459,19 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
    hNGoodESDTracks                 = new TH1I*[fnCuts];
    hEtaShift                       = new TProfile*[fnCuts];
    hESDConvGammaPt                 = new TH1F*[fnCuts];
+   hESDConvGammaEta               = new TH1F*[fnCuts];
+   hESDConvGammaZR                 = new TH2F*[fnCuts];
    hESDDalitzElectronPt            = new TH1F*[fnCuts];
    hESDDalitzPositronPt            = new TH1F*[fnCuts];
    hESDDalitzElectronPhi          = new TH1F*[fnCuts];
    hESDDalitzPositronPhi          = new TH1F*[fnCuts];
    
    if( fDoMesonQA ) {
+     
    hESDDalitzElectronAfterPt      = new TH1F*[fnCuts];
    hESDDalitzPositronAfterPt       = new TH1F*[fnCuts];
+   hESDDalitzElectronAfterEta      = new TH1F*[fnCuts];
+   hESDDalitzPositronAfterEta      = new TH1F*[fnCuts];
    hESDDalitzElectronAfterPhi      = new TH1F*[fnCuts];
    hESDDalitzPositronAfterPhi      = new TH1F*[fnCuts];
    hESDDalitzElectronAfterNFindClsTPC = new TH2F*[fnCuts];
@@ -529,6 +542,12 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
 
       hESDConvGammaPt[iCut] = new TH1F("ESD_ConvGamma_Pt","ESD_ConvGamma_Pt",250,0,25);
       fESDList[iCut]->Add(hESDConvGammaPt[iCut]);
+      
+      hESDConvGammaEta[iCut] = new TH1F("ESD_ConvGamma_Eta","ESD_ConvGamma_Eta",600,-1.5,1.5);
+      fESDList[iCut]->Add(hESDConvGammaEta[iCut]);
+      
+      hESDConvGammaZR[iCut]= new TH2F("ESD_ConvGamma_ConversionPoint_ZR","ESD_ConvGamma_ConversionPoint_ZR",1200,-150,150,480,0,120);
+      fESDList[iCut]->Add(hESDConvGammaZR[iCut]);
 
       hESDDalitzElectronPt[iCut] = new TH1F("ESD_DalitzElectron_Pt","ESD_DalitzElectron_Pt",1000,0,25);
       fESDList[iCut]->Add(hESDDalitzElectronPt[iCut]);
@@ -554,6 +573,13 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
 
       hESDDalitzPositronAfterPt[iCut] = new TH1F("ESD_DalitzPositron_After_Pt","ESD_DalitzPositron_After_Pt",1000,0,25);
       fESDList[iCut]->Add(hESDDalitzPositronAfterPt[iCut]);
+        
+      hESDDalitzElectronAfterEta[iCut] = new TH1F("ESD_DalitzElectron_After_Eta","ESD_DalitzElectron_After_Eta",600,-1.5,1.5);
+      fESDList[iCut]->Add(hESDDalitzElectronAfterEta[iCut]);
+      
+      hESDDalitzPositronAfterEta[iCut] = new TH1F("ESD_DalitzPositron_After_Eta","ESD_DalitzElectron_After_Eta",600,-1.5,1.5);
+      fESDList[iCut]->Add(hESDDalitzPositronAfterEta[iCut]);
+      
                   
       hESDDalitzElectronAfterPhi[iCut] = new TH1F("ESD_DalitzElectron_After_Phi","ESD_DalitzElectron_After_Phi",360,0,2*TMath::Pi());
       fESDList[iCut]->Add(hESDDalitzElectronAfterPhi[iCut]);
@@ -1157,7 +1183,6 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessPhotonCandidates()
       AliAODConversionPhoton* PhotonCandidate = (AliAODConversionPhoton*) fReaderGammas->At(i);
       if(!PhotonCandidate) continue;
       
-      
       fIsFromMBHeader = kTRUE;
       
       if( fMCEvent && ((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 0 ){
@@ -1170,8 +1195,8 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessPhotonCandidates()
             = ((AliConversionCuts*)fCutGammaArray->At(fiCut))->IsParticleFromBGEvent(PhotonCandidate->GetMCLabelNegative(), fMCStack,fInputEvent);
          if(isNegFromMBHeader == 0 && ((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetSignalRejection() != 3) continue;
          
-
          if( (isNegFromMBHeader+isPosFromMBHeader) != 4) fIsFromMBHeader = kFALSE;
+         
       }
       
       if(!((AliConversionCuts*)fCutGammaArray->At(fiCut))->PhotonIsSelected(PhotonCandidate,fESDEvent)) continue;
@@ -1180,9 +1205,13 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessPhotonCandidates()
          !((AliConversionCuts*)fCutGammaArray->At(fiCut))->UseToCloseV0sCut()){ // if no post reader loop is required add to events good gammas
          
          fGoodGammas->Add(PhotonCandidate);
+      
         if(fIsFromMBHeader){
              hESDConvGammaPt[fiCut]->Fill(PhotonCandidate->Pt());
+             hESDConvGammaEta[fiCut]->Fill(PhotonCandidate->Eta());
+             hESDConvGammaZR[fiCut]->Fill(PhotonCandidate->GetConversionZ(),PhotonCandidate->GetConversionRadius());
         }
+        
          if(fMCEvent){
             ProcessTruePhotonCandidates(PhotonCandidate);
          }
@@ -1197,6 +1226,8 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessPhotonCandidates()
          GoodGammasStepTwo->Add(PhotonCandidate);
       }
    }
+   
+   
    if(((AliConversionCuts*)fCutGammaArray->At(fiCut))->UseElecSharingCut()){
       for(Int_t i = 0;i<GoodGammasStepOne->GetEntries();i++){
          AliAODConversionPhoton *PhotonCandidate= (AliAODConversionPhoton*) GoodGammasStepOne->At(i);
@@ -1219,6 +1250,8 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessPhotonCandidates()
            
             if(fIsFromMBHeader){
                hESDConvGammaPt[fiCut]->Fill(PhotonCandidate->Pt());
+               hESDConvGammaEta[fiCut]->Fill(PhotonCandidate->Eta());
+               hESDConvGammaZR[fiCut]->Fill(PhotonCandidate->GetConversionZ(),PhotonCandidate->GetConversionRadius());
             }
             
             if(fMCEvent){
@@ -1246,6 +1279,8 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessPhotonCandidates()
         
          if(fIsFromMBHeader){
              hESDConvGammaPt[fiCut]->Fill(PhotonCandidate->Pt()); // Differences to old V0Reader in p_t due to conversion KF->TLorentzVector
+             hESDConvGammaEta[fiCut]->Fill(PhotonCandidate->Eta());
+             hESDConvGammaZR[fiCut]->Fill(PhotonCandidate->GetConversionZ(),PhotonCandidate->GetConversionRadius());
          }
         
          if(fMCEvent){
@@ -1756,6 +1791,9 @@ void AliAnalysisTaskGammaConvDalitzV1::CalculatePi0DalitzCandidates(){
                 
                          hESDDalitzElectronAfterPt[fiCut]->Fill(  electronVgamma->Pt()  );
                          hESDDalitzPositronAfterPt[fiCut]->Fill(  positronVgamma->Pt()  );
+                         
+                         hESDDalitzElectronAfterEta[fiCut]->Fill( electronVgamma->Eta() );
+                         hESDDalitzPositronAfterEta[fiCut]->Fill( positronVgamma->Eta() );
                 
                          hESDDalitzElectronAfterPhi[fiCut]->Fill( electronVgamma->Phi() );
                          hESDDalitzPositronAfterPhi[fiCut]->Fill( positronVgamma->Phi() );
@@ -1777,9 +1815,7 @@ void AliAnalysisTaskGammaConvDalitzV1::CalculatePi0DalitzCandidates(){
                      
                          lGoodVirtualGamma[virtualGammaIndex] = kTRUE;
                      }
-                   }
-      
-                
+                  }
                }
              }
              else {
@@ -1796,6 +1832,9 @@ void AliAnalysisTaskGammaConvDalitzV1::CalculatePi0DalitzCandidates(){
                 
                      hESDDalitzElectronAfterPt[fiCut]->Fill(  electronVgamma->Pt()  );
                      hESDDalitzPositronAfterPt[fiCut]->Fill(  positronVgamma->Pt()  );
+                     
+                     hESDDalitzElectronAfterEta[fiCut]->Fill( electronVgamma->Eta() );
+                     hESDDalitzPositronAfterEta[fiCut]->Fill( positronVgamma->Eta() );
                 
                      hESDDalitzElectronAfterPhi[fiCut]->Fill( electronVgamma->Phi() );
                      hESDDalitzPositronAfterPhi[fiCut]->Fill( positronVgamma->Phi() );
@@ -1818,7 +1857,7 @@ void AliAnalysisTaskGammaConvDalitzV1::CalculatePi0DalitzCandidates(){
                      lGoodVirtualGamma[virtualGammaIndex] = kTRUE;
                 
                    }
-                  }
+                }
              }
               
               if( fDoChicAnalysis) {
@@ -2171,7 +2210,7 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessTrueMesonCandidates(AliAODConversi
 
             Float_t weighted= 1;
             
-            if( ((AliDalitzElectronCuts*) fCutElectronArray->At(fiCut))->DoWeights() ) {
+            if( ((AliDalitzElectronCuts*) fCutElectronArray->At(fiCut))->DoWeights() ) { 
                 if(((AliConversionCuts*)fCutGammaArray->At(fiCut))->IsParticleFromBGEvent(gammaMotherLabel, fMCStack,fInputEvent)){
                     if (((TParticle*)MCStack->Particle(gammaMotherLabel))->Pt()>0.005){
                         weighted= ((AliConversionCuts*)fCutGammaArray->At(fiCut))->GetWeightForMeson(fV0Reader->GetPeriodName(),gammaMotherLabel,fMCStack,fInputEvent);
@@ -2351,7 +2390,7 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessMCParticles()
       {
        
        
-               Float_t weighted= 1;
+                       Float_t weighted= 1;
                   if( ((AliDalitzElectronCuts*) fCutElectronArray->At(fiCut))->DoWeights() ) { 
                        if(((AliConversionCuts*)fCutGammaArray->At(fiCut))->IsParticleFromBGEvent(i, fMCStack,fInputEvent)){
                          if (particle->Pt()>0.005){
index 6910783..7e74639 100644 (file)
@@ -110,12 +110,16 @@ class AliAnalysisTaskGammaConvDalitzV1: public AliAnalysisTaskSE
     TList **fGammasPool;
     AliConversionCuts *fConversionCuts;
     TH1F **hESDConvGammaPt;
+    TH1F **hESDConvGammaEta;
+    TH2F **hESDConvGammaZR;
     TH1F **hESDDalitzElectronPt;
     TH1F **hESDDalitzPositronPt;
     TH1F **hESDDalitzElectronPhi;
     TH1F **hESDDalitzPositronPhi;
     TH1F **hESDDalitzElectronAfterPt;
     TH1F **hESDDalitzPositronAfterPt;
+    TH1F **hESDDalitzElectronAfterEta;
+    TH1F **hESDDalitzPositronAfterEta;
     TH1F **hESDDalitzElectronAfterPhi;
     TH1F **hESDDalitzPositronAfterPhi;
     TH2F **hESDDalitzElectronAfterNFindClsTPC;
index 485b537..29234ac 100644 (file)
@@ -174,17 +174,21 @@ void AddTask_GammaConvDalitzV1_pPb(    Int_t trainConfig = 1,
 
 
    if( trainConfig == 1 ) {
-
+        
+     //No eta shift Standard
+     
         ConvCutarray[0] = "8000011082093603007200000000"; ElecCutarray[0] = "9047540025810262170"; MesonCutarray[0] = "01039035009000"; //standard cut Pi0 PbPb 00-100
-        ConvCutarray[1] = "8000011082093603007200000000"; ElecCutarray[1] = "9047540025810261170"; MesonCutarray[1] = "01039035009000"; //standard cut Pi0 PbPb 00-100 + Single Pt primary > 0.100 GeV
-        ConvCutarray[2] = "8000011082094603007200000000"; ElecCutarray[2] = "9047540025810262170"; MesonCutarray[2] = "01039035009000"; //standard cut Pi0 PbPb 00-100 + dEdx electron gamma   -6 ,7 sigmas
-        ConvCutarray[3] = "8000011082093603007203000000"; ElecCutarray[3] = "9047540025810262170"; MesonCutarray[3] = "01039035009000"; //standard cut Pi0 PbPb 00-100  do Aysemtri cut
-        ConvCutarray[4] = "8000011082093603007200000000"; ElecCutarray[4] = "9051540025810262170"; MesonCutarray[4] = "01039035009000"; //standard cut Pi0 PbPb 00-100
-        ConvCutarray[5] = "8000011082093603007200000000"; ElecCutarray[5] = "9051540025810262170"; MesonCutarray[5] = "01039035009000"; //standard cut Pi0 PbPb 00-100 Standard cut + dEdx primary -3, 5 and  3.0  , -10 pion rejection
-
+        ConvCutarray[1] = "8020011082093603007200000000"; ElecCutarray[1] = "9047540025810262170"; MesonCutarray[1] = "01039035009000"; //standard cut Pi0 PbPb 00-20
+        ConvCutarray[2] = "8240011082093603007200000000"; ElecCutarray[2] = "9047540025810262170"; MesonCutarray[2] = "01039035009000"; //standard cut Pi0 PbPb 20-40
+        ConvCutarray[3] = "8460011082093603007200000000"; ElecCutarray[3] = "9047540025810262170"; MesonCutarray[3] = "01039035009000"; //standard cut Pi0 PbPb 40-60
+        ConvCutarray[4] = "8680011082093603007200000000"; ElecCutarray[4] = "9047540025810262170"; MesonCutarray[4] = "01039035009000"; //standard cut Pi0 PbPb 60-80        
+        ConvCutarray[5] = "8600011082093603007200000000"; ElecCutarray[5] = "9047540025810262170"; MesonCutarray[5] = "01039035009000"; //standard cut Pi0 PbPb 60-100
+       
    } 
+  
   else if( trainConfig == 2 ) {
-
+       //Standard cut
+       
         ConvCutarray[0] = "8000011082093603007200000000"; ElecCutarray[0] = "9047540025810262170"; MesonCutarray[0] = "01039035009000"; //standard cut Pi0 PbPb 00-100
         ConvCutarray[1] = "8020011082093603007200000000"; ElecCutarray[1] = "9047540025810262170"; MesonCutarray[1] = "01039035009000"; //standard cut Pi0 PbPb 00-20
         ConvCutarray[2] = "8240011082093603007200000000"; ElecCutarray[2] = "9047540025810262170"; MesonCutarray[2] = "01039035009000"; //standard cut Pi0 PbPb 20-40
@@ -193,8 +197,20 @@ void AddTask_GammaConvDalitzV1_pPb(    Int_t trainConfig = 1,
         ConvCutarray[5] = "8600011082093603007200000000"; ElecCutarray[5] = "9047540025810262170"; MesonCutarray[5] = "01039035009000"; //standard cut Pi0 PbPb 60-100
 
  }
+ else if( trainConfig == 3 ) {
+   
+       //No eta shift   |y| < 0.8 |electrons.eta < 0.9|  |gamma.eta| < 0.9
+       
+        ConvCutarray[0] = "8000011002093603007200000000"; ElecCutarray[0] = "9047540025310262170"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 PbPb 00-100
+        ConvCutarray[1] = "8020011002093603007200000000"; ElecCutarray[1] = "9047540025310262170"; MesonCutarray[1] = "01031035009000"; //standard cut Pi0 PbPb 00-20
+        ConvCutarray[2] = "8240011002093603007200000000"; ElecCutarray[2] = "9047540025310262170"; MesonCutarray[2] = "01031035009000"; //standard cut Pi0 PbPb 20-40
+        ConvCutarray[3] = "8460011002093603007200000000"; ElecCutarray[3] = "9047540025310262170"; MesonCutarray[3] = "01031035009000"; //standard cut Pi0 PbPb 40-60
+        ConvCutarray[4] = "8680011002093603007200000000"; ElecCutarray[4] = "9047540025310262170"; MesonCutarray[4] = "01031035009000"; //standard cut Pi0 PbPb 60-80        
+        ConvCutarray[5] = "8600011002093603007200000000"; ElecCutarray[5] = "9047540025310262170"; MesonCutarray[5] = "01031035009000"; //standard cut Pi0 PbPb 60-100
+   
+ }
 
-else if( trainConfig == 3 ) {
+else if( trainConfig == 4 ) {
 
         ConvCutarray[0] = "8000011082093603007200000000"; ElecCutarray[0] = "9047540025810262171"; MesonCutarray[0] = "01039035009000"; //standard cut Pi0 PbPb 00-100
         ConvCutarray[1] = "8020011082093603007200000000"; ElecCutarray[1] = "9047540025810262171"; MesonCutarray[1] = "01039035009000"; //standard cut Pi0 PbPb 00-20
@@ -203,7 +219,7 @@ else if( trainConfig == 3 ) {
         ConvCutarray[4] = "8680011082093603007200000000"; ElecCutarray[4] = "9047540025810262171"; MesonCutarray[4] = "01039035009000"; //standard cut Pi0 PbPb 60-80        
         ConvCutarray[5] = "8600011082093603007200000000"; ElecCutarray[5] = "9047540025810262171"; MesonCutarray[5] = "01039035009000"; //standard cut Pi0 PbPb 60-100
 
- } else if( trainConfig == 4 ) {
+} else if( trainConfig == 5 ) {
 
         ConvCutarray[0] = "8000012082093603007200000000"; ElecCutarray[0] = "9047540025810262171"; MesonCutarray[0] = "01039035009000"; //standard cut Pi0 PbPb 00-100
         ConvCutarray[1] = "8020012082093603007200000000"; ElecCutarray[1] = "9047540025810262171"; MesonCutarray[1] = "01039035009000"; //standard cut Pi0 PbPb 00-20
@@ -211,7 +227,30 @@ else if( trainConfig == 3 ) {
         ConvCutarray[3] = "8460012082093603007200000000"; ElecCutarray[3] = "9047540025810262171"; MesonCutarray[3] = "01039035009000"; //standard cut Pi0 PbPb 40-60
         ConvCutarray[4] = "8680012082093603007200000000"; ElecCutarray[4] = "9047540025810262171"; MesonCutarray[4] = "01039035009000"; //standard cut Pi0 PbPb 60-80        
         ConvCutarray[5] = "8600012082093603007200000000"; ElecCutarray[5] = "9047540025810262171"; MesonCutarray[5] = "01039035009000"; //standard cut Pi0 PbPb 60-100
-   }
+       
+} else if( trainConfig == 6 ) {
+  
+       //No eta shift |Y| < 0.8 |electrons.eta| < 0.9 |gamma.eta| < 0.9
+       
+       ConvCutarray[0] = "8000012002093603007200000000"; ElecCutarray[0] = "9047540025310262171"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 PbPb 00-100
+        ConvCutarray[1] = "8020012002093603007200000000"; ElecCutarray[1] = "9047540025310262171"; MesonCutarray[1] = "01031035009000"; //standard cut Pi0 PbPb 00-20
+        ConvCutarray[2] = "8240012002093603007200000000"; ElecCutarray[2] = "9047540025310262171"; MesonCutarray[2] = "01031035009000"; //standard cut Pi0 PbPb 20-40
+        ConvCutarray[3] = "8460012002093603007200000000"; ElecCutarray[3] = "9047540025310262171"; MesonCutarray[3] = "01031035009000"; //standard cut Pi0 PbPb 40-60
+        ConvCutarray[4] = "8680012002093603007200000000"; ElecCutarray[4] = "9047540025310262171"; MesonCutarray[4] = "01031035009000"; //standard cut Pi0 PbPb 60-80        
+        ConvCutarray[5] = "8600012002093603007200000000"; ElecCutarray[5] = "9047540025310262171"; MesonCutarray[5] = "01031035009000"; //standard cut Pi0 PbPb 60-100
+ }  else if( trainConfig == 7 ) {
+       //No eta shift added signals
+    
+        ConvCutarray[0] = "8000012082093603007200000000"; ElecCutarray[0] = "9047540025810262171"; MesonCutarray[0] = "01039035009000"; //standard cut Pi0 PbPb 00-100
+        ConvCutarray[1] = "8020012082093603007200000000"; ElecCutarray[1] = "9047540025810262171"; MesonCutarray[1] = "01039035009000"; //standard cut Pi0 PbPb 00-20
+        ConvCutarray[2] = "8240012082093603007200000000"; ElecCutarray[2] = "9047540025810262171"; MesonCutarray[2] = "01039035009000"; //standard cut Pi0 PbPb 20-40
+        ConvCutarray[3] = "8460012082093603007200000000"; ElecCutarray[3] = "9047540025810262171"; MesonCutarray[3] = "01039035009000"; //standard cut Pi0 PbPb 40-60
+        ConvCutarray[4] = "8680012082093603007200000000"; ElecCutarray[4] = "9047540025810262171"; MesonCutarray[4] = "01039035009000"; //standard cut Pi0 PbPb 60-80        
+        ConvCutarray[5] = "8600012082093603007200000000"; ElecCutarray[5] = "9047540025810262171"; MesonCutarray[5] = "01039035009000"; //standard cut Pi0 PbPb 60-100
+} 
+   
+   
 
        
 
@@ -244,7 +283,7 @@ else if( trainConfig == 3 ) {
       }
    else {
 
-   if ( trainConfig == 3 ){
+   if ( trainConfig == 4 ){
 
          if (i == 0 && doWeighting){
 
@@ -289,8 +328,9 @@ else if( trainConfig == 3 ) {
                analysisCuts[i]->SetUseReweightingWithHistogramFromFile(kTRUE, kTRUE, kFALSE, fileNameInputForWeighting, "Pi0_Hijing_LHC13e7_pPb_5023GeV_60100V0A", "Eta_Hijing_LHC13e7_pPb_5023GeV_60100V0A", "","Pi0_Fit_Data_pPb_5023GeV_60100V0A","Eta_Fit_Data_pPb_5023GeV_60100V0A");
             }
          }
-      }
-      else if (trainConfig == 4 ){
+   }
+      
+   else if (trainConfig == 5 ||  trainConfig == 6  || trainConfig == 7 ){
 
          if (i == 0 && 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");
@@ -312,14 +352,18 @@ else if( trainConfig == 3 ) {
          if (i == 5 && doWeighting){
             analysisCuts[i]->SetUseReweightingWithHistogramFromFile(kTRUE, kTRUE, kFALSE, fileNameInputForWeighting, "Pi0_Hijing_LHC13e7_addSig_pPb_5023GeV_60100V0A", "Eta_Hijing_LHC13e7_addSig_pPb_5023GeV_60100V0A", "","Pi0_Fit_Data_pPb_5023GeV_60100V0A","Eta_Fit_Data_pPb_5023GeV_60100V0A");
          }
-      }
+     }
         
 
 
       
        if (doEtaShiftIndCuts) {
-         analysisCuts[i]->DoEtaShift(doEtaShiftIndCuts);
-         analysisCuts[i]->SetEtaShift(stringShift);
+         
+         if( trainConfig == 2 || trainConfig == 4 || trainConfig == 5 ){   //Apply_eta shift
+         
+             analysisCuts[i]->DoEtaShift(doEtaShiftIndCuts);
+             analysisCuts[i]->SetEtaShift(stringShift);
+         }
        }
         ConvCutList->Add(analysisCuts[i]);
         analysisCuts[i]->SetFillCutHistograms("",kFALSE);