flat friend update

[u/mrichter/AliRoot.git] / PWGLF / FORWARD / analysis2 / AliFMDSharingFilter.h

diff --git a/PWGLF/FORWARD/analysis2/AliFMDSharingFilter.h b/PWGLF/FORWARD/analysis2/AliFMDSharingFilter.h
index 323ac2b62c967712ca9f635bed9a59b6f9e871db..37ea26178b29789bbc1f9aabacefcf353c24ffc1 100644 (file)
--- a/PWGLF/FORWARD/analysis2/AliFMDSharingFilter.h
+++ b/PWGLF/FORWARD/analysis2/AliFMDSharingFilter.h
@@ -21,7 +21,6 @@
 #include <TList.h>
 #include "AliForwardUtil.h"
 #include "AliFMDMultCuts.h"
-#include <TBits.h>
 class AliESDFMD;
 class TAxis;
 class TList;
@@ -133,20 +132,13 @@ public:
    * 
    */
   void SetAllow3Strips(Bool_t use) { fThreeStripSharing = use; }  
-  /** 
-   * In case of a displaced vertices recalculate eta and angle correction
-   * 
-   * @param use recalculate or not
-   * 
-   */
-  void SetRecalculateEta(Bool_t use) { fRecalculateEta = use; }
-  /** 
-   * Set whether to consider invalid multiplicities as null (or empty)
-   * signal. 
+  /**
+   * Set whether to ignore the ESD info when angle correcting, this
+   * is to counter a known issue where the info in the ESD is incorrect
    * 
-   * @param flag If true, count invalids as empty
+   * @param use ignore the ESD info
    */
-  void SetInvalidIsEmpty(Bool_t flag) { fInvalidIsEmpty = flag; }
+  void SetIgnoreESDWhenAngleCorrecting(Bool_t use) { fIgnoreESDForAngleCorrection = use; }
   /* @} */
 
   /** 
@@ -238,48 +230,6 @@ public:
    */  
   void SetHCuts(const AliFMDMultCuts& c) { fHCuts = c; }
   /* @} */
-  /** 
-   * @{ 
-   * @name Dead strip handling 
-   */
-  /** 
-   * Add a dead strip
-   * 
-   * @param d  Detector
-   * @param r  Ring 
-   * @param s  Sector 
-   * @param t  Strip
-   */
-  void AddDead(UShort_t d, Char_t r, UShort_t s, UShort_t t);
-  /** 
-   * Add a dead region in a detector ring
-   * 
-   * @param d   Detector
-   * @param r   Ring
-   * @param s1  First sector (inclusive)
-   * @param s2  Last sector (inclusive)
-   * @param t1  First strip (inclusive)
-   * @param t2  Last strip (inclusive)
-   */
-  void AddDeadRegion(UShort_t d, Char_t r, UShort_t s1, UShort_t s2, 
-                    UShort_t t1, UShort_t t2);
-  /** 
-   * Add dead strips from a script.  The script is supposed to accept
-   * a pointer to this object (AliFMDSharingFilter) and then call
-   * AddDead or AddDeadRegion as needed.
-   * 
-   * @code 
-   * void deadstrips(AliFMDSharingFilter* filter)
-   * { 
-   *   filter->AddDead(...);
-   *   // ... and so on 
-   * }
-   * @endcode 
-   *
-   * @param script The script to read dead strips from. 
-   */
-  void AddDead(const Char_t* script);
-  /* @} */
 protected:
   /** 
    * Copy constructor - not implemented
@@ -363,7 +313,8 @@ protected:
     TH2D*     fNeighborsAfter;  // Correlation of neighbors 
     TH2D*     fSumESD;          // Summed ESD signal 
     TH2D*     fSum;             // Summed cluster signal 
-    ClassDef(RingHistos,3);
+    TH1D*     fNConsecutive;    // # consecutive strips with signal > low cut
+    ClassDef(RingHistos,4);
   };
   /** 
    * Get the ring histogram container 
@@ -435,17 +386,6 @@ protected:
    * @return 
    */
   virtual Double_t GetLowCut(UShort_t d, Char_t r, Double_t eta) const;
-  /** 
-   * Check if a strip is marked as dead 
-   * 
-   * @param d   Detector 
-   * @param r   Ring
-   * @param s   Sector 
-   * @param t   Strip 
-   * 
-   * @return true if dead 
-   */
-  virtual Bool_t IsDead(UShort_t d, Char_t r, UShort_t s, UShort_t t) const;
   TList    fRingHistos;      // List of histogram containers
   Bool_t   fCorrectAngles;   // Whether to work on angle corrected signals
   TH2*     fHighCuts;        // High cuts used
@@ -456,11 +396,9 @@ protected:
   AliFMDMultCuts fHCuts;     // Cuts object for high cuts
   Bool_t   fUseSimpleMerging;// enable simple sharing by HHD
   Bool_t   fThreeStripSharing; //In case of simple sharing allow 3 strips
-  Bool_t   fRecalculateEta;  // Whether to recalc eta and angle cor (disp vtx)
-  TBits    fXtraDead;
-  Bool_t   fInvalidIsEmpty;  // Consider kInvalidMult as zero 
-  Bool_t   fMergingDisabled; // If true, do not merge 
-  ClassDef(AliFMDSharingFilter,9); //
+  Bool_t   fMergingDisabled; // If true, do not merge
+  Bool_t   fIgnoreESDForAngleCorrection; // Ignore ESD information when angle correcting
+  ClassDef(AliFMDSharingFilter,11); //
 };
 
 #endif