ALIROOT-5600 - skip non-participating detector modules

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTReadoutList.cxx

diff --git a/HLT/BASE/AliHLTReadoutList.cxx b/HLT/BASE/AliHLTReadoutList.cxx
index 43f426ad7eda27b09fd10989d62617bedba3b603..31110373432ae5e2311205af7fba8511c8406cab 100644 (file)
--- a/HLT/BASE/AliHLTReadoutList.cxx
+++ b/HLT/BASE/AliHLTReadoutList.cxx
@@ -110,30 +110,6 @@ AliHLTReadoutList::AliHLTReadoutList(const char* enabledList) :
   TString str(enabledList);
   str.ToUpper();
   Int_t enabledDetectors = 0;
-  if (str.Contains("ITSSPD")) enabledDetectors |= kITSSPD;
-  if (str.Contains("ITSSDD")) enabledDetectors |= kITSSDD;
-  if (str.Contains("ITSSSD")) enabledDetectors |= kITSSSD;
-  if (str.Contains("TPC")) enabledDetectors |= kTPC;
-  if (str.Contains("TRD")) enabledDetectors |= kTRD;
-  if (str.Contains("TOF")) enabledDetectors |= kTOF;
-  if (str.Contains("HMPID")) enabledDetectors |= kHMPID;
-  if (str.Contains("PHOS")) enabledDetectors |= kPHOS;
-  if (str.Contains("CPV")) enabledDetectors |= kCPV;
-  if (str.Contains("PMD")) enabledDetectors |= kPMD;
-  if (str.Contains("MUONTRK")) enabledDetectors |= kMUONTRK;
-  if (str.Contains("MUONTRG")) enabledDetectors |= kMUONTRG;
-  if (str.Contains("FMD")) enabledDetectors |= kFMD;
-  if (str.Contains("T0")) enabledDetectors |= kT0;
-  if (str.Contains("V0")) enabledDetectors |= kV0;
-  if (str.Contains("ZDC")) enabledDetectors |= kZDC;
-  if (str.Contains("ACORDE")) enabledDetectors |= kACORDE;
-  if (str.Contains("TRG")) enabledDetectors |= kTRG;
-  if (str.Contains("EMCAL")) enabledDetectors |= kEMCAL;
-  if (str.Contains("DAQTEST")) enabledDetectors |= kDAQTEST;
-  if (str.Contains("HLT")) enabledDetectors |= kHLT;
-  if (str.Contains("ALL")) enabledDetectors |= kALLDET;
-  Enable(enabledDetectors);
-  
   TObjArray* list = str.Tokenize(" ");
   TIter next(list);
   const TObjString* objstr = NULL;
@@ -141,8 +117,31 @@ AliHLTReadoutList::AliHLTReadoutList(const char* enabledList) :
   {
     str = objstr->GetString();
     if (str.IsDigit()) EnableDDLBit(str.Atoi());
+    if (str == "ITSSPD") enabledDetectors |= kITSSPD;
+    if (str == "ITSSDD") enabledDetectors |= kITSSDD;
+    if (str == "ITSSSD") enabledDetectors |= kITSSSD;
+    if (str == "TPC") enabledDetectors |= kTPC;
+    if (str == "TRD") enabledDetectors |= kTRD;
+    if (str == "TOF") enabledDetectors |= kTOF;
+    if (str == "HMPID") enabledDetectors |= kHMPID;
+    if (str == "PHOS") enabledDetectors |= kPHOS;
+    if (str == "CPV") enabledDetectors |= kCPV;
+    if (str == "PMD") enabledDetectors |= kPMD;
+    if (str == "MUONTRK") enabledDetectors |= kMUONTRK;
+    if (str == "MUONTRG") enabledDetectors |= kMUONTRG;
+    if (str == "FMD") enabledDetectors |= kFMD;
+    if (str == "T0") enabledDetectors |= kT0;
+    if (str == "V0") enabledDetectors |= kV0;
+    if (str == "ZDC") enabledDetectors |= kZDC;
+    if (str == "ACORDE") enabledDetectors |= kACORDE;
+    if (str == "TRG") enabledDetectors |= kTRG;
+    if (str == "EMCAL") enabledDetectors |= kEMCAL;
+    if (str == "DAQTEST") enabledDetectors |= kDAQTEST;
+    if (str == "HLT") enabledDetectors |= kHLT;
+    if (str == "ALL") enabledDetectors |= kALLDET;
   }
   delete list;
+  Enable(enabledDetectors);
 }
 
 
@@ -419,7 +418,7 @@ void AliHLTReadoutList::Enable(Int_t detector)
     fReadoutList.fList[28] = 0x00003FFF;
   }
   if ((detector & kDAQTEST) != 0) fReadoutList.fList[29] = 0x00000001;
-  if ((detector & kHLT) != 0) fReadoutList.fList[30] = 0x000003FF;
+  if ((detector & kHLT) != 0) fReadoutList.fList[30] = 0x0FFFFFFF;
 }
 
 
@@ -535,7 +534,7 @@ bool AliHLTReadoutList::DetectorEnabled(Int_t detector) const
       result &= fReadoutList.fList[28] == 0x00003FFF;
     }
     if ((detector & kDAQTEST) != 0) result &= fReadoutList.fList[29] == 0x00000001;
-    if ((detector & kHLT) != 0) result &= fReadoutList.fList[30] == 0x000003FF;
+    if ((detector & kHLT) != 0) result &= fReadoutList.fList[30] == 0x0FFFFFFF;
   }
   
   return result;
@@ -905,7 +904,7 @@ AliHLTReadoutList AliHLTReadoutList::operator ~ () const
   readoutlist.fReadoutList.fList[7] = 0xFFFFFFFF & (~fReadoutList.fList[7]);
   readoutlist.fReadoutList.fList[8] = 0xFFFFFFFF & (~fReadoutList.fList[8]);
   readoutlist.fReadoutList.fList[9] = 0x00FFFFFF & (~fReadoutList.fList[9]);
-  readoutlist.fReadoutList.fList[10] = 0x00000000 & (~fReadoutList.fList[10]);
+  readoutlist.fReadoutList.fList[10] = 0x00000000;// & (~fReadoutList.fList[10]); // Commented out the end part to suppress coverty warning.
   readoutlist.fReadoutList.fList[11] = 0x0003FFFF & (~fReadoutList.fList[11]);
   readoutlist.fReadoutList.fList[12] = 0xFFFFFFFF & (~fReadoutList.fList[12]);
   readoutlist.fReadoutList.fList[13] = 0xFFFFFFFF & (~fReadoutList.fList[13]);
@@ -937,7 +936,7 @@ AliHLTReadoutList AliHLTReadoutList::operator ~ () const
     readoutlist.fReadoutList.fList[27] = 0xFFFFFFFF & (~fReadoutList.fList[27]);
     readoutlist.fReadoutList.fList[28] = 0x00003FFF & (~fReadoutList.fList[28]);
     readoutlist.fReadoutList.fList[29] = 0x00000001 & (~fReadoutList.fList[29]);
-    readoutlist.fReadoutList.fList[30] = 0x000003FF & (~fReadoutList.fList[30]);
+    readoutlist.fReadoutList.fList[30] = 0x0FFFFFFF & (~fReadoutList.fList[30]);
   }
   return readoutlist;
 }