ATO-97, ATO-78 - speed-up creation of the AliTPCCalPad objects from TTree

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

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 73e2c4a5dc5203c42608e662d733bcc7822bc90f..4a497b446e0a5ab92e6362c0ae47a60695fcac42 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -66,7 +66,9 @@ AliZDC::AliZDC() :
   fSpectatorTracked(1),
   fBeamEnergy(0.),
   fIspASystem(kFALSE),
-  fIsRELDISgen(kFALSE)
+  fIsRELDISgen(kFALSE),
+  fOnlyZEM(kFALSE),
+  fFindMother(kFALSE)
 {
   //
   // Default constructor for the Zero Degree Calorimeter base class
@@ -83,7 +85,7 @@ AliZDC::AliZDC() :
 //_____________________________________________________________________________
 AliZDC::AliZDC(const char *name, const char *title) : 
   AliDetector(name,title),
-  fNoShower  (0),
+  fNoShower(0),
   fPedCalib(0),
   fEnCalibData(0),
   fTowCalibData(0),
@@ -91,7 +93,9 @@ AliZDC::AliZDC(const char *name, const char *title) :
   fSpectatorTracked(1),
   fBeamEnergy(0.),
   fIspASystem(kFALSE),
-  fIsRELDISgen(kFALSE)
+  fIsRELDISgen(kFALSE),
+  fOnlyZEM(kFALSE),
+  fFindMother(kFALSE)
 {
   //
   // Standard constructor for the Zero Degree Calorimeter base class
@@ -134,7 +138,9 @@ fZDCCalibFName(ZDC.fZDCCalibFName),
 fSpectatorTracked(ZDC.fSpectatorTracked),
 fBeamEnergy(ZDC.fBeamEnergy),
 fIspASystem(ZDC.fIspASystem),
-fIsRELDISgen(ZDC.fIsRELDISgen)
+fIsRELDISgen(ZDC.fIsRELDISgen),
+fOnlyZEM(ZDC.fOnlyZEM),
+fFindMother(ZDC.fFindMother)
 {
   // copy constructor
 }
@@ -151,6 +157,9 @@ AliZDC& AliZDC::operator=(const AliZDC& ZDC)
     fZDCCalibFName = ZDC.fZDCCalibFName;
     fBeamEnergy = ZDC.fBeamEnergy;
     fIspASystem = ZDC.fIspASystem;
+    fIsRELDISgen = ZDC.fIsRELDISgen;
+    fOnlyZEM = ZDC.fOnlyZEM;
+    fFindMother = ZDC.fFindMother;
   } return *this;
 }
 
@@ -160,8 +169,8 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   //
   //           Add a ZDC hit to the hit list.
   
-  static Float_t trackTime=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
-  static Int_t   pcPDGcode, motPDGcode;
+  static Float_t trackTime=0., trackEta=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
+  static Int_t   pcPDGcode=0, motPDGcode=0;
 
   AliZDCHit *newquad, *curprimquad;
   newquad = new AliZDCHit(fIshunt, track, vol, hits);
@@ -169,7 +178,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
-      TParticle * p = gAlice->GetMCApp()->Particle(track);
+      /*TParticle * p = gAlice->GetMCApp()->Particle(track);
       Int_t imo = p->GetFirstMother();
       //
       if(track != imo){
@@ -177,7 +186,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       }
       else if(track == imo){
         newquad->SetSFlag(0);  // PRIMARY particle entering the ZDC
-      }
+      }*/
       //  
       sFlag     = newquad->GetSFlag();
       primKinEn  = newquad->GetPrimKinEn();
@@ -186,6 +195,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       pcPDGcode         = newquad->GetPDGCode();
       motPDGcode = newquad->GetMotherPDGCode();
       trackTime  = newquad->GetTrackTOF();
+      trackEta   = newquad->GetTrackEta();
    }
    else{       
       newquad->SetPrimKinEn(primKinEn);
@@ -195,6 +205,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       newquad->SetPDGCode(pcPDGcode);
       newquad->SetMotherPDGCode(motPDGcode);
       newquad->SetTrackTOF(trackTime);
+      newquad->SetTrackEta(trackEta);
    }
  
   Int_t j;
@@ -553,7 +564,7 @@ void AliZDC::Digits2Raw()
      
     if(lADCDataGEO==0){ 
       if(indADC0>=knADCData1){
-        AliWarning(" Problem with digit index 4 ADC0\n");
+        AliWarning(Form(" Problem with digit index %d for ADC0\n", indADC0));
        return;
       }
       Int_t indLG = indADC0+knADCData1;
@@ -575,7 +586,7 @@ void AliZDC::Digits2Raw()
     }
     else if(lADCDataGEO==1){ 
       if(indADC1>=knADCData2){
-         AliWarning(" Problem with digit index 4 ADC1\n");
+         AliWarning(Form(" Problem with digit index %d for ADC1\n", indADC1));
         return;
       }
       Int_t indLG = indADC1+knADCData2;
@@ -597,7 +608,7 @@ void AliZDC::Digits2Raw()
     }
     else if(lADCDataGEO==2){ 
       if(indADC2>=knADCData3){
-        AliWarning(" Problem with digit index 4 ADC2\n");
+        AliWarning(Form(" Problem with digit index %d for ADC2\n", indADC2));
        return;
       }
       Int_t indLG = indADC2+knADCData3;
@@ -619,7 +630,7 @@ void AliZDC::Digits2Raw()
     }
     else if(lADCDataGEO==3){ 
       if(indADC3>=knADCData4){
-         AliWarning(" Problem with digit index 4 ADC2\n");
+         AliWarning(Form(" Problem with digit index %d for ADC2\n", indADC3));
         return;
       }
       Int_t indLG = indADC3+knADCData4;
@@ -763,35 +774,37 @@ Int_t AliZDC::Pedestal(Int_t Det, Int_t Quad, Int_t Res) const
   // Returns a pedestal for detector det, PM quad, channel with res.
   //
   // Getting calibration object for ZDC set
+  Float_t pedValue = 0.;
   AliCDBManager *man = AliCDBManager::Instance();
   AliCDBEntry  *entry = man->Get("ZDC/Calib/Pedestals");
+  AliZDCPedestals *calibPed = 0x0;
   if(!entry) AliFatal("No calibration data loaded!");  
-  AliZDCPedestals *calibPed = (AliZDCPedestals*) entry->GetObject();
-  //
-  if(!calibPed){
-    printf("\t No calibration object found for ZDC!");
-    return -1;
-  }
-  //
-  Int_t index=0, kNch=24;
-  if(Quad!=5){
-    if(Det==1)        index = Quad+kNch*Res;    // ZN1
-    else if(Det==2)   index = Quad+5+kNch*Res;          // ZP1
-    else if(Det==3)   index = Quad+9+kNch*Res; // ZEM
-    else if(Det==4)   index = Quad+12+kNch*Res; // ZN2
-    else if(Det==5)   index = Quad+17+kNch*Res; // ZP2
+  else{
+    calibPed = (AliZDCPedestals*) entry->GetObject();
+    //
+    if(!calibPed){
+      printf("\t No calibration object found for ZDC!");
+      return -1;
+    }
+    //
+    Int_t index=0, kNch=24;
+    if(Quad!=5){
+      if(Det==1)        index = Quad+kNch*Res;  // ZN1
+      else if(Det==2)   index = Quad+5+kNch*Res;        // ZP1
+      else if(Det==3)   index = Quad+9+kNch*Res; // ZEM
+      else if(Det==4)   index = Quad+12+kNch*Res; // ZN2
+      else if(Det==5)   index = Quad+17+kNch*Res; // ZP2
+    }
+    else index = (Det-1)/3+22+kNch*Res; // Reference PMs
+    //
+    //
+    Float_t meanPed = calibPed->GetMeanPed(index);
+    Float_t pedWidth = calibPed->GetMeanPedWidth(index);
+    pedValue = gRandom->Gaus(meanPed,pedWidth);
+    //
+    //printf("\t AliZDC::Pedestal - det(%d, %d) - Ped[%d] = %d\n",Det, Quad, index,(Int_t) pedValue); // Chiara debugging!
   }
-  else index = (Det-1)/3+22+kNch*Res; // Reference PMs
-  //
-  //
-  Float_t meanPed = calibPed->GetMeanPed(index);
-  Float_t pedWidth = calibPed->GetMeanPedWidth(index);
-  Float_t pedValue = gRandom->Gaus(meanPed,pedWidth);
-  //
-  //printf("\t AliZDC::Pedestal - det(%d, %d) - Ped[%d] = %d\n",Det, Quad, index,(Int_t) pedValue); // Chiara debugging!
   
-  
-
   return (Int_t) pedValue;
 }
 
@@ -836,12 +849,12 @@ AliZDCChMap* AliZDC::GetChMap() const
 {
 
   // Getting calibration object for ZDC
-
+  AliZDCChMap *calibdata = 0x0;
   AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/ChMap");
   if(!entry) AliFatal("No calibration data loaded!");  
-
-  AliZDCChMap *calibdata = dynamic_cast<AliZDCChMap*> (entry->GetObject());
-  if(!calibdata) AliFatal("Wrong calibration object in calibration  file!");
-
+  else{
+    calibdata = dynamic_cast<AliZDCChMap*> (entry->GetObject());
+    if(!calibdata) AliFatal("Wrong calibration object in calibration  file!");
+  }
   return calibdata;
 }