X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCAL.h;h=6e3c9479a438dff19b64de185ec943f68403268f;hb=9f9402f092c373a967b02c711a79941c259a184f;hp=34d87d654302a36878f9527bd3babc1762d7bcc5;hpb=0a4cb1316ac4123f90733ce944383bbc785c4a14;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
index 34d87d65430..6e3c9479a43 100644
--- a/EMCAL/AliEMCAL.h
+++ b/EMCAL/AliEMCAL.h
@@ -4,18 +4,33 @@
  * See cxx source for full Copyright notice     */
 
 /* $Id$ */
-
+/* History of cvs commits:
+ *
+ * $Log$
+ * Revision 1.43  2007/03/10 22:19:01  pavlinov
+ * move one varibels from AliEMCALv2 to AliEMCAL
+ *
+ * Revision 1.42  2007/02/24 20:42:35  pavlinov
+ * fixed error of Geant3 parameters initialisation
+ *
+ * Revision 1.41  2007/02/05 10:43:25  hristov
+ * Changes for correct initialization of Geant4 (Mihaela)
+ *
+ * Revision 1.40  2006/12/05 17:19:26  gustavo
+ * Updated AliEMCAL::Digits2Raw, reads first provisional RCU mapping files to make Raw data with new AliCaloAltroMapping and AliCaloRawStream
+ *
+ *
+ */
 //_________________________________________________________________________
 //  Base Class for EMCAL     
 //  holds all geant information of
 //  materials, etc.
 //                  
-//*-- Author: Yves Schutz (SUBATECH)
+//*-- Author: Yves Schutz (SUBATECH) 
 
 // --- ROOT system ---
 
 class TString ;
-class TTask ;
 class TFolder ;
 class TRandom ; 
 class TGraph;
@@ -26,88 +41,63 @@ class AliRawReader;
 #include "AliDetector.h"
 #include "AliEMCALGeometry.h" 
 #include "AliEMCALTrigger.h" 
+class AliEMCALRawUtils;
+#include "AliReconstructor.h"
+class AliEMCALTriggerData;
 
 class AliEMCAL : public AliDetector {
 
  public:
   
   AliEMCAL(); 
-  AliEMCAL(const char* name, const char* title="");
-  AliEMCAL(const AliEMCAL& emcal);
+  AliEMCAL(const char* name, const char* title="", const Bool_t checkGeoAndRun = kTRUE);
 
   virtual ~AliEMCAL() ; 
   virtual void   AddHit(Int_t, Int_t*, Float_t *) {
     Fatal("AddHit(Int_t, Int_t*, Float_t *", "not to be used: use AddHit( Int_t shunt, Int_t primary, Int_t track,Int_t id, Float_t *hits )") ;  
   }
-  virtual void  Copy(TObject & emcal) const 
-    { Copy(dynamic_cast<AliEMCAL&>(emcal)); }
-  virtual void  Copy(AliEMCAL & emcal) const; 
-  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
+  virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const;
   virtual void  CreateMaterials() ;   
-  //  virtual void  
+  virtual void  Init() ;   
   virtual void  Digits2Raw();
   
-  using AliDetector::Raw2Digits;
-  virtual void  Raw2Digits(AliRawReader *reader);
-  
   virtual void  FinishRun() {}                  
-  virtual AliEMCALGeometry * GetGeometry() const 
-    {return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  }   
+  virtual AliEMCALGeometry * GetGeometry() const ;
+   // {return AliEMCALGeometry::GetInstance(GetTitle(),"") ;  }   
   virtual void    Hits2SDigits();
   virtual Int_t   IsVersion(void) const = 0 ;   
   
   virtual AliTriggerDetector* CreateTriggerDetector() const 
     { return new AliEMCALTrigger(); }
 
-  // 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 ; }  
-  Int_t GetRawFormatOrder() const { return fgOrder ; }   
-  Int_t GetRawFormatTimeBins() const { return fgkTimeBins ; }    
-  Double_t GetRawFormatTimeMax() const { return fgTimeMax ; }   
-  Double_t GetRawFormatTimePeak() const { return fgTimePeak ; }    
-  Double_t GetRawFormatTimeTrigger() const { return fgTimeTrigger ; }
-  Int_t GetRawFormatThreshold() const { return fgThreshold ; }       
-  Int_t GetRawFormatChannelsPerDDL() const { return fgChannelsPerDDL ; }       
-  static Double_t RawResponseFunctionMax(Double_t charge, Double_t gain) ;
-  Bool_t   RawSampledResponse(Double_t dtime, Double_t damp, Int_t * adcH, Int_t * adcL) const ; 
-  //  
+   //  
   virtual AliLoader* MakeLoader(const char* topfoldername);
   virtual const TString Version() const {return TString(" ") ; }   
-  AliEMCAL & operator = (const AliEMCAL & /*rvalue*/)  {
-    Fatal("operator =", "not implemented") ;  return *this ; }
 
-protected:
-  
-  static Double_t RawResponseFunction(Double_t *x, Double_t *par) ; 
-  void FitRaw(Bool_t lowGainFlag, TGraph * gLowGain, TGraph * gHighGain, TF1* signalF, Double_t & energy, Double_t & time) ;
+  virtual void  SetCheckRunNumberAndGeoVersion(Bool_t check) { fCheckRunNumberAndGeoVersion = check ; }
 
-  void Init(void);  //initializes some params
+  Bool_t Raw2SDigits(AliRawReader* rawReader);
+  
+protected:
+  void InitConstants();  //initializes some params
 
-  Int_t fBirkC0;    // constants for Birk's Law implementation
+  Int_t    fBirkC0; // constants for Birk's Law implementation
   Double_t fBirkC1; // constants for Birk's Law implementation
   Double_t fBirkC2; // constants for Birk's Law implementation
 
-  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 Int_t fgOrder ;                // order of the gamma function for the RO signal
-  static const Int_t fgkTimeBins = 256 ; // 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 
-  static Int_t fgThreshold;             // threshold
-  static Int_t fgChannelsPerDDL;        // number of channels per DDL
+  AliEMCALGeometry* fGeometry;              //!
+  Bool_t   fCheckRunNumberAndGeoVersion;    // Check if run number corresponds to the requested geometry and V1 is used
+  
+  //For embedding
+  static AliEMCALRawUtils    * fgRawUtils;        // raw utilities class, for embedding 
+  AliEMCALTriggerData        * fTriggerData;      // Trigger parameters data container
+
+private:
+  AliEMCAL(const AliEMCAL& emcal);
+  AliEMCAL & operator = (const AliEMCAL & /*rvalue*/);
 
-  ClassDef(AliEMCAL,9) // Electromagnetic calorimeter (base class)
+  ClassDef(AliEMCAL,12) // Electromagnetic calorimeter (base class)
     
-    } ;
+} ;
 
 #endif // ALIEMCAL_H