Updated task

diff --git a/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.cxx b/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.cxx
index 0e6f29d5c11a5b087301823b28c650437f9036cf..11938a4e39dd07ade945750f4f9cd994123c3fbc 100644 (file)
--- a/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.cxx
+++ b/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.cxx
@@ -107,11 +107,16 @@ AliAnalysisTaskZDCTreeMaker::AliAnalysisTaskZDCTreeMaker():
      fZPAtowerLG[itow]=0.;
 
   }
-  for(Int_t ihit=0; ihit<4; ihit++) {
-     fTDCZNC[ihit] = 9999.;
-     fTDCZPC[ihit] = 9999.;
-     fTDCZNA[ihit] = 9999.;
-     fTDCZPA[ihit] = 9999;
+  /*for(Int_t ihit=0; ihit<4; ihit++) {
+     fTDCZNC[ihit] = 0;
+     fTDCZPC[ihit] = 0;
+     fTDCZNA[ihit] = 0;
+     fTDCZPA[ihit] = 0;
+     fTDCZEM1[ihit] = 0;
+     fTDCZEM2[ihit] = 0;
+  }*/
+  for(Int_t itdc=0; itdc<32; itdc++){
+    for(Int_t ihit=0; ihit<4; ihit++) fTDCvalues[itdc][ihit]=9999;
   }
   
 }   
@@ -167,12 +172,17 @@ AliAnalysisTaskZDCTreeMaker::AliAnalysisTaskZDCTreeMaker(const char *name):
      fZPAtowerLG[itow]=0.;
 
   }
-  for(Int_t ihit=0; ihit<4; ihit++) {
-     fTDCZNC[ihit] = 9999.;
-     fTDCZPC[ihit] = 9999.;
-     fTDCZNA[ihit] = 9999.;
-     fTDCZPA[ihit] = 9999;
-  }
+  /*for(Int_t ihit=0; ihit<4; ihit++) {
+     fTDCZNC[ihit] = 0;
+     fTDCZPC[ihit] = 0;
+     fTDCZNA[ihit] = 0;
+     fTDCZPA[ihit] = 0;
+     fTDCZEM1[ihit] = 0;
+     fTDCZEM2[ihit] = 0;
+  }*/
+  //for(Int_t itdc=0; itdc<32; itdc++){
+  //  for(Int_t ihit=0; ihit<4; ihit++) fTDCvalues[itdc][ihit]=9999;
+  //}
   
   // Output slot #1 writes into a TList container
   DefineOutput(1, TList::Class()); 
@@ -240,12 +250,14 @@ void AliAnalysisTaskZDCTreeMaker::UserCreateOutputObjects()
     fCentralityTree->Branch("znatowerLG", fZNAtowerLG, "znatowerLG[5]/F");
     fCentralityTree->Branch("zpatowerLG", fZPAtowerLG, "zpatowerLG[5]/F");
 
-//    fCentralityTree->Branch("tdc", fTDCvalues, "tdc[32][4]/I");
+    fCentralityTree->Branch("tdc", fTDCvalues, "tdc[32][4]/I");
 //    fCentralityTree->Branch("tdcCorr", fTDCcorr, "tdcCorr[32][4]/F");
-    fCentralityTree->Branch("tdcZNC", fTDCZNC, "tdcZNC[4]/I");
+    /*fCentralityTree->Branch("tdcZNC", fTDCZNC, "tdcZNC[4]/I");
     fCentralityTree->Branch("tdcZPC", fTDCZPC, "tdcZPC[4]/I");
     fCentralityTree->Branch("tdcZNA", fTDCZNA, "tdcZNA[4]/I");
     fCentralityTree->Branch("tdcZPA", fTDCZPA, "tdcZPA[4]/I");
+    fCentralityTree->Branch("tdcZEM1", fTDCZEM1, "tdcZEM1[4]/I");
+    fCentralityTree->Branch("tdcZEM2", fTDCZEM2, "tdcZEM2[4]/I");*/
     
     fCentralityTree->Branch("centrV0mult", &fCentralityV0M, "centrV0mult/F");
     fCentralityTree->Branch("centrV0Amult", &fCentralityV0A, "centrV0Amult/F");
@@ -289,7 +301,7 @@ void AliAnalysisTaskZDCTreeMaker::UserExec(Option_t */*option*/)
       
       // use response of AliPhysicsSelection
       fIsEventSelected = (((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected() & AliVEvent::kAnyINT);       
-      fIsPileupFromSPD = esd->IsPileupFromSPD(5);
+      fIsPileupFromSPD = esd->IsPileupFromSPD(6,1.0);
 
       AliCentrality *centrality = esd->GetCentrality();
       fCentralityV0M = centrality->GetCentralityPercentile("V0M");
@@ -354,12 +366,21 @@ void AliAnalysisTaskZDCTreeMaker::UserExec(Option_t */*option*/)
          fZPAtowerLG[it] = (Float_t) (towZPALG[it]);  
       }
       
-      for(int itdc=0; itdc<4; itdc++){
-         fTDCZNC[itdc] = esdZDC->GetZDCTDCData(10, itdc);
-        fTDCZPC[itdc] = esdZDC->GetZDCTDCData(11, itdc);
-        fTDCZNA[itdc] = esdZDC->GetZDCTDCData(12, itdc);
-        fTDCZPA[itdc] = esdZDC->GetZDCTDCData(13, itdc);
-      }
+      /*for(int itdc=0; itdc<4; itdc++){
+         int tdcL0 = 0;
+        if(esdZDC->GetZDCTDCData(15, 0)!=0.) tdcL0 = esdZDC->GetZDCTDCData(15, 0);
+        if(esdZDC->GetZDCTDCData(8, itdc)!=0.) fTDCZEM1[itdc] = esdZDC->GetZDCTDCData(8, itdc)-tdcL0;
+         if(esdZDC->GetZDCTDCData(9, itdc)!=0.) fTDCZEM2[itdc] = esdZDC->GetZDCTDCData(9, itdc)-tdcL0;
+         if(esdZDC->GetZDCTDCData(10, itdc)!=0.) fTDCZNC[itdc] = esdZDC->GetZDCTDCData(10, itdc)-tdcL0;
+        if(esdZDC->GetZDCTDCData(11, itdc)!=0.) fTDCZPC[itdc] = esdZDC->GetZDCTDCData(11, itdc)-tdcL0;
+        if(esdZDC->GetZDCTDCData(11, itdc)!=0.) fTDCZPC[itdc] = esdZDC->GetZDCTDCData(11, itdc)-tdcL0;
+        if(esdZDC->GetZDCTDCData(13, itdc)!=0.) fTDCZPA[itdc] = esdZDC->GetZDCTDCData(13, itdc)-tdcL0;
+      }*/
+      for(Int_t itdc=0; itdc<32; itdc++){
+        for(Int_t i=0; i<4; i++){
+          fTDCvalues[itdc][i] = esdZDC->GetZDCTDCData(itdc, i);
+        }
+      }      
 
   }   
   else if(fAnalysisInput.CompareTo("AOD")==0){

diff --git a/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.h b/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.h
index 54af9facbd7b66d504cdf5b3abad44cefadbcaba..8f9705324020d3b54b37e719f65c6578a03c4244 100644 (file)
--- a/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.h
+++ b/PWGLF/FORWARD/GEO/AliAnalysisTaskZDCTreeMaker.h
@@ -81,12 +81,13 @@ class AliAnalysisTaskZDCTreeMaker : public AliAnalysisTaskSE {
   Float_t  fZNAtowerLG[5];     //  ZNA 5 tower signals
   Float_t  fZPAtowerLG[5];     //  ZPA 5 tower signals
   //
-  Int_t    fTDCZNC[4];      // TDC raw values !ONLY FOR ESDs ANALYSIS!
+  /*Int_t    fTDCZNC[4];            // TDC raw values !ONLY FOR ESDs ANALYSIS!
   Int_t    fTDCZPC[4];      // TDC raw values !ONLY FOR ESDs ANALYSIS!
   Int_t    fTDCZNA[4];      // TDC raw values !ONLY FOR ESDs ANALYSIS!
   Int_t    fTDCZPA[4];      // TDC raw values !ONLY FOR ESDs ANALYSIS!
-//  Int_t    fTDCZEM1;      // TDC raw values !ONLY FOR ESDs ANALYSIS!
-//  Int_t    fTDCZEM2;      // TDC raw values !ONLY FOR ESDs ANALYSIS!
+  Int_t    fTDCZEM1[4];             // TDC raw values !ONLY FOR ESDs ANALYSIS!
+  Int_t    fTDCZEM2[4];*/           // TDC raw values !ONLY FOR ESDs ANALYSIS!
+  Int_t   fTDCvalues[32][4];   // TDC raw values !ONLY FOR ESDs ANALYSIS!
   
   Float_t fCentralityV0M;       // Centrality from V0A+V0C
   Float_t fCentralityV0A;       // Centrality from V0A
@@ -100,7 +101,7 @@ class AliAnalysisTaskZDCTreeMaker : public AliAnalysisTaskSE {
   AliAnalysisTaskZDCTreeMaker& operator= (const AliAnalysisTaskZDCTreeMaker& ana);
   AliAnalysisTaskZDCTreeMaker(const AliAnalysisTaskZDCTreeMaker& c);
   //
-  ClassDef(AliAnalysisTaskZDCTreeMaker,3); 
+  ClassDef(AliAnalysisTaskZDCTreeMaker,4); 
 
 };