LHAPDF veraion 5.9.1

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

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 599fb03770588e9f8a602e65a782a039a6c261d0..0e069a1b448819ae7366a79d02046c12afccf267 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -63,7 +63,12 @@ AliZDC::AliZDC() :
   fEnCalibData(0),
   fTowCalibData(0),
   fZDCCalibFName(""),
-  fSpectatorTracked(1)
+  fSpectatorTracked(1),
+  fBeamEnergy(0.),
+  fIspASystem(kFALSE),
+  fIsRELDISgen(kFALSE),
+  fOnlyZEM(kFALSE),
+  fFindMother(kFALSE)
 {
   //
   // Default constructor for the Zero Degree Calorimeter base class
@@ -80,12 +85,17 @@ AliZDC::AliZDC() :
 //_____________________________________________________________________________
 AliZDC::AliZDC(const char *name, const char *title) : 
   AliDetector(name,title),
-  fNoShower  (0),
+  fNoShower(0),
   fPedCalib(0),
   fEnCalibData(0),
   fTowCalibData(0),
   fZDCCalibFName(""),
-  fSpectatorTracked(1)
+  fSpectatorTracked(1),
+  fBeamEnergy(0.),
+  fIspASystem(kFALSE),
+  fIsRELDISgen(kFALSE),
+  fOnlyZEM(kFALSE),
+  fFindMother(kFALSE)
 {
   //
   // Standard constructor for the Zero Degree Calorimeter base class
@@ -125,7 +135,12 @@ fPedCalib(ZDC.fPedCalib),
 fEnCalibData(ZDC.fEnCalibData),
 fTowCalibData(ZDC.fTowCalibData),
 fZDCCalibFName(ZDC.fZDCCalibFName),
-fSpectatorTracked(ZDC.fSpectatorTracked)
+fSpectatorTracked(ZDC.fSpectatorTracked),
+fBeamEnergy(ZDC.fBeamEnergy),
+fIspASystem(ZDC.fIspASystem),
+fIsRELDISgen(ZDC.fIsRELDISgen),
+fOnlyZEM(ZDC.fOnlyZEM),
+fFindMother(ZDC.fFindMother)
 {
   // copy constructor
 }
@@ -140,6 +155,11 @@ AliZDC& AliZDC::operator=(const AliZDC& ZDC)
     fEnCalibData = ZDC.fEnCalibData;
     fTowCalibData = ZDC.fTowCalibData;
     fZDCCalibFName = ZDC.fZDCCalibFName;
+    fBeamEnergy = ZDC.fBeamEnergy;
+    fIspASystem = ZDC.fIspASystem;
+    fIsRELDISgen = ZDC.fIsRELDISgen;
+    fOnlyZEM = ZDC.fOnlyZEM;
+    fFindMother = ZDC.fFindMother;
   } return *this;
 }
 
@@ -149,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);
@@ -158,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){
@@ -166,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();
@@ -175,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);
@@ -184,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;
@@ -408,12 +430,14 @@ void AliZDC::Hits2SDigits()
 }
 
 //_____________________________________________________________________________
-AliDigitizer* AliZDC::CreateDigitizer(AliRunDigitizer* manager) const
-{
+AliDigitizer* AliZDC::CreateDigitizer(AliDigitizationInput* digInput) const{
   // Create the digitizer for ZDC
-  AliZDCDigitizer *zdcDigitizer = new AliZDCDigitizer(manager);
+  AliZDCDigitizer *zdcDigitizer = new AliZDCDigitizer(digInput);
   if(fSpectatorTracked==0) zdcDigitizer->SetSpectators2Track();
-  //printf("\n**************************ZDC digitizer created with Spectators2Track = %d\n\n", fSpectatorTracked);
+  if(fBeamEnergy>0.01) zdcDigitizer->SetBeamEnergy(fBeamEnergy);
+  if(fIspASystem==kTRUE) zdcDigitizer->SetpAsystem();
+  if(fIsRELDISgen==kTRUE) zdcDigitizer->SetRELDISGenerator();
+  //if(fIspASystem==kTRUE) printf("\n **** ZDC digitizer initialized for p-A collisions\n\n");
   return zdcDigitizer;
 }
 
@@ -526,7 +550,7 @@ void AliZDC::Digits2Raw()
         break;
        } 
       }
-      else if(iDigit>knADCData1+knADCData2){
+      else{
        if(digit.GetSector(0)==mapADC[k][2] && digit.GetSector(1)==mapADC[k][3]){
         lADCDataGEO = (UInt_t) mapADC[k][0];
         lADCDataChannel = (UInt_t) mapADC[k][1];
@@ -535,12 +559,12 @@ void AliZDC::Digits2Raw()
       }
     }
     // Ch. debug
-    //printf(" det %d sec %d -> lADCDataGEO %d  lADCDataChannel %d\n",
-    // digit.GetSector(0),digit.GetSector(1),lADCDataGEO,lADCDataChannel);
+    //printf("iDigit %d det %d sec %d -> lADCDataGEO %d  lADCDataChannel %d\n",
+    // iDigit,digit.GetSector(0),digit.GetSector(1),lADCDataGEO,lADCDataChannel);
      
     if(lADCDataGEO==0){ 
-      if(indADC0>knADCData1){
-        AliError(" Problem with digit index 4 ADC0\n");
+      if(indADC0>=knADCData1){
+        AliWarning(Form(" Problem with digit index %d for ADC0\n", indADC0));
        return;
       }
       Int_t indLG = indADC0+knADCData1;
@@ -551,19 +575,18 @@ void AliZDC::Digits2Raw()
                    lADCDataOvFlwHG << 12 | (lADCDataValue1[indADC0] & 0xfff); 
       // Low gain ADC ch.
       if(digit.GetADCValue(1) > 2047) lADCDataOvFlwLG = 1; 
-      lADCDataValue1[indLG-1] = digit.GetADCValue(1); 
+      lADCDataValue1[indLG] = digit.GetADCValue(1); 
       lADCData1[indLG] = lADCDataGEO << 27 |  lADCDataChannel << 17 | 0x1 << 16 |
                    lADCDataOvFlwLG << 12 | (lADCDataValue1[indLG] & 0xfff);  
+      // Ch. debug
+      //printf(" lADCDataGEO %d  ADCdataHG[%d] %d  ADCdataLG[%d] %d\n", 
+      //  lADCDataGEO,indADC0,lADCDataValue1[indADC0],indLG,lADCDataValue1[indLG]);
                    
       indADC0++;
-      //
-      // Ch. debug
-      //printf(" lADCDataGEO %d lADCDataValue1[%d] = %d  lADCDataValue1[%d] = %d\n", 
-      //  lADCDataGEO,iDigit,lADCDataValue1[indLG],indLG,lADCDataValue1[indLG]);
     }
     else if(lADCDataGEO==1){ 
-      if(indADC1>knADCData2){
-         AliError(" Problem with digit index 4 ADC1\n");
+      if(indADC1>=knADCData2){
+         AliWarning(Form(" Problem with digit index %d for ADC1\n", indADC1));
         return;
       }
       Int_t indLG = indADC1+knADCData2;
@@ -577,16 +600,15 @@ void AliZDC::Digits2Raw()
       lADCDataValue2[indLG] = digit.GetADCValue(1); 
       lADCData2[indLG] = lADCDataGEO << 27 |  lADCDataChannel << 17 | 0x1 << 16 |
                    lADCDataOvFlwLG << 12 | (lADCDataValue2[indLG] & 0xfff);  
+      // Ch. debug
+      //printf(" lADCDataGEO %d  ADCdataHG[%d] %d  ADCdataLG[%d] %d\n", 
+      //  lADCDataGEO,indADC1,lADCDataValue2[indADC1],indLG,lADCDataValue2[indLG]);
                  
       indADC1++;
-      //
-      //Ch. debug
-      //printf(" lADCDataGEO %d  lADCDataValue2[%d] = %d  lADCDataValue2[%d] = %d\n", 
-      //  lADCDataGEO,indHG,lADCDataValue2[indHG],indLG,lADCDataValue2[indLG]);
     }
     else if(lADCDataGEO==2){ 
-      if(indADC2>knADCData2){
-        AliError(" Problem with digit index 4 ADC2\n");
+      if(indADC2>=knADCData3){
+        AliWarning(Form(" Problem with digit index %d for ADC2\n", indADC2));
        return;
       }
       Int_t indLG = indADC2+knADCData3;
@@ -600,16 +622,15 @@ void AliZDC::Digits2Raw()
       lADCDataValue3[indLG] = digit.GetADCValue(1); 
       lADCData3[indLG] = lADCDataGEO << 27 |  lADCDataChannel << 17 | 0x1 << 16 |
                    lADCDataOvFlwLG << 12 | (lADCDataValue3[indLG] & 0xfff);  
+      // Ch. debug
+      //printf(" lADCDataGEO %d  ADCdataHG[%d] %d  ADCdataLG[%d] %d\n", 
+      //  lADCDataGEO,indADC2,lADCDataValue3[indADC2],indLG,lADCDataValue3[indLG]);
                  
       indADC2++;
-      //
-      //Ch. debug
-      //printf(" lADCDataGEO %d   lADCDataValue3[%d] = %d  lADCDataValue3[%d] = %d\n", 
-      //  lADCDataGEO,indHG,lADCDataValue3[indHG],indLG,lADCDataValue3[indLG]);
     }
     else if(lADCDataGEO==3){ 
-      if(indADC3>knADCData3){
-         AliError(" Problem with digit index 4 ADC2\n");
+      if(indADC3>=knADCData4){
+         AliWarning(Form(" Problem with digit index %d for ADC2\n", indADC3));
         return;
       }
       Int_t indLG = indADC3+knADCData4;
@@ -623,12 +644,11 @@ void AliZDC::Digits2Raw()
       lADCDataValue4[indLG] = digit.GetADCValue(1); 
       lADCData4[indLG] = lADCDataGEO << 27 |  lADCDataChannel << 17 | 0x1 << 16 |
                    lADCDataOvFlwLG << 12 | (lADCDataValue4[indLG] & 0xfff);  
+      // Ch. debug
+      //printf(" lADCDataGEO %d  ADCdataHG[%d] %d  ADCdataLG[%d] %d\n", 
+      //  lADCDataGEO,indADC3,lADCDataValue4[indADC3],indLG,lADCDataValue4[indLG]);
                  
       indADC3++;
-      //
-      // Ch. debug
-      //printf(" lADCDataGEO %d lADCDataValue4[%d] = %d  lADCDataValue4[%d] = %d\n", 
-      //  lADCDataGEO,indHG,lADCDataValue4[indHG],indLG,lADCDataValue4[indLG]);
     }            
 
   }