Fix for #79159: Changes to be committed in STEER

diff --git a/PWG1/ZDC/AliAnalysisTaskZDC.cxx b/PWG1/ZDC/AliAnalysisTaskZDC.cxx
index cb8322b5829a5bb8e2627176afa865818c8f2973..b10f1835faf078f3881a49300d98030f001c1a03 100644 (file)
--- a/PWG1/ZDC/AliAnalysisTaskZDC.cxx
+++ b/PWG1/ZDC/AliAnalysisTaskZDC.cxx
@@ -278,15 +278,11 @@ void AliAnalysisTaskZDC::UserExec(Option_t */*option*/)
   // ****************************************************
   
   AliAnalysisManager *am = AliAnalysisManager::GetAnalysisManager();
+    
+  AliESDZDC *esdZDC = esd->GetESDZDC();
   
   if((((AliInputEventHandler*)(am->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kMB)){
-    
-    AliESDZDC *esdZDC = esd->GetESDZDC();
   
-    for(Int_t i=0; i<4; i++){
-      fhTDCZNSum->Fill(esdZDC->GetZNTDCDiff(i));  
-      fhTDCZNDiff->Fill(esdZDC->GetZNTDCSum(i)); 
-    }
     fhZNCSpectrum->Fill(esdZDC->GetZDCN1Energy());       
     fhZNASpectrum->Fill(esdZDC->GetZDCN2Energy());
     fhZPCSpectrum->Fill(esdZDC->GetZDCP1Energy());               
@@ -300,8 +296,8 @@ void AliAnalysisTaskZDC::UserExec(Option_t */*option*/)
     const Double_t * towZPA = esdZDC->GetZP2TowerEnergy();
     //    
     fhZNCpmc->Fill(towZNC[0]);    
-    fhZNApmc->Fill(towZPC[0]);    
-    fhZPCpmc->Fill(towZNA[0]);    
+    fhZNApmc->Fill(towZNA[0]);    
+    fhZPCpmc->Fill(towZPC[0]);    
     fhZPApmc->Fill(towZPA[0]);    
   
     Double_t xyZNC[2]={-99.,-99.}, xyZNA[2]={-99.,-99.};
@@ -318,18 +314,22 @@ void AliAnalysisTaskZDC::UserExec(Option_t */*option*/)
        znclg += towZNCLG[iq];
        znalg += towZNALG[iq];
     }
-    fhZNCemd->Fill(znclg);      
-    fhZNAemd->Fill(znalg);      
+    fhZNCemd->Fill(znclg/2.);   
+    fhZNAemd->Fill(znalg/2.);   
     fhPMCZNCemd->Fill(towZNCLG[0]);   
     fhPMCZNAemd->Fill(towZNALG[0]);   
-    
-    Float_t tdcC = esdZDC->GetZDCTDCCorrected(10,0)-esdZDC->GetZDCTDCCorrected(15,0);
-    Float_t tdcA = esdZDC->GetZDCTDCCorrected(12,0)-esdZDC->GetZDCTDCCorrected(15,0);
-    fDebunch->Fill(tdcC-tdcA, tdcC+tdcA);
-  
-    PostData(1, fOutput);
   
   }
+    
+  Float_t tdcC = esdZDC->GetZDCTDCCorrected(10,0)-esdZDC->GetZDCTDCCorrected(15,0);
+  Float_t tdcA = esdZDC->GetZDCTDCCorrected(12,0)-esdZDC->GetZDCTDCCorrected(15,0);
+  //for(Int_t i=0; i<4; i++){
+    fhTDCZNSum->Fill(tdcC+tdcA);  
+    fhTDCZNDiff->Fill(tdcC-tdcA); 
+  //}
+  fDebunch->Fill(tdcC-tdcA, tdcC+tdcA);
+  
+  PostData(1, fOutput);
    
 }
 

diff --git a/STEER/AliESDZDC.h b/STEER/AliESDZDC.h
index f2e6fd4d2f6ddbb7524238562fe4fe67bc3e115a..0e1484fc540fcb2cd23f89d9af54ce44fc698c42 100644 (file)
--- a/STEER/AliESDZDC.h
+++ b/STEER/AliESDZDC.h
@@ -59,12 +59,14 @@ public:
   const UInt_t* GetZDCScaler()  const {return fVMEScaler;}
 
   Int_t GetZDCTDCData(Int_t i, Int_t j) const {return fZDCTDCData[i][j];}
-  Float_t GetZDCTDCCorrected(Int_t i, Int_t j) const {return fZDCTDCCorrected[i][j];}
+  Float_t GetZDCTDCCorrected(Int_t i, Int_t j) const 
+         {if(AliESDZDC::kCorrectedTDCFilled) return fZDCTDCCorrected[i][j];
+          else return 0.;}
   Float_t GetZNTDCSum(Int_t ihit) const 
-          {if(ihit<4) return (Float_t) (fZDCTDCCorrected[10][ihit]+fZDCTDCCorrected[12][ihit]);
+          {if(ihit<4 && AliESDZDC::kCorrectedTDCFilled) return (Float_t) (fZDCTDCCorrected[10][ihit]+fZDCTDCCorrected[12][ihit]);
            else return 0.;}
   Float_t GetZNTDCDiff(Int_t ihit) const 
-          {if(ihit<4) return (Float_t) (fZDCTDCCorrected[12][ihit]-fZDCTDCCorrected[10][ihit]);
+          {if(ihit<4 && AliESDZDC::kCorrectedTDCFilled) return (Float_t) (fZDCTDCCorrected[12][ihit]-fZDCTDCCorrected[10][ihit]);
            else return 0.;}
   
   void  SetZDC(Double_t n1Energy, Double_t p1Energy,