X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDC.h;h=0bd95122e0ae2a293c3e4e5b03e2b1567bbecf9b;hb=5b88d60efd39cc1f13a1c64c5a0ac4d4ae3c12bd;hp=05b3183df7d69b25a228b0cef97e5367d8645180;hpb=a18a05439ac9df2f287d6b30e3381327b23d7761;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 05b3183df7d..0bd95122e0a 100644
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -13,9 +13,11 @@
 
 #include "AliDetector.h"
 #include "AliZDCTrigger.h"
+#include "AliZDCChMap.h"
 
 class AliZDCPedestals;
-class AliZDCCalib;
+class AliZDCEnCalib;
+class AliZDCTowCalib;
  
 class AliZDC : public AliDetector {
 
@@ -34,7 +36,7 @@ public:
   virtual void  SetTreeAddress();
   virtual void  MakeBranch(Option_t* opt);
   virtual void  Hits2SDigits();
-  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
+  virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const;
   virtual void  Digits2Raw();
   virtual Bool_t Raw2SDigits(AliRawReader* rawReader);
   Int_t   Pedestal(Int_t Detector, Int_t Quadrant, Int_t Res) const;
@@ -44,13 +46,36 @@ public:
   // Switching off the shower development in ZDCs
   void  NoShower(){fNoShower=1;}
   void  Shower()  {fNoShower=0;}
-
+  
+  virtual void SetVCollSideCAperture(Float_t /*aperture*/) {}
+  virtual void SetVCollSideCApertureNeg(Float_t /*aperture*/) {}
+  virtual void SetVCollSideCCentre(Float_t /*centre*/) {}
+  
+  virtual void SetVCollSideAAperture(Float_t /*aperture*/) {}
+  virtual void SetVCollSideAApertureNeg(Float_t /*aperture*/) {}
+  virtual void SetVCollSideACentre(Float_t /*centre*/) {}
+  
+  virtual void SetTCDDAperturePos(Float_t /*aperture*/) {}
+  virtual void SetTCDDApertureNeg(Float_t /*aperture*/) {}
+  
+  virtual void SetTDIAperturePos(Float_t /*aperture*/) {}
+  virtual void SetTDIApertureNeg(Float_t /*aperture*/) {}
+  
+  virtual void SetLumiLength(Float_t /*length*/) {}
+  
+  virtual void SetYZNC(Float_t /*yZNC*/) {}
+  virtual void SetYZNA(Float_t /*yZNA*/) {}
+  virtual void SetYZPC(Float_t /*yZPC*/) {}
+  virtual void SetYZPA(Float_t /*yZPA*/) {}
 
   //Calibration methods 
   void    SetZDCCalibFName(const char *name);
   char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
   AliZDCPedestals* GetPedCalib()   const  {return fPedCalib;}
-  AliZDCCalib*     GetECalibData() const  {return fCalibData;}
+  AliZDCEnCalib*   GetECalibData() const  {return fEnCalibData;}
+  
+  // Map from OCDB
+  AliZDCChMap*     GetChMap() const;
 
   // Trigger
   virtual AliTriggerDetector* CreateTriggerDetector() const
@@ -58,7 +83,10 @@ public:
 
   
   void  SetSpectatorsTrack() {fSpectatorTracked=0;}
-  Int_t const SpectatorsTracked() {return fSpectatorTracked;}
+  Int_t SpectatorsTracked() const {return fSpectatorTracked;}
+  void  SetBeamEnergy(Float_t beamEnergy) {fBeamEnergy = beamEnergy;}
+  void  SetpAsystem() {fIspASystem = kTRUE;}
+  void  SetRELDISGenerator() {fIsRELDISgen = kTRUE;}
 
 private:
 
@@ -69,14 +97,18 @@ protected:
   Int_t        fNoShower;		// Flag to switch off the shower	
 
   //Calibration data member 
-  AliZDCPedestals* fPedCalib;		// Pedestal data for ZDC
-  AliZDCCalib*     fCalibData;		// Energy and equalization data for ZDC
+  AliZDCPedestals* fPedCalib;		//! Pedestal data for ZDC
+  AliZDCEnCalib*   fEnCalibData;	//! Energy data for ZDC
+  AliZDCTowCalib*  fTowCalibData;	//! Equalization data for ZDC
 
   TString          fZDCCalibFName; 	// Name of the ZDC calibration data
  
-  Int_t fSpectatorTracked; // Are spectator tracked by generator?
+  Int_t   fSpectatorTracked; // Are spectator tracked by generator? 0=NO
+  Float_t fBeamEnergy;	     // beam energy from generator (AliGenZDC + RELDIS)
+  Bool_t  fIspASystem;       // Configuring pA collisions (MC only)
+  Bool_t  fIsRELDISgen;	     // Is RELDIS used as generator
   
-  ClassDef(AliZDC,8)  	// Zero Degree Calorimeter base class
+  ClassDef(AliZDC,12)  	// Zero Degree Calorimeter base class
 };
  
 // Calibration