X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliDetectorTagCuts.h;h=f975166a1ae0939dac0deddbc2edaff553bf6e35;hb=deae51a84fa11ec03d46ae80ab3bb054b0fa916a;hp=5dbcfa9d30de9a80794ca4494440f58a3e47a108;hpb=4dd405ae73fcb331d6d4a985c414d4cc69551235;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliDetectorTagCuts.h b/STEER/AliDetectorTagCuts.h
index 5dbcfa9d30d..f975166a1ae 100644
--- a/STEER/AliDetectorTagCuts.h
+++ b/STEER/AliDetectorTagCuts.h
@@ -14,6 +14,7 @@
 
 #include <TObject.h>
 #include <TString.h>
+#include <AliDAQ.h>
 
 class AliDetectorTag;
 
@@ -22,21 +23,27 @@ class AliDetectorTagCuts : public TObject {
  public:
   AliDetectorTagCuts();
   ~AliDetectorTagCuts();
-  void Reset();
-  
+   
  //____________________________________________________//
-  void SetListOfDetectors(const TString& detectors) {fDetectors = detectors; fDetectorsFlag = kTRUE;}
+  void SetListOfDetectors(const TString& detectors) {fDetectorsDAQ = AliDAQ::DetectorPattern(detectors); fDetectorsReco = AliDAQ::DetectorPattern(detectors); fDetectorsFlag = kTRUE;}
+  void SetListOfDetectorsDAQ(const TString& detectors) {fDetectorsDAQ = AliDAQ::DetectorPattern(detectors); fDetectorsFlag = kTRUE;}
+  void SetListOfDetectorsReco(const TString& detectors) {fDetectorsReco = AliDAQ::DetectorPattern(detectors); fDetectorsFlag = kTRUE;}
+  void SetDetectorValidityValue(TString det, UShort_t val);
  
-  Bool_t IsAccepted(AliDetectorTag *lhcTag) const;
+  Bool_t IsAccepted(AliDetectorTag *detTag) const;
 
   //____________________________________________________//
  private:
-  Bool_t  IsSelected(TString detName, TString& detectors) const;
-
-  TString fDetectors; //detectors active
-  Bool_t  fDetectorsFlag; //cut used or not
+  //  Bool_t  IsSelected(TString detName, TString& detectors) const;
+
+  //  TString fDetectors; //detectors active
+  UInt_t fDetectorsReco;  //selected detector pattern for Reco
+  UInt_t fDetectorsDAQ;   //selected detector pattern for DAQ
+  Bool_t fDetectorsFlag; //cut used or not
+  UShort_t   fDetectorValidityMatch[AliDAQ::kHLTId]; // Detector validity to match
+  Bool_t     fDetectorValidityFlag[AliDAQ::kHLTId];  // Flag if validity match is to be used
   
-  ClassDef(AliDetectorTagCuts, 1)
+  ClassDef(AliDetectorTagCuts, 3)
 };
 
 #endif