Logics of high gain adding to digits has changed

[u/mrichter/AliRoot.git] / PHOS / AliPHOS.h

diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h
index 33b1c79e37127941b52ac975ba664742e90ab477..aa394d8eeb47d3d1427762735352fcf51bf08a7d 100644 (file)
--- a/PHOS/AliPHOS.h
+++ b/PHOS/AliPHOS.h
@@ -7,6 +7,12 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.68  2006/08/11 12:36:25  cvetan
+ * Update of the PHOS code needed in order to read and reconstruct the beam test raw data (i.e. without an existing galice.root)
+ *
+ * Revision 1.67  2006/04/07 08:42:00  hristov
+ * Follow AliAlignObj framework and remove AliPHOSAlignData (Yu.Kharlov)
+ *
  * Revision 1.66  2006/03/24 21:39:33  schutz
  * Modification needed to include PHOS in the global trigger framework
  *
@@ -53,10 +59,6 @@ public:
 
   AliPHOS() ;
   AliPHOS(const char* name, const char* title="") ;  
-  AliPHOS(AliPHOS & phos) : AliDetector(phos) {
-    //Copy(*this) ; 
-    phos.Copy(*this);
-  }
   virtual ~AliPHOS() ; 
   virtual void   AddHit(Int_t, Int_t*, Float_t *) {
     // do not use this definition but the one below
@@ -65,7 +67,6 @@ public:
   }
   virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, 
                         Int_t id, Float_t *hits ) = 0 ;   
-  virtual void Copy(TObject &phos)const; 
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
   virtual void  CreateMaterials() ;            
   virtual void  Digits2Raw();
@@ -81,14 +82,13 @@ public:
 
   // Raw Read Out
   Double_t GetRawFormatCapa() const { return fgCapa ; }   
-  Double_t GetRawFormatHighCharge() const { return fHighCharge ; }  
-  Double_t GetRawFormatHighGain() const { return fHighGain ; }  
-  Double_t GetRawFormatHighLowGainFactor() const { return fHighLowGainFactor ; }  
-  Double_t GetRawFormatLowCharge() const { return ( fHighCharge *  fHighLowGainFactor ) ; }  
-  Double_t GetRawFormatLowGain() const { return ( fHighGain / fHighLowGainFactor ) ; }  
-  Int_t GetRawFormatLowGainOffset() const { return fLowGainOffset ; }  
+  static Double_t GetRawFormatHighCharge() { return fgHighCharge ; }  
+  static Double_t GetRawFormatHighGain() { return fgHighGain ; }  
+  static Double_t GetRawFormatHighLowGainFactor() { return fgHighLowGainFactor ; }  
+  static Double_t GetRawFormatLowCharge() { return ( fgHighCharge *  fgHighLowGainFactor ) ; }  
+  static Double_t GetRawFormatLowGain() { return ( fgHighGain / fgHighLowGainFactor ) ; }  
   Int_t GetRawFormatOrder() const { return fgOrder ; }   
-  Int_t GetRawFormatTimeBins() const { return fkTimeBins ; }    
+  static Int_t GetRawFormatTimeBins() { return fkTimeBins ; }    
   Double_t GetRawFormatTimeMax() const { return fgTimeMax ; }   
   Double_t GetRawFormatTimePeak() const { return fgTimePeak ; }    
   Double_t GetRawFormatTimeTrigger() const { return fgTimeTrigger ; }   
@@ -99,8 +99,6 @@ public:
   virtual AliLoader* MakeLoader(const char* topfoldername);
   virtual void    SetTreeAddress();   
   virtual const TString Version() const {return TString(" ") ; } 
-  AliPHOS & operator = (const AliPHOS & /*rvalue*/)  {
-    Fatal("operator =", "not implemented") ; return *this ; }
 
 
 protected:
@@ -108,18 +106,21 @@ protected:
   
   
   static Double_t fgCapa ;              // capacitor of the preamplifier for the raw RO signal
-  Double_t fHighCharge ;                // high charge (to convert energy to charge) for the raw RO signal
-  Double_t fHighGain ;                  // high gain for the raw RO signal
-  Double_t fHighLowGainFactor ;         // high to low gain factor for the raw RO signal
-  Int_t    fLowGainOffset ;             // to separate high from low gain in the DDL
+  static Double_t fgHighCharge ;                // high charge (to convert energy to charge) for the raw RO signal
+  static Double_t fgHighGain ;                  // high gain for the raw RO signal
+  static Double_t fgHighLowGainFactor ;         // high to low gain factor for the raw RO signal
   static Int_t fgOrder ;                // order of the gamma function for the RO signal
 //   static const Int_t fkTimeBins = 256 ; // number of sampling bins of the raw RO signal  
   static const Int_t fkTimeBins = 64 ; // number of sampling bins of the raw RO signal  
   static Double_t fgTimeMax ;           // maximum sampled time of the raw RO signal                             
   static Double_t fgTimePeak ;          // peaking time of the raw RO signal                                    
   static Double_t fgTimeTrigger ;       // time of the trigger for the RO signal 
-                                        
-  ClassDef(AliPHOS,5) // Photon Spectrometer Detector (base class)
+
+ private:                                        
+  AliPHOS(AliPHOS & phos);
+  AliPHOS & operator = (const AliPHOS & /*rvalue*/);
+
+  ClassDef(AliPHOS,6) // Photon Spectrometer Detector (base class)
 } ;
 
 #endif // ALIPHOS_H