fix saving dEdx on ESD tracks (Markus)

[u/mrichter/AliRoot.git] / STEER / AliDetectorTagCuts.cxx

diff --git a/STEER/AliDetectorTagCuts.cxx b/STEER/AliDetectorTagCuts.cxx
index db130f5e0bbbe82542ee998a61c99e78659e8940..50f96c187b9ce94499cc1b4e6b8e24405bfdfa12 100644 (file)
--- a/STEER/AliDetectorTagCuts.cxx
+++ b/STEER/AliDetectorTagCuts.cxx
@@ -34,9 +34,15 @@ AliDetectorTagCuts::AliDetectorTagCuts() :
   TObject(),
   fDetectorsReco(0),
   fDetectorsDAQ(0),
-  fDetectorsFlag(kFALSE)
+  fDetectorsFlag(kFALSE),
+  fDetectorValidityMatch(),
+  fDetectorValidityFlag()
 {
   //Default constructor which calls the Reset method.
+  for (int iter = 0; iter<AliDAQ::kHLTId; iter++) {
+    fDetectorValidityMatch[iter] = 0;
+    fDetectorValidityFlag[iter] = 0;
+  }
 }
 
 //___________________________________________________________________________
@@ -50,7 +56,13 @@ Bool_t AliDetectorTagCuts::IsAccepted(AliDetectorTag *detTag) const {
   if (fDetectorsFlag) {
     Bool_t daqsel = (detTag->GetIntDetectorMaskDAQ() & fDetectorsDAQ) > 0;
     Bool_t recsel = (detTag->GetIntDetectorMaskReco() & fDetectorsReco) > 0;
-    return (daqsel && recsel);
+    Bool_t valsel = kTRUE;
+    for (int iter=0;  iter<AliDAQ::kHLTId; iter++) {
+      if (fDetectorValidityFlag[iter])
+       if (!(fDetectorValidityMatch[iter] == detTag->GetDetectorValidityRange(iter)))
+         valsel = kFALSE;
+    }
+    return (daqsel && recsel && valsel);
   }
   return true;
 
@@ -64,6 +76,17 @@ Bool_t AliDetectorTagCuts::IsAccepted(AliDetectorTag *detTag) const {
 //   }
 //   return kTRUE;
 }
+  
+void AliDetectorTagCuts::SetDetectorValidityValue(TString det, UShort_t val)
+{
+  // Set Validity requiement for detector
+
+  Short_t detid = AliDAQ::DetectorID(det.Data());
+  if (detid >= 0) {
+    fDetectorValidityMatch[detid] = val;
+    fDetectorsFlag = kTRUE;
+  }
+}
 
 //___________________________________________________________________________
 // Bool_t AliDetectorTagCuts::IsSelected(TString detName, TString& detectors) const {