Merge branch 'master_patch'

[u/mrichter/AliRoot.git] / HMPID / AliHMPIDv1.h

diff --git a/HMPID/AliHMPIDv1.h b/HMPID/AliHMPIDv1.h
index 92dc5fd6caac0115f50cde532972323c2a569716..8b46450dc8f7936f687d620c40ab4a920c9ff43b 100644 (file)
--- a/HMPID/AliHMPIDv1.h
+++ b/HMPID/AliHMPIDv1.h
@@ -3,10 +3,14 @@
 
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
-
+//.
+//HMPID class of "standard" geometry 
+//.
 #include "AliHMPID.h"             //base class 
 #include "AliHMPIDDigitizer.h"    //CreateDigitizer()
 
+class TGeoManager;
+
 class AliHMPIDv1 : public AliHMPID //TObject-TNamed-AliModule-AliDetector-AliHMPID-AliHMPIDv0
 {
 public:
@@ -17,16 +21,17 @@ public:
           void    AddAlignableVolumes(                               )const;                                   //from AliModule invoked from AliMC    
           void    CreateMaterials  (                                 );                                        //from AliModule invoked from AliMC
           void    CreateGeometry   (                                 );                                        //from AliModule invoked from AliMC
-  AliDigitizer*   CreateDigitizer  (AliRunDigitizer *m               )const{return new AliHMPIDDigitizer(m);}   //from AliModule invoked from AliSimulation::RunDigitization()
+  AliDigitizer*   CreateDigitizer  (AliDigitizationInput *m               )const{return new AliHMPIDDigitizer(m);}  //from AliModule invoked from AliSimulation::RunDigitization()
           void    Digits2Raw       (                                 );                                        //from AliModule invoked from AliSimulation::WriteRawFiles()
+  virtual void    DefineOpticalProperties();                                                                   //from AliModule invoked from AliMC::ConstructOpGeometry() to set Cerenkov properties
           void    Hits2SDigits     (                                 );                                        //from AliModule invoked from AliSimulation::RunSDigitization()
           void    Init             (                                 );                                        //from AliModule invoked from AliMC::InitGeometry()
           Int_t   IsVersion        (                                 )const{return 1;                      }   //from AliModule not used
           void    Print            (const Option_t *opt=""           )const;                                   //from TObject
-          Bool_t  Raw2SDigits      (AliRawReader *                   );                                        //from AliMOdule invoked from AliSimulation  
+          Bool_t  Raw2SDigits      (AliRawReader *pRR                );                                        //from AliMOdule invoked from AliSimulation  
           void    StepManager      (                                 );                                        //from AliModule invoked from AliMC::Stepping()
 //private part++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
-          void    GenFee           (Int_t iCh,Float_t eloss=0        );                                        //generates feedback photons; eloss=0 for photon
+          void    GenFee           (Float_t qtot                     );                                        //generates feedback photons
   static  Float_t Fresnel          (Float_t geV,Float_t p, Bool_t pl );                                        //deals with Fresnel absorption on PC          
   static  void    Hit2Sdi          (TClonesArray *pH,TClonesArray *pS); 
           Bool_t  IsLostByFresnel  (                                 );                                        //checks if the photon lost on Fresnel reflection  
@@ -39,6 +44,4 @@ protected:
   ClassDef(AliHMPIDv1,2)                                                                //HMPID full version for simulation
 };
 
-typedef AliHMPIDv1 AliRICHv1; // for backward compatibility
-               
 #endif