adding first version of common HLT track data struct for barrel tracks

[u/mrichter/AliRoot.git] / ZDC / AliZDC.cxx

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 6ffe6509f542e92217f98f2ddf19bf075f1920a6..6ee09dd5ce45a9900b8d497c3ad72a53dea2ef2e 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -51,7 +51,6 @@
 #include "AliZDCRawStream.h"
 #include "AliZDCPedestals.h"
 #include "AliZDCCalib.h"
-#include "AliZDCRecParam.h"
 #include "AliFstream.h"
 
  
@@ -60,10 +59,10 @@ ClassImp(AliZDC)
 //_____________________________________________________________________________
 AliZDC::AliZDC() :
   AliDetector(),
-  fNoShower  (0),
+  fNoShower(0),
   fPedCalib(0),
   fCalibData(0),
-  fRecParam(0)
+  fZDCCalibFName("")
 {
   //
   // Default constructor for the Zero Degree Calorimeter base class
@@ -83,7 +82,7 @@ AliZDC::AliZDC(const char *name, const char *title) :
   fNoShower  (0),
   fPedCalib(0),
   fCalibData(0),
-  fRecParam(0)
+  fZDCCalibFName("")
 {
   //
   // Standard constructor for the Zero Degree Calorimeter base class
@@ -114,20 +113,18 @@ AliZDC::~AliZDC()
   fIshunt = 0;
   delete fPedCalib;
   delete fCalibData;
-  delete fRecParam;
 
 }
 
 //_____________________________________________________________________________
 AliZDC::AliZDC(const AliZDC& ZDC) :
-  AliDetector("ZDC","ZDC")
+AliDetector("ZDC","ZDC"),
+fNoShower(ZDC.fNoShower),
+fPedCalib(ZDC.fPedCalib),
+fCalibData(ZDC.fCalibData),
+fZDCCalibFName(ZDC.fZDCCalibFName)
 {
   // copy constructor
-    fNoShower = ZDC.fNoShower;
-    fPedCalib = ZDC.fPedCalib;
-    fCalibData = ZDC.fCalibData;
-    fRecParam = ZDC.fRecParam;
-    fZDCCalibFName = ZDC.fZDCCalibFName;
 }
 
 //_____________________________________________________________________________
@@ -138,7 +135,6 @@ AliZDC& AliZDC::operator=(const AliZDC& ZDC)
     fNoShower = ZDC.fNoShower;
     fPedCalib = ZDC.fPedCalib;
     fCalibData = ZDC.fCalibData;
-    fRecParam = ZDC.fRecParam;
     fZDCCalibFName = ZDC.fZDCCalibFName;
   } return *this;
 }
@@ -154,7 +150,8 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   //     obtain digits at the end of each event
   //
   
-  static Float_t primKinEn, xImpact, yImpact, sFlag;
+  static Float_t primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
+  static Int_t   pcPDGcode;
 
   AliZDCHit *newquad, *curprimquad;
   newquad = new AliZDCHit(fIshunt, track, vol, hits);
@@ -163,6 +160,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   if(fNhits==0){
       // First hit -> setting flag for primary or secondary particle
       Int_t primary = gAlice->GetMCApp()->GetPrimary(track);     
+      //
       if(track != primary){
         newquad->SetSFlag(1);  // SECONDARY particle entering the ZDC
       }
@@ -173,12 +171,14 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       primKinEn = newquad->GetPrimKinEn();
       xImpact  = newquad->GetXImpact();
       yImpact  = newquad->GetYImpact();
+      pcPDGcode        = newquad->GetPDGCode();
    }
    else{       
       newquad->SetPrimKinEn(primKinEn);
       newquad->SetXImpact(xImpact);
       newquad->SetYImpact(yImpact);
       newquad->SetSFlag(sFlag);
+      newquad->SetPDGCode(pcPDGcode);
    }
  
   Int_t j;
@@ -277,7 +277,7 @@ void AliZDC::Hits2SDigits()
 {
   // Create summable digits from hits
   
-  AliDebug(1,"\n       Entering AliZDC::Hits2Digits() ");
+  AliDebug(1,"\n       Entering AliZDC::Hits2SDigits() ");
   
   fLoader->LoadHits("read");
   fLoader->LoadSDigits("recreate");
@@ -287,8 +287,9 @@ void AliZDC::Hits2SDigits()
 
   // Event loop
   for(Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) {
-    Float_t pmCZN = 0, pmCZP = 0, pmQZN[4], pmQZP[4], pmZEM1 = 0, pmZEM2 = 0;
-    for(Int_t i = 0; i < 4; i++) pmQZN[i] = pmQZP[i] = 0;
+    Float_t pmCZNC=0, pmCZPC=0, pmCZNA=0, pmCZPA=0, pmZEM1 = 0, pmZEM2 = 0;
+    Float_t pmQZNC[4], pmQZPC[4], pmQZNA[4], pmQZPA[4];
+    for(Int_t i = 0; i < 4; i++) pmQZNC[i] = pmQZPC[i] =  pmQZNA[i] = pmQZPA[i] = 0;
 
     runLoader->GetEvent(iEvent);
     TTree* treeH = fLoader->TreeH();
@@ -304,7 +305,7 @@ void AliZDC::Hits2SDigits()
                      
        sector[0] = zdcHit->GetVolume(0);
        sector[1] = zdcHit->GetVolume(1);
-       if((sector[1] < 1) || (sector[1] > 4)) {
+       if((sector[1] < 1) || (sector[1] > 5)) {
          Error("Hits2SDigits", "sector[0] = %d, sector[1] = %d", 
                sector[0], sector[1]);
          continue;
@@ -312,16 +313,26 @@ void AliZDC::Hits2SDigits()
        Float_t lightQ = zdcHit->GetLightPMQ();
        Float_t lightC = zdcHit->GetLightPMC();
      
-       if(sector[0] == 1) {          //ZN 
-         pmCZN += lightC;
-         pmQZN[sector[1]-1] += lightQ;
-       } else if(sector[0] == 2) {   //ZP 
-         pmCZP += lightC;
-         pmQZP[sector[1]-1] += lightQ;
-       } else if(sector[0] == 3) {   //ZEM 
+       if(sector[0] == 1) { //ZNC 
+         pmCZNC += lightC;
+         pmQZNC[sector[1]-1] += lightQ;
+       } 
+       else if(sector[0] == 2) { //ZPC 
+         pmCZPC += lightC;
+         pmQZPC[sector[1]-1] += lightQ;
+       } 
+       else if(sector[0] == 3) { //ZEM 
          if(sector[1] == 1) pmZEM1 += lightC;
-         else                pmZEM2 += lightQ;
+         else pmZEM2 += lightQ;
        }
+       if(sector[0] == 4) { //ZNA 
+         pmCZNA += lightC;
+         pmQZNA[sector[1]-1] += lightQ;
+       } 
+       else if(sector[0] == 5) { //ZPA 
+         pmCZPA += lightC;
+         pmQZPA[sector[1]-1] += lightQ;
+       } 
       }//Hits loop
     }
 
@@ -331,26 +342,26 @@ void AliZDC::Hits2SDigits()
     const Int_t kBufferSize = 4000;
     treeS->Branch(GetName(), "AliZDCSDigit", &psdigit, kBufferSize);
 
-    // Create sdigits for ZN1
-    sector[0] = 1; // Detector = ZN1
+    // Create sdigits for ZNC
+    sector[0] = 1; // Detector = ZNC
     sector[1] = 0; // Common PM ADC
-    new(psdigit) AliZDCSDigit(sector, pmCZN);
-    if(pmCZN > 0) treeS->Fill();
+    new(psdigit) AliZDCSDigit(sector, pmCZNC);
+    if(pmCZNC > 0) treeS->Fill();
     for(Int_t j = 0; j < 4; j++) {
       sector[1] = j+1; // Towers PM ADCs
-      new(psdigit) AliZDCSDigit(sector, pmQZN[j]);
-      if(pmQZN[j] > 0) treeS->Fill();
+      new(psdigit) AliZDCSDigit(sector, pmQZNC[j]);
+      if(pmQZNC[j] > 0) treeS->Fill();
     }
   
-    // Create sdigits for ZP1
-    sector[0] = 2; // Detector = ZP1
+    // Create sdigits for ZPC
+    sector[0] = 2; // Detector = ZPC
     sector[1] = 0; // Common PM ADC
-    new(psdigit) AliZDCSDigit(sector, pmCZP);
-    if(pmCZP > 0) treeS->Fill();
+    new(psdigit) AliZDCSDigit(sector, pmCZPC);
+    if(pmCZPC > 0) treeS->Fill();
     for(Int_t j = 0; j < 4; j++) {
       sector[1] = j+1; // Towers PM ADCs
-      new(psdigit) AliZDCSDigit(sector, pmQZP[j]);
-      if(pmQZP[j] > 0) treeS->Fill();
+      new(psdigit) AliZDCSDigit(sector, pmQZPC[j]);
+      if(pmQZPC[j] > 0) treeS->Fill();
     }
 
     // Create sdigits for ZEM
@@ -362,6 +373,28 @@ void AliZDC::Hits2SDigits()
     new(psdigit) AliZDCSDigit(sector, pmZEM2);
     if(pmZEM2 > 0) treeS->Fill();
 
+    // Create sdigits for ZNA
+    sector[0] = 4; // Detector = ZNA
+    sector[1] = 0; // Common PM ADC
+    new(psdigit) AliZDCSDigit(sector, pmCZNA);
+    if(pmCZNA > 0) treeS->Fill();
+    for(Int_t j = 0; j < 4; j++) {
+      sector[1] = j+1; // Towers PM ADCs
+      new(psdigit) AliZDCSDigit(sector, pmQZNA[j]);
+      if(pmQZNA[j] > 0) treeS->Fill();
+    }
+  
+    // Create sdigits for ZPA
+    sector[0] = 5; // Detector = ZPA
+    sector[1] = 0; // Common PM ADC
+    new(psdigit) AliZDCSDigit(sector, pmCZPA);
+    if(pmCZPA > 0) treeS->Fill();
+    for(Int_t j = 0; j < 4; j++) {
+      sector[1] = j+1; // Towers PM ADCs
+      new(psdigit) AliZDCSDigit(sector, pmQZPA[j]);
+      if(pmQZPA[j] > 0) treeS->Fill();
+    }
+
     // write the output tree
     fLoader->WriteSDigits("OVERWRITE");
   }