X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=EMCAL%2FAliEMCALQADataMakerRec.h;h=517805ccd2cad30b8cfaeb865349886342d0187e;hp=4ad1272325c1efe2988ed30bafb03bf3767d204b;hb=571d8329f83121a29e7e706a97c164dc70d4af70;hpb=38986b788d98cd6005062b32f255ba5d01eb4a07

diff --git a/EMCAL/AliEMCALQADataMakerRec.h b/EMCAL/AliEMCALQADataMakerRec.h
index 4ad1272325c..517805ccd2c 100644
--- a/EMCAL/AliEMCALQADataMakerRec.h
+++ b/EMCAL/AliEMCALQADataMakerRec.h
@@ -1,5 +1,5 @@
-#ifndef ALIEMCALQADataMakerRec_H
-#define ALIEMCALQADataMakerRec_H
+#ifndef ALIEMCALQADATAMAKERREC_H
+#define ALIEMCALQADATAMAKERREC_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -36,8 +36,9 @@ class TObjArray ;
 // --- AliRoot header files ---
 #include "AliQADataMakerRec.h"
 class AliCaloRawAnalyzer;
-class AliCaloRawAnalyzerLMS;
-class AliEMCALGeoParams;
+class AliCaloRawAnalyzerKStandard;
+//class AliEMCALGeoParams;
+class AliEMCALGeometry;
 
 class AliEMCALQADataMakerRec: public AliQADataMakerRec {
 
@@ -46,18 +47,21 @@ public:
   enum HRawType_t { 
     // first normal Low Gain and High Gain info
     kNsmodLG,kNsmodHG,kTimeLG,kTimeHG,
-    kSigLG,kSigHG,kNtotLG,kNtotHG,kTowerHG,kTowerLG,
+    kNtotLG,kNtotHG,kSigHG,kSigLG,
     kPedLG,kPedHG,
     k2DRatioAmp,kRatioDist, kLEDMonRatio, kLEDMonRatioDist,
     // then TRU info
-    kNsmodTRU,kTimeTRU,
+    kNsmodTRU,
     kSigTRU,kNtotTRU,
-    kPedTRU,
     kNL0TRU, kTimeL0TRU,
+		kNL0FirstTRU, kTimeL0FirstTRU,
     // and also LED Mon info
     kNsmodLGLEDMon,kNsmodHGLEDMon,kTimeLGLEDMon,kTimeHGLEDMon,
     kSigLGLEDMon,kSigHGLEDMon,kNtotLGLEDMon,kNtotHGLEDMon,
-    kPedLGLEDMon,kPedHGLEDMon
+    kPedLGLEDMon,kPedHGLEDMon,
+		//and STU info
+		kAmpL1, kGL1, kJL1,
+		kGL1V0, kJL1V0, kSTUTRU  
   } ;
 
   //Histograms for RecPoints  control
@@ -78,7 +82,7 @@ public:
   Int_t GetFittingAlgorithm() const {return fFittingAlgorithm; }
   void SetFittingAlgorithm(Int_t val);
   AliCaloRawAnalyzer *GetRawAnalyzer() const { return fRawAnalyzer;}
-  AliCaloRawAnalyzerLMS *GetRawAnalyzerTRU() const { return fRawAnalyzerTRU;}
+  AliCaloRawAnalyzerKStandard *GetRawAnalyzerTRU() const { return fRawAnalyzerTRU;}
 
   void SetSuperModules(int i) {fSuperModules = i;}; //The number of SuperModules
   int GetSuperModules() const {return fSuperModules;}; //The number of SuperModules
@@ -121,6 +125,7 @@ public:
 
   virtual void   EndOfDetectorCycle(AliQAv1::TASKINDEX_t, TObjArray ** list) ;
   void           GetCalibRefFromOCDB() ;
+  void		 GetTruChannelPosition( Int_t &globRow, Int_t &globColumn, Int_t module, Int_t ddl, Int_t branch, Int_t column ) const;
   virtual void   InitESDs() ; 
   virtual void   InitDigits() ; 
   virtual void   InitRecPoints() ; 
@@ -129,15 +134,18 @@ public:
   virtual void   MakeDigits() ;
   virtual void   MakeDigits(TTree * digTree) ; 
   virtual void   MakeRecPoints(TTree * recpoTree) ; 
-  virtual void   MakeRaws(AliRawReader* rawReader) ; 
+  virtual void   MakeRaws(AliRawReader* rawReader) ;
+  virtual void	 MakeRawsSTU(AliRawReader* rawReader);
   virtual void   StartOfDetectorCycle() ; 
 
 private:
  void ConvertProfile2H(TProfile * p, TH2 * histo) ; //change the profile plot to a 2D histogram
   
-  Int_t fFittingAlgorithm;             // select the fitting algorithm
-  AliCaloRawAnalyzer *fRawAnalyzer;    // for signal fitting
-  AliCaloRawAnalyzerLMS *fRawAnalyzerTRU;    // for signal fitting, for TRU
+ Int_t fFittingAlgorithm;             // select the fitting algorithm
+
+ AliCaloRawAnalyzer *fRawAnalyzer;    // for signal fitting
+ AliCaloRawAnalyzerKStandard *fRawAnalyzerTRU;    // for signal fitting, for TRU
+ AliEMCALGeometry *fGeom; //EMCAL geometry, needed for STU decoding
 
   int fSuperModules; //The number of SuperModules activated
   int fFirstPedestalSample; // first sample for pedestal calculation, in bunch
@@ -159,7 +167,6 @@ private:
   TH2F     * fCalibRefHistoH2F ; // H2F reference histogram from LED run
   TProfile * fLEDMonRefHistoPro ; // Profile reference histogram from LED monitor
   TH2F     * fHighEmcHistoH2F ; // H2F reference histogram from LED run
-
 //  TText **    fTextSM        ; //! Text info for each SM  
 //  TLine *     fLineCol       ; //! line to distinguish the different SM side: A side and C side
 //  TLine *     fLineRow       ; //! line to distinguish the different SM sector 0 and 1 
@@ -168,4 +175,4 @@ private:
 
 };
 
-#endif // AliEMCALQADataMakerRec_H
+#endif // AliEMCALQADATAMAKERREC_H