Code review

[u/mrichter/AliRoot.git] / ZDC / AliZDCv1.h

diff --git a/ZDC/AliZDCv1.h b/ZDC/AliZDCv1.h
index ea3d9dc6158963d2d4aae084b8c0a865b6d63a48..9f199d19dbdbfe84b4c78743bb395464758a6472 100644 (file)
--- a/ZDC/AliZDCv1.h
+++ b/ZDC/AliZDCv1.h
@@ -23,41 +23,28 @@ public:
   virtual void  CreateZDC();
   virtual void  CreateMaterials();
   Int_t         Digitize(Int_t Det, Int_t Quad, Int_t Light);
   virtual void  CreateZDC();
   virtual void  CreateMaterials();
   Int_t         Digitize(Int_t Det, Int_t Quad, Int_t Light);

-  virtual void  FinishEvent();
-  virtual void  MakeBranch(Option_t* opt);
+  virtual void  SDigits2Digits();
+  virtual void  MakeBranch(Option_t* opt, char *file=0);

   virtual Int_t IsVersion() const {return 1;}
   virtual void  DrawModule();
   virtual void  Init();
   virtual void  InitTables();
   virtual Int_t IsVersion() const {return 1;}
   virtual void  DrawModule();
   virtual void  Init();
   virtual void  InitTables();

+  virtual void  Hits2Digits(Int_t ntracks = 0);

   virtual void  StepManager();
   
   virtual void  StepManager();
   

-  // Switching off the shower development in ZDCs
-  void  NoShower(){fNoShower=1;}
-  void  Shower()  {fNoShower=0;}
-  
-  // Digitization parameters setters and getters
-
-  // ADC pedestal mean value
-  void SetPedMean(Int_t Det, Int_t PMDet, Int_t PedMean)
-       {fPedMean[Det][PMDet] = PedMean;}
-  Float_t GetPedMean(Int_t Det, Int_t PMDet)
-       {return fPedMean[Det][PMDet];} 
-  // ADC pedestal width
-  void SetPedSigma(Int_t Det, Int_t PMDet, Int_t PedSigma)
-       {fPedSigma[Det][PMDet] = PedSigma;}
-  Float_t GetPedSigma(Int_t Det, Int_t PMDet)
-       {return fPedSigma[Det][PMDet];}
-  // PM gain
-  void SetPMGain(Int_t Det, Int_t PMDet, Int_t PMGain)
-       {fPMGain[Det][PMDet] = PMGain;}
-  Float_t GetPMGain(Int_t Det, Int_t PMDet)
-       {return fPMGain[Det][PMDet];}
-  // Conversion factor from charge to ADC channels
-  //   F = 1.6E-19 / Resolution [Coulomb/ch]
-  void SetADCRes(Int_t ADCRes) {fADCRes =  ADCRes;}
-  Float_t GetADCRes() {return fADCRes;}
+//  // Digitization parameters setters and getters
+//  // PM gain
+//  void SetPMGain(Int_t Det, Int_t PMDet, Int_t PMGain)
+//       {fPMGain[Det][PMDet] = PMGain;}
+//  Float_t GetPMGain(Int_t Det, Int_t PMDet)
+//       {return fPMGain[Det][PMDet];}
+//  // Conversion factor from charge to ADC channels
+//  //   F = 1.6E-19 / Resolution [Coulomb/ch]
+//  void SetADCRes(Int_t ADCRes) {fADCRes =  ADCRes;}
+//  Float_t GetADCRes() {return fADCRes;}

  
 protected:
  
 protected:

+

   // Sensitive media
   Int_t   fMedSensF1;         // Sensitive medium F1
   Int_t   fMedSensF2;         // Sensitive medium F2
   // Sensitive media
   Int_t   fMedSensF1;         // Sensitive medium F1
   Int_t   fMedSensF2;         // Sensitive medium F2


@@ -68,22 +55,30 @@ protected:
   Int_t   fMedSensPI;         // Beam pipe and magnet coils
   
   // Parameters for light tables
   Int_t   fMedSensPI;         // Beam pipe and magnet coils
   
   // Parameters for light tables

-  Int_t   fNalfan;            // Number of Alfa neutrons
-  Int_t   fNalfap;            // Number of Alfa protons
-  Int_t   fNben;              // Number of beta neutrons
-  Int_t   fNbep;              // Number of beta protons
+  Int_t   fNalfan;           // Number of Alfa (neutrons)
+  Int_t   fNalfap;           // Number of Alfa (protons)
+  Int_t   fNben;             // Number of beta (neutrons)
+  Int_t   fNbep;             // Number of beta (protons)

   Float_t fTablen[4][90][18]; // Neutrons light table
   Float_t fTablep[4][90][28]; // Protons light table
   Float_t fTablen[4][90][18]; // Neutrons light table
   Float_t fTablep[4][90][28]; // Protons light table

-  
-  // Parameters for conversion of light yield in ADC channels
-  Float_t fPedMean[3][5];     // ADC pedestal mean value
-  Float_t fPedSigma[3][5];    // ADC pedestal width
-  Float_t fPMGain[3][5];      // PM gain
-  Float_t fADCRes;            // ADC conversion factor

 
 

-public:
-  //Flag for fast simulation (no shower)
-  Int_t   fNoShower;
+  // Parameters for hadronic calorimeters geometry
+  // NB -> parameters used in CreateZDC() and in StepManager()
+  // (other parameters are defined in CreateZDC())
+  Float_t fDimZP[3];   // Dimensions of proton detector
+  Float_t fPosZN[3];           // Position of neutron detector
+  Float_t fPosZP[3];   // Position of proton detector
+  Float_t fFibZN[3];   // Fibers for neutron detector
+  Float_t fFibZP[3];   // Fibers for proton detector
+
+  // Parameters for EM calorimeter geometry
+  // NB -> parameters used in CreateZDC() and in StepManager()
+  // (other parameters are defined in CreateZDC())
+  Float_t fPosZEM[3]; // Position of EM detector
+  
+//  // Parameters for conversion of light yield in ADC channels
+//  Float_t fPMGain[3][5];      // PM gain
+//  Float_t fADCRes;            // ADC conversion factor

   
    ClassDef(AliZDCv1,1)  // Zero Degree Calorimeter version 1
 }; 
   
    ClassDef(AliZDCv1,1)  // Zero Degree Calorimeter version 1
 };