New changes for Eta shift

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
index f983fecee8f15f67cfdc4f9c42e862d970a2ec22..db36ee41841a8b9e93154fa0a9638c632ee22215 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
@@ -1342,16 +1342,9 @@ void AliAnalysisTaskGammaConvDalitzV1::UserExec(Option_t *)
 Bool_t AliAnalysisTaskGammaConvDalitzV1::Notify()
 {
        for(Int_t iCut = 0; iCut<fnCuts;iCut++){
+         
                if( !((AliConvEventCuts*)fCutEventArray->At(iCut))->GetDoEtaShift() ){
 
-                       /*if (((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift() != 0.){
-                               printf("Error: Gamma Conversion Dalitz Task %s :: Eta Shift not requested but set to %f, reset to 00. \n\n",
-                                       (((AliConvEventCuts*)fCutEventArray->At(iCut))->GetCutNumber()).Data(),((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift());
-                               ((AliConvEventCuts*)fCutEventArray->At(iCut))->SetEtaShift(0.);
-                               ((AliDalitzElectronCuts*)fCutElectronArray->At(iCut))->SetEtaShift(0.);
-               
-                               
-                       }*/
                        hEtaShift[iCut]->Fill(0.,0.);
                        continue; // No Eta Shift requested, continue
                }
@@ -1360,14 +1353,12 @@ Bool_t AliAnalysisTaskGammaConvDalitzV1::Notify()
                if( ((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift() == 0.0){ // Eta Shift requested but not set, get shift automatically
                        ((AliConvEventCuts*)fCutEventArray->At(iCut))->GetCorrectEtaShiftFromPeriod(fV0Reader->GetPeriodName());
                        ((AliConvEventCuts*)fCutEventArray->At(iCut))->DoEtaShift(kFALSE); // Eta Shift Set, make sure that it is called only once   
-                       ((AliDalitzElectronCuts*)fCutElectronArray->At(iCut))->SetEtaShift( ((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift() );
-                       hEtaShift[iCut]->Fill(0.,(((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift()));
+                        hEtaShift[iCut]->Fill(0.,(((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift()));
                        continue;
                } else {
                        printf(" Gamma Conversion Dalitz Task %s :: Eta Shift Manually Set to %f \n\n",
                        (((AliConvEventCuts*)fCutEventArray->At(iCut))->GetCutNumber()).Data(),((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift());
                        ((AliConvEventCuts*)fCutEventArray->At(iCut))->DoEtaShift(kFALSE); // Eta Shift Set, make sure that it is called only once   
-                       ((AliDalitzElectronCuts*)fCutElectronArray->At(iCut))->SetEtaShift( ((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift() );
                        hEtaShift[iCut]->Fill(0.,(((AliConvEventCuts*)fCutEventArray->At(iCut))->GetEtaShift()));
                }
        }

diff --git a/PWGGA/GammaConv/AliDalitzElectronCuts.cxx b/PWGGA/GammaConv/AliDalitzElectronCuts.cxx
index dda084d5884363876a2d66f75f66cd7582145393..d5def29bb49c24af69bc396507ee7163f3d63141 100644 (file)
--- a/PWGGA/GammaConv/AliDalitzElectronCuts.cxx
+++ b/PWGGA/GammaConv/AliDalitzElectronCuts.cxx
@@ -74,7 +74,6 @@ AliDalitzElectronCuts::AliDalitzElectronCuts(const char *name,const char *title)
     fPIDResponse(NULL),
     fesdTrackCuts(NULL),
     fEtaCut(0.9),
-    fEtaShift(0.0),
     fDoEtaCut(kFALSE),
     fPtMinCut(0.0),
     fPtMaxCut(9999),
@@ -389,7 +388,7 @@ Bool_t AliDalitzElectronCuts::ElectronIsSelectedMC(Int_t labelParticle,AliStack
         if( TMath::Abs( particle->GetPdgCode() ) != 11 )  return kFALSE;
         
         if( fDoEtaCut ){
-         if( particle->Eta() > (fEtaCut + fEtaShift) || particle->Eta() < (-fEtaCut + fEtaShift) )
+         if( particle->Eta() > fEtaCut  || particle->Eta() < -fEtaCut  )
          return kFALSE;
        }
         
@@ -499,7 +498,7 @@ Bool_t AliDalitzElectronCuts::TrackIsSelected(AliESDtrack* lTrack) {
     }
     
     if( fDoEtaCut ) {
-      if(  lTrack->Eta() > (fEtaCut + fEtaShift) || lTrack->Eta() < (-fEtaCut + fEtaShift) ) {
+      if(  lTrack->Eta() > fEtaCut  || lTrack->Eta() < -fEtaCut ) {
         return kFALSE;
       }
    }

diff --git a/PWGGA/GammaConv/AliDalitzElectronCuts.h b/PWGGA/GammaConv/AliDalitzElectronCuts.h
index 495bf6921b52f4a44149b170733e86594ddc5523..bc96458aa41af596f31d4ede8396cab877e4efb2 100644 (file)
--- a/PWGGA/GammaConv/AliDalitzElectronCuts.h
+++ b/PWGGA/GammaConv/AliDalitzElectronCuts.h
@@ -134,7 +134,6 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   Bool_t SetEtaCut(Int_t etaCut);
   Bool_t SetPtCut(Int_t ptCut);
   Bool_t SetDCACut(Int_t dcaCut);
-  void SetEtaShift(Double_t etaShift){fEtaShift = etaShift;}
   Bool_t SetMinMomPiondEdxCut(Int_t piMinMomdedxSigmaCut);
   Bool_t SetMaxMomPiondEdxCut(Int_t piMaxMomdedxSigmaCut);
   Bool_t SetLowPRejectionCuts(Int_t LowPRejectionSigmaCut);
@@ -176,7 +175,6 @@ class AliDalitzElectronCuts : public AliAnalysisCuts {
   AliESDtrackCuts *fesdTrackCuts;
 
   Double_t fEtaCut; //eta cutç
-  Double_t fEtaShift;
   Bool_t   fDoEtaCut;
   Double_t fPtMinCut;
   Double_t fPtMaxCut;