X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSTrigger.h;h=9e65e1ca4f4e80fc01623bd60a359c6eb4954455;hb=ebd00f1b5bc4a948973e94dcf6702ce8c4756496;hp=b28f21835ad0ecbbe7197033ce44c83509bfd16d;hpb=72295f6f13be7da62d2214ac7bc099fd91cb04cd;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSTrigger.h b/PHOS/AliPHOSTrigger.h
index b28f21835ad..9e65e1ca4f4 100644
--- a/PHOS/AliPHOSTrigger.h
+++ b/PHOS/AliPHOSTrigger.h
@@ -43,12 +43,12 @@ class AliPHOSTrigger : public AliTriggerDetector {
   
   AliPHOSTrigger() ; //  ctor
   AliPHOSTrigger(const AliPHOSTrigger & trig) ; // cpy ctor
-  virtual ~AliPHOSTrigger() {}; //virtual dtor
-
+  virtual ~AliPHOSTrigger();
 
   virtual void    CreateInputs(); //Define trigger inputs for Central Trigger Processor
   void            Print(const Option_t * opt ="") const ;  
-  virtual void    Trigger();  //Make PHOS trigger
+  virtual void    Trigger() {}                   //Make PHOS trigger
+  void            Trigger(TClonesArray *digits); //Make PHOS trigger
 
   //Getters
   Float_t  Get2x2MaxAmplitude()  const {return f2x2MaxAmp ; }
@@ -118,14 +118,16 @@ class AliPHOSTrigger : public AliTriggerDetector {
 
   AliPHOSTrigger & operator = (const AliPHOSTrigger & trig) ;//cpy assignment
 
-  void FillTRU(const TClonesArray * digits, const AliPHOSGeometry * geom, TClonesArray * amptru, TClonesArray * ampmod, TClonesArray * timeRtru) const ;
+  void FillTRU(const TClonesArray * digits, const AliPHOSGeometry * geom) const ;
 
-  Bool_t IsPatchIsolated(Int_t iPatchType, const TClonesArray * ampmods, const Int_t imod, const Int_t mtru, const Float_t maxamp, const Int_t maxphi, const Int_t maxeta) ;
+  Bool_t IsPatchIsolated(Int_t iPatchType, const Int_t imod, const Int_t mtru, const Float_t maxamp, const Int_t maxphi, const Int_t maxeta) ;
 
-  void MakeSlidingCell(const TClonesArray * amptrus, const TClonesArray * timeRtrus, Int_t mod, TMatrixD *ampmax2, TMatrixD *ampmaxn) ;
+  void MakeSlidingCell(Int_t mod, TMatrixD &ampmax2, TMatrixD &ampmaxn) ;
 
-  void SetTriggers(const TClonesArray * amptrus, Int_t iMod, const TMatrixD *ampmax2,const TMatrixD *ampmaxn) ;
+  void SetTriggers(Int_t iMod, const TMatrixD &ampmax2,const TMatrixD &ampmaxn) ;
 
+  void DoIt() ; 
+ 
  private: 
 
   Float_t f2x2MaxAmp ;     //! Maximum 2x2 added amplitude (not overlapped) 
@@ -142,7 +144,11 @@ class AliPHOSTrigger : public AliTriggerDetector {
   Int_t*   fADCValuesHigh2x2 ; //! " high gain " 2x2 "
   Int_t*   fADCValuesLow2x2  ; //! " low gaing " "
 
-  TClonesArray* fDigitsList ;  //Array of digits 
+  TClonesArray* fDigitsList ;  //  Array of digits 
+  TClonesArray* fAmptrus    ;  //! Array of matrices with amplitudes per TRU
+  TClonesArray* fAmpmods    ;  //! Array of matrices with amplitudes per module
+  TClonesArray* fTimeRtrus  ;  //! Array of matrices with time
+  
  
   Float_t fL0Threshold ;             //! L0 trigger energy threshold
   Float_t fL1JetLowPtThreshold ;     //! L1 Low  pT trigger threshold
@@ -172,7 +178,7 @@ class AliPHOSTrigger : public AliTriggerDetector {
   Bool_t  fSimulation ;           //! Flag to do the trigger during simulation or reconstruction
   Bool_t  fIsolateInModule;       //! Flag to isolate trigger patch in Module or in TRU acceptance
 
-  ClassDef(AliPHOSTrigger,4)
+  ClassDef(AliPHOSTrigger,5)
 } ;