X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOS.h;h=c4c22d7edc813f11a32310780312c2772e0c85c0;hb=d7de4a679fae05e769ee7a8a7f02c28aab15cba2;hp=bd4e93dc5087563265d35e0027099237d247de85;hpb=ffcecca693784f7843f4457d4b9316dbd29489cb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h
index bd4e93dc508..c4c22d7edc8 100644
--- a/PHOS/AliPHOS.h
+++ b/PHOS/AliPHOS.h
@@ -7,6 +7,18 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.64  2005/11/03 13:09:19  hristov
+ * Removing meaningless const declarations (linuxicc)
+ *
+ * Revision 1.63  2005/07/26 13:32:39  kharlov
+ * Restoring raw data fit from version of 29-Aug-2004
+ *
+ * Revision 1.62  2005/07/06 10:10:32  hristov
+ * Moving the functions used to initialize TF1 and TF2 to the pivate part of the class
+ *
+ * Revision 1.61  2005/05/28 12:10:07  schutz
+ * Copy constructor is corrected (by T.P.)
+ *
  */
 
 
@@ -27,6 +39,7 @@ class TRandom ;
 #include "AliDetector.h" 
 #include "AliLog.h"
 #include "AliPHOSGeometry.h" 
+class AliPHOSAlignData;
 
 class AliPHOS : public AliDetector {
 
@@ -53,6 +66,8 @@ public:
   virtual void  FinishRun() {;}
   virtual AliPHOSGeometry * GetGeometry() const 
   {return AliPHOSGeometry::GetInstance(GetTitle(),"") ;  }
+  virtual AliPHOSGeometry * GetGeometry(AliPHOSAlignData *alignda) const 
+  {return AliPHOSGeometry::GetInstance(GetTitle(),"",alignda) ;  }
   virtual void    Hits2SDigits();
   virtual Int_t   IsVersion(void) const = 0 ;  
   // Raw Read Out
@@ -68,8 +83,9 @@ public:
   Double_t GetRawFormatTimeMax() const { return fgTimeMax ; }   
   Double_t GetRawFormatTimePeak() const { return fgTimePeak ; }    
   Double_t GetRawFormatTimeTrigger() const { return fgTimeTrigger ; }   
-  static Double_t RawResponseFunction(Double_t *x, Double_t *par) ; 
   static Double_t RawResponseFunctionMax(Double_t charge, Double_t gain) ;
+  static Double_t RawResponseFunction(Double_t *x, Double_t *par) ; 
+  Bool_t   RawSampledResponse(Double_t dtime, Double_t damp, Int_t * adcH, Int_t * adcL) const ; 
   //
   virtual AliLoader* MakeLoader(const char* topfoldername);
   virtual void    SetTreeAddress();   
@@ -80,7 +96,6 @@ public:
 
 protected:
 
-  Bool_t   RawSampledResponse(const Double_t dtime, const Double_t damp, Int_t * adcH, Int_t * adcL) const ; 
   
   
   static Double_t fgCapa ;              // capacitor of the preamplifier for the raw RO signal